Changes in / [e55f5b0:91acc76] in git

Files:

• CMakeLists.txt (modified) (1 diff)
• Makefile (modified) (8 diffs)
• cards/CMS_PhaseII/CMS_PhaseII_Substructure_0PU.tcl (added)
• cards/CMS_PhaseII/CMS_PhaseII_Substructure_200PU.tcl (added)
• cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_0PU.tcl (added)
• cards/CMS_PhaseII/CMS_PhaseII_Substructure_PIX4022_200PU.tcl (added)
• cards/CMS_PhaseII/trackMomentumResolution_PIX4022.tcl (added)
• cards/CMS_PhaseII/trackMomentumResolution_vs_p_PIX4022.tcl (added)
• external/CMakeLists.txt (modified) (1 diff)
• external/PUPPI/CMakeLists.txt (added)
• modules/ModulesLinkDef.h (modified) (4 diffs)
• modules/OldCalorimeter.cc (added)
• modules/OldCalorimeter.h (added)
• modules/PhotonConversions.cc (modified) (2 diffs)
• modules/RecoPuFilter.cc (added)
• modules/RecoPuFilter.h (added)
• readers/DelphesCMSFWLite.cpp (modified) (6 diffs)

CMakeLists.txt

@@ -41 +41 @@
   $<TARGET_OBJECTS:tcl>
   $<TARGET_OBJECTS:Hector>
+  $<TARGET_OBJECTS:PUPPI>
 )
 

Makefile

@@ -324 +324 @@
         modules/SimpleCalorimeter.h \
         modules/Calorimeter.h \
+        modules/OldCalorimeter.h \
         modules/Isolation.h \
         modules/EnergyScale.h \
@@ -732 +733 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/OldCalorimeter.$(ObjSuf): \
+        modules/OldCalorimeter.$(SrcSuf) \
+        modules/OldCalorimeter.h \
+        classes/DelphesClasses.h \
+        classes/DelphesFactory.h \
+        classes/DelphesFormula.h \
+        external/ExRootAnalysis/ExRootResult.h \
+        external/ExRootAnalysis/ExRootFilter.h \
+        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/ParticlePropagator.$(ObjSuf): \
         modules/ParticlePropagator.$(SrcSuf) \
@@ -982 +992 @@
         tmp/modules/Merger.$(ObjSuf) \
         tmp/modules/MomentumSmearing.$(ObjSuf) \
+        tmp/modules/OldCalorimeter.$(ObjSuf) \
         tmp/modules/ParticlePropagator.$(ObjSuf) \
         tmp/modules/PdgCodeFilter.$(ObjSuf) \
@@ -1008 +1019 @@
 
 tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
-        external/PUPPI/PuppiAlgo.$(SrcSuf) \
-        external/fastjet/internal/base.hh
+        external/PUPPI/PuppiAlgo.$(SrcSuf)
 tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
         external/PUPPI/PuppiContainer.$(SrcSuf) \
-        external/fastjet/internal/base.hh \
         external/fastjet/Selector.hh
 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
@@ -1370 +1379 @@
         external/PUPPI/RecoObj2.hh \
         external/PUPPI/AlgoObj.hh \
+        external/PUPPI/PuppiContainer.hh \
+        external/fastjet/PseudoJet.hh \
         classes/DelphesClasses.h \
         classes/DelphesFactory.h \
@@ -1761 +1772 @@
         @touch $@
 
+modules/OldCalorimeter.h: \
+        classes/DelphesModule.h
+        @touch $@
+
 external/fastjet/ClusterSequence1GhostPassiveArea.hh: \
         external/fastjet/PseudoJet.hh \
@@ -1805 +1820 @@
 
 modules/RunPUPPI.h: \
-        classes/DelphesModule.h \
-        external/PUPPI/PuppiContainer.hh
+        classes/DelphesModule.h
         @touch $@
 
@@ -1912 +1926 @@
 external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh: \
         external/fastjet/JetDefinition.hh
+        @touch $@
+
+external/PUPPI/PuppiContainer.hh: \
+        external/fastjet/PseudoJet.hh
         @touch $@
 

external/CMakeLists.txt

@@ -3 +3 @@
 add_subdirectory(Hector)
 add_subdirectory(tcl)
+add_subdirectory(PUPPI)

modules/ModulesLinkDef.h

@@ -40 +40 @@
 #include "modules/SimpleCalorimeter.h"
 #include "modules/Calorimeter.h"
+#include "modules/OldCalorimeter.h"
 #include "modules/Isolation.h"
 #include "modules/EnergyScale.h"
