Changeset b94aacf in git

Timestamp:

Jul 4, 2013, 2:10:57 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ad78364

Parents:

6e0bbe3

Message:

add event information

File:

• readers/DelphesPythia8.cpp (modified) (4 diffs)

readers/DelphesPythia8.cpp

@@ -29 +29 @@
 //---------------------------------------------------------------------------
 
-void ConvertInput(Pythia8::Pythia *pythia, DelphesFactory *factory, TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
+void ConvertInput(Long64_t eventCounter, Pythia8::Pythia *pythia,
+  ExRootTreeBranch *branch, DelphesFactory *factory,
+  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray,
+  TStopwatch *readStopWatch, TStopwatch *procStopWatch)
 {
   int i;
@@ -41 +44 @@
   Double_t px, py, pz, e;
   Double_t x, y, z, t;
+
+  // event information
+  mutableEvent = event.mutable_event();
+
+  element = static_cast<HepMCEvent *>(branch->NewEntry());
+
+  element->Number = eventCounter;
+
+  element->ProcessID = pythia->info.code();
+  element->MPI = 1;
+  element->Weight = pythia->info.weight();
+  element->Scale = pythia->info.QRen();
+  element->AlphaQED = pythia->info.alphaEM();
+  element->AlphaQCD = pythia->info.alphaS();
+
+  element->ID1 = pythia->info.id1pdf();
+  element->ID2 = pythia->info.id2pdf();
+  element->X1 = pythia->info.x1pdf();
+  element->X2 = pythia->info.x2pdf();
+  element->ScalePDF = pythia->info.QFac();
+  element->PDF1 = pythia->info.pdf1();
+  element->PDF2 = pythia->info.pdf2();
+
+  element->ReadTime = readStopWatch->RealTime();
+  element->ProcTime = procStopWatch->RealTime();
 
   pdg = TDatabasePDG::Instance();
@@ -146 +174 @@
     treeWriter = new ExRootTreeWriter(outputFile, "Delphes");
 
-    branchEvent = treeWriter->NewBranch("Event", LHEFEvent::Class());
+    branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
 
     confReader = new ExRootConfReader;
@@ -206 +234 @@
 
       procStopWatch.Start();
-      ConvertInput(pythia, factory, allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
+      ConvertInput(eventCounter, pythia, branchEvent, factory,
+        allParticleOutputArray, stableParticleOutputArray, partonOutputArray,
+        &readStopWatch, &procStopWatch);
       modularDelphes->ProcessTask();
       procStopWatch.Stop();