Changeset 28027d5 in git for readers

Timestamp:

Jun 26, 2015, 3:13:55 PM (10 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f3c4047

Parents:

f53a4d2 (diff), fe0273c (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 pull request #15 from delphes/mergeCMS

merge with the CMS code

Location:

readers

Files:

• DelphesLHEF.cpp (modified) (3 diffs)
• DelphesPythia8.cpp (modified) (9 diffs)

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

@@ -20 +20 @@
 #include <iostream>
 #include <sstream>
+#include <string>
 
 #include <signal.h>
@@ -38 +39 @@
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
+#include "classes/DelphesLHEFReader.h"
 
 #include "ExRootAnalysis/ExRootTreeWriter.h"
@@ -149 +151 @@
   char appName[] = "DelphesPythia8";
   stringstream message;
+  FILE *inputFile = 0;
   TFile *outputFile = 0;
   TStopwatch readStopWatch, procStopWatch;
   ExRootTreeWriter *treeWriter = 0;
   ExRootTreeBranch *branchEvent = 0;
+  ExRootTreeBranch *branchEventLHEF = 0, *branchWeightLHEF = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
   DelphesFactory *factory = 0;
   TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
+  TObjArray *stableParticleOutputArrayLHEF = 0, *allParticleOutputArrayLHEF = 0, *partonOutputArrayLHEF = 0;
+  DelphesLHEFReader *reader = 0;
   Long64_t eventCounter, errorCounter;
   Long64_t numberOfEvents, timesAllowErrors;
@@ -205 +211 @@
     partonOutputArray = modularDelphes->ExportArray("partons");
 
-    modularDelphes->InitTask();
-
-    // Initialize pythia
+    // Initialize Pythia
     pythia = new Pythia8::Pythia;
 
@@ -221 +225 @@
     numberOfEvents = pythia->mode("Main:numberOfEvents");
     timesAllowErrors = pythia->mode("Main:timesAllowErrors");
+
+    inputFile = fopen(pythia->word("Beams:LHEF").c_str(), "r");
+    if(inputFile)
+    {
+      reader = new DelphesLHEFReader;
+      reader->SetInputFile(inputFile);
+
+      branchEventLHEF = treeWriter->NewBranch("EventLHEF", LHEFEvent::Class());
+      branchWeightLHEF = treeWriter->NewBranch("WeightLHEF", LHEFWeight::Class());
+
+      allParticleOutputArrayLHEF = modularDelphes->ExportArray("allParticlesLHEF");
+      stableParticleOutputArrayLHEF = modularDelphes->ExportArray("stableParticlesLHEF");
+      partonOutputArrayLHEF = modularDelphes->ExportArray("partonsLHEF");
+    }
+
+    modularDelphes->InitTask();
 
     pythia->init();
@@ -234 +254 @@
     for(eventCounter = 0; eventCounter < numberOfEvents && !interrupted; ++eventCounter)
     {
+      while(reader && reader->ReadBlock(factory, allParticleOutputArrayLHEF,
+        stableParticleOutputArrayLHEF, partonOutputArrayLHEF) && !reader->EventReady());
+
       if(!pythia->next())
       {
         // If failure because reached end of file then exit event loop
-        if (pythia->info.atEndOfFile())
+        if(pythia->info.atEndOfFile())
         {
           cerr << "Aborted since reached end of Les Houches Event File" << endl;
@@ -244 +267 @@
 
         // First few failures write off as "acceptable" errors, then quit
-        if (++errorCounter < timesAllowErrors) continue;
-        cerr << "Event generation aborted prematurely, owing to error!" << endl;
-        break;
+        if(++errorCounter > timesAllowErrors)
+        {
+          cerr << "Event generation aborted prematurely, owing to error!" << endl;
+          break;
+        }
+
+        modularDelphes->Clear();
+        reader->Clear();
+        continue;
       }
 
@@ -258 +287 @@
       procStopWatch.Stop();
 
+      if(reader)
+      {
+        reader->AnalyzeEvent(branchEventLHEF, eventCounter, &readStopWatch, &procStopWatch);
+        reader->AnalyzeWeight(branchWeightLHEF);
+      }
+
       treeWriter->Fill();
 
       treeWriter->Clear();
       modularDelphes->Clear();
+      if(reader) reader->Clear();
 
       readStopWatch.Start();
@@ -277 +313 @@
     cout << "** Exiting..." << endl;
 
+    delete reader;
     delete pythia;
     delete modularDelphes;