Changeset a85a257 in git
- Timestamp:
- Oct 25, 2014, 7:19:00 PM (10 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- d8b1858
- Parents:
- 3a73e6d
- Files:
-
- 10 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r3a73e6d ra85a257 34 34 ifneq ($(PROMC),) 35 35 HAS_PROMC = true 36 CXXFLAGS += -I$(PROMC)/include 37 DELPHES_LIBS += -L$(PROMC)/lib -lpro toc -lprotobuf -lprotobuf-lite -lcbook -lz36 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src 37 DELPHES_LIBS += -L$(PROMC)/lib -lpromc -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 \ 241 external/ProMC/ProMCBook.h 240 external/ExRootAnalysis/ExRootProgressBar.h 242 241 EXECUTABLE += \ 243 242 DelphesProMC$(ExeSuf) … … 245 244 EXECUTABLE_OBJ += \ 246 245 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 endif269 246 270 247 endif -
doc/genMakefile.tcl
r3a73e6d ra85a257 225 225 ifneq ($(PROMC),) 226 226 HAS_PROMC = true 227 CXXFLAGS += -I$(PROMC)/include 228 DELPHES_LIBS += -L$(PROMC)/lib -lpro toc -lprotobuf -lprotobuf-lite -lcbook -lz227 CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src 228 DELPHES_LIBS += -L$(PROMC)/lib -lpromc -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}271 270 puts {endif} 272 271 puts {} -
readers/DelphesProMC.cpp
r3a73e6d ra85a257 47 47 #include "ExRootAnalysis/ExRootProgressBar.h" 48 48 49 #include "ProMC /ProMC.pb.h"50 #include "ProMC /ProMCBook.h"51 #include "ProMC /ProMCHeader.pb.h"49 #include "ProMC.pb.h" 50 #include "ProMCBook.h" 51 #include "ProMCHeader.pb.h" 52 52 53 53 using namespace std; … … 55 55 //--------------------------------------------------------------------------- 56 56 57 void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory, 58 TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, 59 TStopwatch *readStopWatch, TStopwatch *procStopWatch) 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) 60 61 { 61 62 Int_t i; … … 107 108 pid = mutableParticles->pdg_id(i); 108 109 status = mutableParticles->status(i); 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); 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; 111 119 112 120 candidate = factory->NewCandidate(); … … 172 180 Int_t i; 173 181 Long64_t eventCounter, numberOfEvents; 182 double momentumUnit = 1.0, positionUnit = 1.0; 174 183 175 184 if(argc < 4) … … 224 233 inputFile = new ProMCBook(argv[i], "r"); 225 234 235 ProMCHeader header = inputFile->getHeader(); 236 237 momentumUnit = static_cast<double>(header.momentumunit()); 238 positionUnit = static_cast<double>(header.lengthunit()); 239 240 241 226 242 if(inputFile == NULL) 227 243 { … … 248 264 249 265 procStopWatch.Start(); 250 ConvertInput(event, branchEvent, factory, 251 allParticleOutputArray, stableParticleOutputArray, partonOutputArray, 252 &readStopWatch, &procStopWatch); 266 ConvertInput(event, momentumUnit, positionUnit, 267 branchEvent, factory, 268 allParticleOutputArray, stableParticleOutputArray, 269 partonOutputArray, &readStopWatch, &procStopWatch); 253 270 modularDelphes->ProcessTask(); 254 271 procStopWatch.Stop(); -
readers/DelphesProMC.py
r3a73e6d ra85a257 134 134 ################################################################################ 135 135 136 if len(sys.argv) < 2:136 if len(sys.argv) < 4: 137 137 print " Usage: DelphesProMC.py config_file output_file input_file(s)" 138 138 sys.exit(1)
Note:
See TracChangeset
for help on using the changeset viewer.