Changeset 1395 in svn

Timestamp:

Jul 8, 2014, 1:59:26 PM (10 years ago)

Author:

Pavel Demin

Message:

synchronize with GitHub

Location:

trunk

Files:

• LICENSE (added)
• Makefile (modified) (1 diff)
• README.md (added)
• doc/genMakefile.tcl (modified) (1 diff)
• modules/PileUpMergerPythia8.cc (modified) (1 diff)
• readers/DelphesCMSFWLite.cpp (modified) (8 diffs)
• readers/DelphesPythia8.cpp (modified) (1 diff)

trunk/Makefile

@@ -30 +30 @@
 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lCommonToolsUtils
+DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
 endif
 

trunk/doc/genMakefile.tcl

@@ -211 +211 @@
 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lCommonToolsUtils
+DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
 endif
 

trunk/modules/PileUpMergerPythia8.cc

@@ -23 +23 @@
 #include "ExRootAnalysis/ExRootClassifier.h"
 
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 
 #include "TMath.h"

trunk/readers/DelphesCMSFWLite.cpp

@@ -36 +36 @@
 #include "DataFormats/FWLite/interface/Handle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 
 using namespace std;
@@ -41 +43 @@
 //---------------------------------------------------------------------------
 
-void ConvertInput(fwlite::Event &event, DelphesFactory *factory, TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
+void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
+  ExRootTreeBranch *branchEvent, DelphesFactory *factory,
+  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
+  TObjArray *partonOutputArray)
 {
+  fwlite::Handle< GenEventInfoProduct > handleGenEventInfo;
+
   fwlite::Handle< vector< reco::GenParticle > > handleParticle;
   vector< reco::GenParticle >::const_iterator itParticle;
@@ -49 +56 @@
   vector< const reco::Candidate * >::iterator itCandidate;
 
+  handleGenEventInfo.getByLabel(event, "generator");
   handleParticle.getByLabel(event, "genParticles");
 
+  HepMCEvent *element;
   Candidate *candidate;
   TDatabasePDG *pdg;
@@ -60 +69 @@
   Double_t x, y, z;
 
+  element = static_cast<HepMCEvent *>(branchEvent->NewEntry());
+
+  element->Number = eventCounter;
+
+  element->ProcessID = handleGenEventInfo->signalProcessID();
+  element->MPI = 1;
+  element->Weight = handleGenEventInfo->weight();
+  element->Scale = handleGenEventInfo->qScale();
+  element->AlphaQED = handleGenEventInfo->alphaQED();
+  element->AlphaQCD = handleGenEventInfo->alphaQCD();
+
+  element->ID1 = 0;
+  element->ID2 = 0;
+  element->X1 = 0.0;
+  element->X2 = 0.0;
+  element->ScalePDF = 0.0;
+  element->PDF1 = 0.0;
+  element->PDF2 = 0.0;
+
+  element->ReadTime = 0.0;
+  element->ProcTime = 0.0;
+
   pdg = TDatabasePDG::Instance();
 
@@ -82 +113 @@
 
     candidate->Status = status;
+
+    if(particle.mother())
+    {
+      itCandidate = find(vectorCandidate.begin(), vectorCandidate.end(), particle.mother());
+      if(itCandidate != vectorCandidate.end()) candidate->M1 = distance(vectorCandidate.begin(), itCandidate);
+    }
 
     itCandidate = find(vectorCandidate.begin(), vectorCandidate.end(), particle.daughter(0));
@@ -131 +168 @@
   TStopwatch eventStopWatch;
   ExRootTreeWriter *treeWriter = 0;
+  ExRootTreeBranch *branchEvent = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -169 +207 @@
     treeWriter = new ExRootTreeWriter(outputFile, "Delphes");
 
+    branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
+
     confReader = new ExRootConfReader;
     confReader->ReadFile(argv[1]);
@@ -210 +250 @@
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
-        ConvertInput(event, factory, allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
+        ConvertInput(event, eventCounter, branchEvent, factory,
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
         modularDelphes->ProcessTask();
 

trunk/readers/DelphesPythia8.cpp

@@ -5 +5 @@
 #include <signal.h>
 
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
 
 #include "TROOT.h"