Changes in readers/DelphesProMC.cpp [1fa50c2:341014c] in git

File:

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

readers/DelphesProMC.cpp

@@ -17 +17 @@
  */
 
+#include <iostream>
+#include <memory>
+#include <sstream>
 #include <stdexcept>
-#include <iostream>
-#include <sstream>
-#include <memory>
 
 #include <map>
 
-#include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
-
+#include <stdlib.h>
+
+#include "TApplication.h"
 #include "TROOT.h"
-#include "TApplication.h"
-
+
+#include "TDatabasePDG.h"
 #include "TFile.h"
+#include "TLorentzVector.h"
 #include "TObjArray.h"
+#include "TParticlePDG.h"
 #include "TStopwatch.h"
-#include "TDatabasePDG.h"
-#include "TParticlePDG.h"
-#include "TLorentzVector.h"
-
-#include "modules/Delphes.h"
-#include "classes/DelphesStream.h"
+
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
-
+#include "classes/DelphesStream.h"
+#include "modules/Delphes.h"
+
+#include "ExRootAnalysis/ExRootProgressBar.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootTreeWriter.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootProgressBar.h"
 
 #include "ProMC.pb.h"
@@ -109 +109 @@
     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) / 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;
 
     candidate = factory->NewCandidate();
@@ -125 +125 @@
     candidate->Status = status;
 
+    candidate->IsPU = 0;
+    if(mutableParticles->barcode(i) > 0) candidate->IsPU = 1; // pileup particle
+
     candidate->M1 = mutableParticles->mother1(i);
     candidate->M2 = mutableParticles->mother2(i);
@@ -132 +135 @@
 
     pdgParticle = pdg->GetParticle(pid);
-    candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge()/3.0) : -999;
+    candidate->Charge = pdgParticle ? Int_t(pdgParticle->Charge() / 3.0) : -999;
     candidate->Mass = mass;
 
@@ -184 +187 @@
   if(argc < 4)
   {
-    cout << " Usage: " << appName << " config_file" << " output_file" << " input_file(s)" << endl;
+    cout << " Usage: " << appName << " config_file"
+         << " output_file"
+         << " input_file(s)" << endl;
     cout << " config_file - configuration file in Tcl format," << endl;
     cout << " output_file - output file in ROOT format," << endl;
@@ -231 +236 @@
       cout << "** Reading " << argv[i] << endl;
 
+      // use 64 bit
+      //inputFile = new ProMCBook(argv[i], "r", true);
+
+      //use 32 bit zip (faster but limitted to 64k events)
       inputFile = new ProMCBook(argv[i], "r");
 
@@ -237 +246 @@
       momentumUnit = static_cast<double>(header.momentumunit());
       positionUnit = static_cast<double>(header.lengthunit());
-
-
 
       if(inputFile == NULL)