Changes in / [f0caf50:cbc56c5] in git

Files:

• Makefile (modified) (2 diffs)
• classes/DelphesHepMCReader.cc (modified) (1 diff)
• classes/DelphesHepMCReader.h (modified) (1 diff)
• readers/DelphesCMSFWLite.cpp (modified) (5 diffs)
• readers/DelphesHepMC.cpp (modified) (3 diffs)

Makefile

@@ -1754 +1754 @@
         external/fastjet/internal/numconsts.hh \
         external/fastjet/PseudoJet.hh \
-        external/fastjet/internal/deprecated.hh \
-        external/fastjet/ClusterSequence.hh
+        external/fastjet/internal/deprecated.hh
         @touch $@
 
@@ -1902 +1901 @@
 display/DelphesBranchElement.h: \
         display/DelphesCaloData.h
+        @touch $@
+
+external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
+        external/fastjet/ClusterSequence.hh \
+        external/fastjet/JetDefinition.hh
         @touch $@
 

classes/DelphesHepMCReader.cc

@@ -333 +333 @@
 //---------------------------------------------------------------------------
 
-void DelphesHepMCReader::AnalyzeWeight(ExRootTreeBranch *branch)
-{
-  Weight *element;
-  vector< double >::const_iterator itWeight;
-
-  for(itWeight = fWeight.begin(); itWeight != fWeight.end(); ++itWeight)
-  {
-    element = static_cast<Weight *>(branch->NewEntry());
-
-    element->Weight = *itWeight;
-  }
-}
-
-//---------------------------------------------------------------------------
-
 void DelphesHepMCReader::AnalyzeParticle(DelphesFactory *factory,
   TObjArray *allParticleOutputArray,

classes/DelphesHepMCReader.h

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

readers/DelphesCMSFWLite.cpp

@@ -64 +64 @@
 
 void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
-  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchWeight,
+  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
   DelphesFactory *factory, TObjArray *allParticleOutputArray,
   TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
@@ -153 +153 @@
     for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
     {
-      weight = static_cast<Weight *>(branchWeight->NewEntry());
+      weight = static_cast<Weight *>(branchRwgt->NewEntry());
       weight->Weight = itWeightsInfo->wgt;
     }
@@ -292 +292 @@
   TStopwatch eventStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0, *branchWeight = 0;
+  ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -333 +333 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
-    branchWeight = treeWriter->NewBranch("Weight", Weight::Class());
+    branchRwgt = treeWriter->NewBranch("Weight", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -377 +377 @@
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
-        ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
+        ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
           allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
         modularDelphes->ProcessTask();

readers/DelphesHepMC.cpp

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