Changeset 1e8afcc in git

Timestamp:

Jun 4, 2015, 3:30:52 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6ec8d18

Parents:

6f9baba

Message:

replace Rwgt with Weight in DelphesPythia8 and DelphesLHEF

Files:

• classes/DelphesLHEFReader.cc (modified) (1 diff)
• classes/DelphesLHEFReader.h (modified) (1 diff)
• readers/DelphesLHEF.cpp (modified) (3 diffs)
• readers/DelphesPythia8.cpp (modified) (3 diffs)

classes/DelphesLHEFReader.cc

@@ -216 +216 @@
 //---------------------------------------------------------------------------
 
-void DelphesLHEFReader::AnalyzeRwgt(ExRootTreeBranch *branch)
+void DelphesLHEFReader::AnalyzeWeight(ExRootTreeBranch *branch)
 {
   LHEFWeight *element;

classes/DelphesLHEFReader.h

@@ -59 +59 @@
     TStopwatch *readStopWatch, TStopwatch *procStopWatch);
 
-  void AnalyzeRwgt(ExRootTreeBranch *branch);
+  void AnalyzeWeight(ExRootTreeBranch *branch);
 
 private:

readers/DelphesLHEF.cpp

@@ -63 +63 @@
   TStopwatch readStopWatch, procStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
+  ExRootTreeBranch *branchEvent = 0, *branchWeight = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -103 +103 @@
 
     branchEvent = treeWriter->NewBranch("Event", LHEFEvent::Class());
-    branchRwgt = treeWriter->NewBranch("Rwgt", Weight::Class());
+    branchWeight = treeWriter->NewBranch("Weight", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -196 +196 @@
 
             reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
-            reader->AnalyzeRwgt(branchRwgt);
+            reader->AnalyzeWeight(branchWeight);
 
             treeWriter->Fill();

readers/DelphesPythia8.cpp

@@ -156 +156 @@
   ExRootTreeWriter *treeWriter = 0;
   ExRootTreeBranch *branchEvent = 0;
-  ExRootTreeBranch *branchEventLHEF = 0, *branchRwgtLHEF = 0;
+  ExRootTreeBranch *branchEventLHEF = 0, *branchWeightLHEF = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -235 +235 @@
 
       branchEventLHEF = treeWriter->NewBranch("EventLHEF", LHEFEvent::Class());
-      branchRwgtLHEF = treeWriter->NewBranch("RwgtLHEF", Weight::Class());
+      branchWeightLHEF = treeWriter->NewBranch("WeightLHEF", LHEFWeight::Class());
 
       allParticleOutputArrayLHEF = modularDelphes->ExportArray("allParticlesLHEF");
@@ -290 +290 @@
       {
         reader->AnalyzeEvent(branchEventLHEF, eventCounter, &readStopWatch, &procStopWatch);
-        reader->AnalyzeRwgt(branchRwgtLHEF);
+        reader->AnalyzeWeight(branchWeightLHEF);
       }