@@ -59 +60 @@
 #include "modules/PdgCodeFilter.h"
 #include "modules/BeamSpotFilter.h"
+#include "modules/RecoPuFilter.h"
 #include "modules/Cloner.h"
 #include "modules/Weighter.h"
@@ -89 +91 @@
 #pragma link C++ class SimpleCalorimeter+;
 #pragma link C++ class Calorimeter+;
+#pragma link C++ class OldCalorimeter+;
 #pragma link C++ class Isolation+;
 #pragma link C++ class EnergyScale+;
@@ -108 +111 @@
 #pragma link C++ class PdgCodeFilter+;
 #pragma link C++ class BeamSpotFilter+;
+#pragma link C++ class RecoPuFilter+;
 #pragma link C++ class Cloner+;
 #pragma link C++ class Weighter+;

modules/PhotonConversions.cc

@@ -59 +59 @@
   fItInputArray(0), fConversionMap(0), fDecayXsec(0)
 {
-  fDecayXsec = new TF1;
+  fDecayXsec = new TF1("decayXsec","1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0);
   fConversionMap = new DelphesCylindricalFormula;
 }
@@ -84 +84 @@
 
   fConversionMap->Compile(GetString("ConversionMap", "0.0"));
-
-#if  ROOT_VERSION_CODE < ROOT_VERSION(6,04,00)
-  fDecayXsec->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");
-#else
-  fDecayXsec->GetFormula()->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");
-#endif
-  fDecayXsec->SetRange(0.0, 1.0);
 
   // import array with output from filter/classifier module

readers/DelphesCMSFWLite.cpp

@@ -65 +65 @@
   ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
   DelphesFactory *factory, TObjArray *allParticleOutputArray,
-  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
+  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
 {
+
   fwlite::Handle< GenEventInfoProduct > handleGenEventInfo;
-
   fwlite::Handle< LHEEventProduct > handleLHEEvent;
-
   fwlite::Handle< vector< reco::GenParticle > > handleParticle;
+
   vector< reco::GenParticle >::const_iterator itParticle;
 
@@ -78 +78 @@
 
   handleGenEventInfo.getByLabel(event, "generator");
-  handleLHEEvent.getByLabel(event, "externalLHEProducer");
-  handleParticle.getByLabel(event, "genParticles");
+
+  if (!((handleLHEEvent.getBranchNameFor(event, "source")).empty()))
+  { 
+    handleLHEEvent.getByLabel(event, "source");
+  }
+  else if (!((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty()))
+  {
+    handleLHEEvent.getByLabel(event, "externalLHEProducer");
+  }
+  else if (firstEvent)
+  {
+    std::cout<<"Wrong LHEEvent Label! Please, check the input file."<<std::endl;
+  }
+
+  if (!((handleParticle.getBranchNameFor(event, "genParticles")).empty()))
+  {
+    handleParticle.getByLabel(event, "genParticles");
+  }
+  else if (!((handleParticle.getBranchNameFor(event, "prunedGenParticles")).empty()))
+  {
+    handleParticle.getByLabel(event, "prunedGenParticles");
+  }
+  else
+  {
+    std::cout<<"Wrong GenParticle Label! Please, check the input file."<<std::endl;
+    exit(-1);
+  }
+
+  Bool_t foundLHE = !((handleLHEEvent.getBranchNameFor(event, "source")).empty()) || !((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty());
 
   HepMCEvent *element;
@@ -91 +118 @@
   Double_t px, py, pz, e, mass;
   Double_t x, y, z;
-
-  const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
-  vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
 
   element = static_cast<HepMCEvent *>(branchEvent->NewEntry());
@@ -117 +141 @@
   element->ProcTime = 0.0;
 
-  for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
-  {
-    weight = static_cast<Weight *>(branchRwgt->NewEntry());
-    weight->Weight = itWeightsInfo->wgt;
+
+  if(foundLHE)
+  {
+    const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
+    vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
+    
+    for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
+    {
+      weight = static_cast<Weight *>(branchRwgt->NewEntry());
+      weight->Weight = itWeightsInfo->wgt;
+    }  
   }
 
@@ -207 +238 @@
   Int_t i;
   Long64_t eventCounter, numberOfEvents;
+  Bool_t firstEvent = kTRUE;
 
   if(argc < 4)
@@ -281 +313 @@
       modularDelphes->Clear();
       treeWriter->Clear();
+
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
         ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
-          allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
         modularDelphes->ProcessTask();
+          
+        firstEvent = kFALSE;
 
         treeWriter->Fill();