Changes in readers/DelphesProMC.cpp [a85a257:7c0fcd5] in git

File:

• readers/DelphesProMC.cpp (modified) (6 diffs)

readers/DelphesProMC.cpp

@@ -47 +47 @@
 #include "ExRootAnalysis/ExRootProgressBar.h"
 
-#include "ProMC.pb.h"
-#include "ProMCBook.h"
-#include "ProMCHeader.pb.h"
+#include "ProMC/ProMC.pb.h"
+#include "ProMC/ProMCBook.h"
+#include "ProMC/ProMCHeader.pb.h"
 
 using namespace std;
@@ -55 +55 @@
 //---------------------------------------------------------------------------
 
-void ConvertInput(ProMCEvent &event, double momentumUnit, double positionUnit,
-  ExRootTreeBranch *branch, DelphesFactory *factory,
-  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
-  TObjArray *partonOutputArray, TStopwatch *readStopWatch, TStopwatch *procStopWatch)
+void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory,
+  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray,
+  TStopwatch *readStopWatch, TStopwatch *procStopWatch)
 {
   Int_t i;
@@ -108 +107 @@
     pid = mutableParticles->pdg_id(i);
     status = mutableParticles->status(i);
-
-    px = mutableParticles->px(i)/momentumUnit;
-    py = mutableParticles->py(i)/momentumUnit;
-    pz = mutableParticles->pz(i)/momentumUnit;
-    mass = mutableParticles->mass(i)/momentumUnit;
-    x = mutableParticles->x(i)/positionUnit;
-    y = mutableParticles->y(i)/positionUnit;
-    z = mutableParticles->z(i)/positionUnit;
-    t = mutableParticles->t(i)/positionUnit;
+    px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i);
+    x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i); t = mutableParticles->t(i);
 
     candidate = factory->NewCandidate();
@@ -180 +172 @@
   Int_t i;
   Long64_t eventCounter, numberOfEvents;
-  double momentumUnit = 1.0, positionUnit = 1.0;
 
   if(argc < 4)
@@ -232 +223 @@
 
       inputFile = new ProMCBook(argv[i], "r");
-
-      ProMCHeader header = inputFile->getHeader();
-
-      momentumUnit = static_cast<double>(header.momentumunit());
-      positionUnit = static_cast<double>(header.lengthunit());
-
-
 
       if(inputFile == NULL)
@@ -264 +248 @@
 
         procStopWatch.Start();
-        ConvertInput(event, momentumUnit, positionUnit,
-          branchEvent, factory,
-          allParticleOutputArray, stableParticleOutputArray,
-          partonOutputArray, &readStopWatch, &procStopWatch);
+        ConvertInput(event, branchEvent, factory,
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray,
+          &readStopWatch, &procStopWatch);
         modularDelphes->ProcessTask();
         procStopWatch.Stop();