Changes in / [365dbc9:5565691] in git
- Files:
-
- 10 added
- 1 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r365dbc9 r5565691 34 34 ifneq ($(PROMC),) 35 35 HAS_PROMC = true 36 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src37 DELPHES_LIBS += -L$(PROMC)/lib -lpro mc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz36 CXXFLAGS += -I$(PROMC)/include 37 DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz 38 38 endif 39 39 … … 238 238 external/ExRootAnalysis/ExRootTreeWriter.h \ 239 239 external/ExRootAnalysis/ExRootTreeBranch.h \ 240 external/ExRootAnalysis/ExRootProgressBar.h 240 external/ExRootAnalysis/ExRootProgressBar.h \ 241 external/ProMC/ProMCBook.h 241 242 EXECUTABLE += \ 242 243 DelphesProMC$(ExeSuf) … … 244 245 EXECUTABLE_OBJ += \ 245 246 tmp/readers/DelphesProMC.$(ObjSuf) 247 248 tmp/external/ProMC/ProMCBook.$(ObjSuf): \ 249 external/ProMC/ProMCBook.$(SrcSuf) 250 tmp/external/ProMC/ProMC.pb.$(ObjSuf): \ 251 external/ProMC/ProMC.pb.$(SrcSuf) 252 tmp/external/ProMC/ProMCStat.pb.$(ObjSuf): \ 253 external/ProMC/ProMCStat.pb.$(SrcSuf) 254 tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf): \ 255 external/ProMC/ProMCHeader.pb.$(SrcSuf) 256 tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf): \ 257 external/ProMC/ProMCDescription.pb.$(SrcSuf) 258 DELPHES_OBJ += \ 259 tmp/external/ProMC/ProMCBook.$(ObjSuf) \ 260 tmp/external/ProMC/ProMC.pb.$(ObjSuf) \ 261 tmp/external/ProMC/ProMCStat.pb.$(ObjSuf) \ 262 tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf) \ 263 tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf) 264 265 ifeq ($(HAS_PYTHIA8),true) 266 DELPHES_OBJ += \ 267 268 endif 246 269 247 270 endif -
doc/genMakefile.tcl
r365dbc9 r5565691 225 225 ifneq ($(PROMC),) 226 226 HAS_PROMC = true 227 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src228 DELPHES_LIBS += -L$(PROMC)/lib -lpro mc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz227 CXXFLAGS += -I$(PROMC)/include 228 DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz 229 229 endif 230 230 … … 268 268 puts {ifeq ($(HAS_PROMC),true)} 269 269 executableDeps {readers/DelphesProMC.cpp} 270 sourceDeps {DELPHES} {external/ProMC/*.cc} 270 271 puts {endif} 271 272 puts {} -
modules/PileUpMergerPythia8.cc
r365dbc9 r5565691 132 132 dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi()); 133 133 134 for(i = 1; i < fPythia->event.size(); ++i)134 for(i = 0; i < fPythia->event.size(); ++i) 135 135 { 136 136 Pythia8::Particle &particle = fPythia->event[i]; -
readers/DelphesProMC.cpp
r365dbc9 r5565691 47 47 #include "ExRootAnalysis/ExRootProgressBar.h" 48 48 49 #include "ProMC .pb.h"50 #include "ProMC Book.h"51 #include "ProMC Header.pb.h"49 #include "ProMC/ProMC.pb.h" 50 #include "ProMC/ProMCBook.h" 51 #include "ProMC/ProMCHeader.pb.h" 52 52 53 53 using namespace std; … … 55 55 //--------------------------------------------------------------------------- 56 56 57 void ConvertInput(ProMCEvent &event, double momentumUnit, double positionUnit, 58 ExRootTreeBranch *branch, DelphesFactory *factory, 59 TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, 60 TObjArray *partonOutputArray, TStopwatch *readStopWatch, TStopwatch *procStopWatch) 57 void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory, 58 TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, 59 TStopwatch *readStopWatch, TStopwatch *procStopWatch) 61 60 { 62 61 Int_t i; … … 108 107 pid = mutableParticles->pdg_id(i); 109 108 status = mutableParticles->status(i); 110 111 px = mutableParticles->px(i)/momentumUnit; 112 py = mutableParticles->py(i)/momentumUnit; 113 pz = mutableParticles->pz(i)/momentumUnit; 114 mass = mutableParticles->mass(i)/momentumUnit; 115 x = mutableParticles->x(i)/positionUnit; 116 y = mutableParticles->y(i)/positionUnit; 117 z = mutableParticles->z(i)/positionUnit; 118 t = mutableParticles->t(i)/positionUnit; 109 px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i); 110 x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i); t = mutableParticles->t(i); 119 111 120 112 candidate = factory->NewCandidate(); … … 180 172 Int_t i; 181 173 Long64_t eventCounter, numberOfEvents; 182 double momentumUnit = 1.0, positionUnit = 1.0;183 174 184 175 if(argc < 4) … … 232 223 233 224 inputFile = new ProMCBook(argv[i], "r"); 234 235 ProMCHeader header = inputFile->getHeader();236 237 momentumUnit = static_cast<double>(header.momentumunit());238 positionUnit = static_cast<double>(header.lengthunit());239 240 241 225 242 226 if(inputFile == NULL) … … 264 248 265 249 procStopWatch.Start(); 266 ConvertInput(event, momentumUnit, positionUnit, 267 branchEvent, factory, 268 allParticleOutputArray, stableParticleOutputArray, 269 partonOutputArray, &readStopWatch, &procStopWatch); 250 ConvertInput(event, branchEvent, factory, 251 allParticleOutputArray, stableParticleOutputArray, partonOutputArray, 252 &readStopWatch, &procStopWatch); 270 253 modularDelphes->ProcessTask(); 271 254 procStopWatch.Stop(); -
readers/DelphesProMC.py
r365dbc9 r5565691 134 134 ################################################################################ 135 135 136 if len(sys.argv) < 4:136 if len(sys.argv) < 2: 137 137 print " Usage: DelphesProMC.py config_file output_file input_file(s)" 138 138 sys.exit(1) -
readers/DelphesPythia8.cpp
r365dbc9 r5565691 89 89 pdg = TDatabasePDG::Instance(); 90 90 91 for(i = 1; i < pythia->event.size(); ++i)91 for(i = 0; i < pythia->event.size(); ++i) 92 92 { 93 93 Pythia8::Particle &particle = pythia->event[i];
Note:
See TracChangeset
for help on using the changeset viewer.