Changeset 474eb76 in git for readers

Timestamp:

Jul 4, 2013, 1:44:56 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6e0bbe3

Parents:

a9c6df69

Message:

fix DelphesPythia8.cpp

File:

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

readers/DelphesPythia8.cpp

@@ -5 +5 @@
 #include <signal.h>
 
-#include "pythia->h"
+#include "Pythia.h"
 
 #include "TROOT.h"
@@ -40 +40 @@
   Int_t pid, status;
   Double_t px, py, pz, e;
-  Double_t x, y, z;
+  Double_t x, y, z, t;
 
   pdg = TDatabasePDG::Instance();
@@ -50 +50 @@
     pid = particle.id();
     status = particle.status();
-    m1 = particle.mother1(); m2 = particle.mother2();
-    d1 = particle.daughter1(); d2 = particle.daughter2();
     px = particle.px(); py = particle.py(); pz = particle.pz(); e = particle.e();
     x = particle.xProd(); y = particle.yProd(); z = particle.zProd(); t = particle.tProd();
@@ -62 +60 @@
     candidate->Status = status;
 
-    candidate->M1 = m1 - 1;
-    candidate->M2 = m2 - 1;
-
-    candidate->D1 = d1 - 1;
-    candidate->D2 = d2 - 1;
+    candidate->M1 = particle.mother1() - 1;
+    candidate->M2 = particle.mother2() - 1;
+
+    candidate->D1 = particle.daughter1() - 1;
+    candidate->D2 = particle.daughter2() - 1;
 
     pdgParticle = pdg->GetParticle(pid);
@@ -74 +72 @@
     candidate->Momentum.SetPxPyPzE(px, py, pz, e);
 
-    candidate->Position.SetXYZT(x, y, z, 0.0);
+    candidate->Position.SetXYZT(x, y, z, t);
 
     allParticleOutputArray->Add(candidate);
@@ -106 +104 @@
   char appName[] = "DelphesPythia8";
   stringstream message;
-  FILE *inputFile = 0;
   TFile *outputFile = 0;
   TStopwatch readStopWatch, procStopWatch;
@@ -115 +112 @@
   DelphesFactory *factory = 0;
   TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
-  Int_t i;
   Long64_t eventCounter, errorCounter;
   Long64_t numberOfEvents, timesAllowErrors;