Changes in / [5565691:365dbc9] in git

Files:

• Makefile (modified) (3 diffs)
• doc/genMakefile.tcl (modified) (2 diffs)
• examples/Example1.py (added)
• external/ProMC/ProMC.pb.cc (deleted)
• external/ProMC/ProMC.pb.h (deleted)
• external/ProMC/ProMCBook.cc (deleted)
• external/ProMC/ProMCBook.h (deleted)
• external/ProMC/ProMCDescription.pb.cc (deleted)
• external/ProMC/ProMCDescription.pb.h (deleted)
• external/ProMC/ProMCHeader.pb.cc (deleted)
• external/ProMC/ProMCHeader.pb.h (deleted)
• external/ProMC/ProMCStat.pb.cc (deleted)
• external/ProMC/ProMCStat.pb.h (deleted)
• modules/PileUpMergerPythia8.cc (modified) (1 diff)
• readers/DelphesProMC.cpp (modified) (6 diffs)
• readers/DelphesProMC.py (modified) (1 diff)
• readers/DelphesPythia8.cpp (modified) (1 diff)

Makefile

@@ -34 +34 @@
 ifneq ($(PROMC),)
 HAS_PROMC = true
-CXXFLAGS += -I$(PROMC)/include
-DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
+CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src 
+DELPHES_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
 endif
 
@@ -238 +238 @@
         external/ExRootAnalysis/ExRootTreeWriter.h \
         external/ExRootAnalysis/ExRootTreeBranch.h \
-        external/ExRootAnalysis/ExRootProgressBar.h \
-        external/ProMC/ProMCBook.h
+        external/ExRootAnalysis/ExRootProgressBar.h
 EXECUTABLE +=  \
         DelphesProMC$(ExeSuf)
@@ -245 +244 @@
 EXECUTABLE_OBJ +=  \
         tmp/readers/DelphesProMC.$(ObjSuf)
-
-tmp/external/ProMC/ProMCBook.$(ObjSuf): \
-        external/ProMC/ProMCBook.$(SrcSuf)
-tmp/external/ProMC/ProMC.pb.$(ObjSuf): \
-        external/ProMC/ProMC.pb.$(SrcSuf)
-tmp/external/ProMC/ProMCStat.pb.$(ObjSuf): \
-        external/ProMC/ProMCStat.pb.$(SrcSuf)
-tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf): \
-        external/ProMC/ProMCHeader.pb.$(SrcSuf)
-tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf): \
-        external/ProMC/ProMCDescription.pb.$(SrcSuf)
-DELPHES_OBJ +=  \
-        tmp/external/ProMC/ProMCBook.$(ObjSuf) \
-        tmp/external/ProMC/ProMC.pb.$(ObjSuf) \
-        tmp/external/ProMC/ProMCStat.pb.$(ObjSuf) \
-        tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf) \
-        tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf)
-
-ifeq ($(HAS_PYTHIA8),true)
-DELPHES_OBJ +=  \
-        
-endif
 
 endif

doc/genMakefile.tcl

@@ -225 +225 @@
 ifneq ($(PROMC),)
 HAS_PROMC = true
-CXXFLAGS += -I$(PROMC)/include
-DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
+CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src 
+DELPHES_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
 endif
 
@@ -268 +268 @@
 puts {ifeq ($(HAS_PROMC),true)}
 executableDeps {readers/DelphesProMC.cpp}
-sourceDeps {DELPHES} {external/ProMC/*.cc}
 puts {endif}
 puts {}

modules/PileUpMergerPythia8.cc

@@ -132 +132 @@
     dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
 
-    for(i = 0; i < fPythia->event.size(); ++i)
+    for(i = 1; i < fPythia->event.size(); ++i)
     {
       Pythia8::Particle &particle = fPythia->event[i];

readers/DelphesProMC.cpp

@@ -47 +47 @@
 #include "ExRootAnalysis/ExRootProgressBar.h"
 
-#include "ProMC/ProMC.pb.h"
-#include "ProMC/ProMCBook.h"
-#include "ProMC/ProMCHeader.pb.h"
+#include "ProMC.pb.h"
+#include "ProMCBook.h"
+#include "ProMCHeader.pb.h"
 
 using namespace std;
@@ -55 +55 @@
 //---------------------------------------------------------------------------
 
-void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory,
-  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray,
-  TStopwatch *readStopWatch, TStopwatch *procStopWatch)
+void ConvertInput(ProMCEvent &event, double momentumUnit, double positionUnit,
+  ExRootTreeBranch *branch, DelphesFactory *factory,
+  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
+  TObjArray *partonOutputArray, TStopwatch *readStopWatch, TStopwatch *procStopWatch)
 {
   Int_t i;
@@ -107 +108 @@
     pid = mutableParticles->pdg_id(i);
     status = mutableParticles->status(i);
-    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);
+
+    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();
@@ -172 +180 @@
   Int_t i;
   Long64_t eventCounter, numberOfEvents;
+  double momentumUnit = 1.0, positionUnit = 1.0;
 
   if(argc < 4)
@@ -224 +233 @@
       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)
       {
@@ -248 +264 @@
 
         procStopWatch.Start();
-        ConvertInput(event, branchEvent, factory,
-          allParticleOutputArray, stableParticleOutputArray, partonOutputArray,
-          &readStopWatch, &procStopWatch);
+        ConvertInput(event, momentumUnit, positionUnit,
+          branchEvent, factory,
+          allParticleOutputArray, stableParticleOutputArray,
+          partonOutputArray, &readStopWatch, &procStopWatch);
         modularDelphes->ProcessTask();
         procStopWatch.Stop();

readers/DelphesProMC.py

@@ -134 +134 @@
 ################################################################################
 
-if len(sys.argv) < 2:
+if len(sys.argv) < 4:
   print " Usage: DelphesProMC.py config_file output_file input_file(s)"
   sys.exit(1)

readers/DelphesPythia8.cpp

@@ -89 +89 @@
   pdg = TDatabasePDG::Instance();
 
-  for(i = 0; i < pythia->event.size(); ++i)
+  for(i = 1; i < pythia->event.size(); ++i)
   {
     Pythia8::Particle &particle = pythia->event[i];