Changeset d612dec in git for readers

Timestamp:

Dec 9, 2021, 7:52:15 AM (3 years ago)

Author:

christinaw97 <christina.wang@…>

Children:

29b722a

Parents:

a5af1df (diff), 0c0c9af (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:Christinaw97/delphes into HEAD

Location:

readers

Files:

• DelphesCMSFWLite.cpp (modified) (4 diffs)
• DelphesHepMC2.cpp (moved) (moved from readers/DelphesHepMC.cpp ) (4 diffs)
• DelphesHepMC3.cpp (added)
• DelphesPythia8.cpp (modified) (2 diffs)

readers/DelphesCMSFWLite.cpp

@@ -217 +217 @@
       // Prevent duplicated particle.
       if(!isMiniAOD) stableParticleOutputArray->Add(candidate);
-    }
-    else if(pdgCode <= 5 || pdgCode == 21 || pdgCode == 15)
+      if (pdgCode == 11 || pdgCode == 13) partonOutputArray->Add(candidate);
+    }
+    //else if(pdgCode <= 5 || pdgCode == 21 || pdgCode == 15)
+    else if(pdgCode <= 5 || pdgCode == 21 || pdgCode == 11 || pdgCode == 13 || pdgCode == 15)
     {
       partonOutputArray->Add(candidate);
@@ -309 +311 @@
   DelphesFactory *factory = 0;
   TObjArray *allParticleOutputArray = 0, *stableParticleOutputArray = 0, *partonOutputArray = 0;
-  Int_t i;
+  Int_t i, maxEvents, skipEvents;
   Long64_t eventCounter, numberOfEvents;
   Bool_t firstEvent = kTRUE;
@@ -351 +353 @@
     confReader = new ExRootConfReader;
     confReader->ReadFile(argv[1]);
+    
+    maxEvents = confReader->GetInt("::MaxEvents", 0);
+    skipEvents = confReader->GetInt("::SkipEvents", 0);
+    
+    if(maxEvents < 0)
+    {
+      throw runtime_error("MaxEvents must be zero or positive");
+    }
+    
+    if(skipEvents < 0)
+    {
+      throw runtime_error("SkipEvents must be zero or positive");
+    }
 
     modularDelphes = new Delphes("Delphes");
@@ -389 +404 @@
       treeWriter->Clear();
 
-      for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
+      for(event.toBegin(); !event.atEnd() && !interrupted && (maxEvents <= 0 || eventCounter-skipEvents < maxEvents); ++event)
       {
-        ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
-          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
-        modularDelphes->ProcessTask();
-
-        firstEvent = kFALSE;
-
-        treeWriter->Fill();
-
-        modularDelphes->Clear();
-        treeWriter->Clear();
+        if(eventCounter >= skipEvents){
+          ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
+            allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
+          modularDelphes->ProcessTask();
+
+          firstEvent = kFALSE;
+
+          treeWriter->Fill();
+
+          modularDelphes->Clear();
+          treeWriter->Clear();
+        }
 
         progressBar.Update(eventCounter, eventCounter);

readers/DelphesHepMC2.cpp

@@ -35 +35 @@
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
-#include "classes/DelphesHepMCReader.h"
+#include "classes/DelphesHepMC2Reader.h"
 #include "modules/Delphes.h"
 
@@ -57 +57 @@
 int main(int argc, char *argv[])
 {
-  char appName[] = "DelphesHepMC";
+  char appName[] = "DelphesHepMC2";
   stringstream message;
   FILE *inputFile = 0;
@@ -68 +68 @@
   DelphesFactory *factory = 0;
   TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
-  DelphesHepMCReader *reader = 0;
+  DelphesHepMC2Reader *reader = 0;
   Int_t i, maxEvents, skipEvents;
   Long64_t length, eventCounter;
@@ -132 +132 @@
     partonOutputArray = modularDelphes->ExportArray("partons");
 
-    reader = new DelphesHepMCReader;
+    reader = new DelphesHepMC2Reader;
 
     modularDelphes->InitTask();

readers/DelphesPythia8.cpp

@@ -296 +296 @@
 
     // jet matching
+#if PYTHIA_VERSION_INTEGER < 8300
     matching = combined->getHook(*pythia);
     if(!matching)
@@ -302 +303 @@
     }
     pythia->setUserHooksPtr(matching);
+#endif
 
     if(pythia == NULL)