Changes in / [b03c0d0:c1780a5] in git
- Files:
-
- 6 added
- 3 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rb03c0d0 rc1780a5 103 103 classes/DelphesClasses.h \ 104 104 classes/DelphesFactory.h \ 105 classes/DelphesHepMC Reader.h \105 classes/DelphesHepMC2Reader.h \ 106 106 classes/DelphesPileUpWriter.h \ 107 107 external/ExRootAnalysis/ExRootProgressBar.h \ … … 213 213 tmp/validation/DelphesValidation.$(ObjSuf) 214 214 215 DelphesHepMC$(ExeSuf): \ 216 tmp/readers/DelphesHepMC.$(ObjSuf) 217 218 tmp/readers/DelphesHepMC.$(ObjSuf): \ 219 readers/DelphesHepMC.cpp \ 220 classes/DelphesClasses.h \ 221 classes/DelphesFactory.h \ 222 classes/DelphesHepMCReader.h \ 215 DelphesHepMC2$(ExeSuf): \ 216 tmp/readers/DelphesHepMC2.$(ObjSuf) 217 218 tmp/readers/DelphesHepMC2.$(ObjSuf): \ 219 readers/DelphesHepMC2.cpp \ 220 classes/DelphesClasses.h \ 221 classes/DelphesFactory.h \ 222 classes/DelphesHepMC2Reader.h \ 223 modules/Delphes.h \ 224 external/ExRootAnalysis/ExRootProgressBar.h \ 225 external/ExRootAnalysis/ExRootTreeBranch.h \ 226 external/ExRootAnalysis/ExRootTreeWriter.h 227 DelphesHepMC3$(ExeSuf): \ 228 tmp/readers/DelphesHepMC3.$(ObjSuf) 229 230 tmp/readers/DelphesHepMC3.$(ObjSuf): \ 231 readers/DelphesHepMC3.cpp \ 232 classes/DelphesClasses.h \ 233 classes/DelphesFactory.h \ 234 classes/DelphesHepMC3Reader.h \ 223 235 modules/Delphes.h \ 224 236 external/ExRootAnalysis/ExRootProgressBar.h \ … … 263 275 external/ExRootAnalysis/ExRootTreeWriter.h 264 276 EXECUTABLE += \ 265 DelphesHepMC$(ExeSuf) \ 277 DelphesHepMC2$(ExeSuf) \ 278 DelphesHepMC3$(ExeSuf) \ 266 279 DelphesLHEF$(ExeSuf) \ 267 280 DelphesROOT$(ExeSuf) \ … … 269 282 270 283 EXECUTABLE_OBJ += \ 271 tmp/readers/DelphesHepMC.$(ObjSuf) \ 284 tmp/readers/DelphesHepMC2.$(ObjSuf) \ 285 tmp/readers/DelphesHepMC3.$(ObjSuf) \ 272 286 tmp/readers/DelphesLHEF.$(ObjSuf) \ 273 287 tmp/readers/DelphesROOT.$(ObjSuf) \ … … 516 530 classes/DelphesFormula.h \ 517 531 classes/DelphesClasses.h 518 tmp/classes/DelphesHepMCReader.$(ObjSuf): \ 519 classes/DelphesHepMCReader.$(SrcSuf) \ 520 classes/DelphesHepMCReader.h \ 532 tmp/classes/DelphesHepMC2Reader.$(ObjSuf): \ 533 classes/DelphesHepMC2Reader.$(SrcSuf) \ 534 classes/DelphesHepMC2Reader.h \ 535 classes/DelphesClasses.h \ 536 classes/DelphesFactory.h \ 537 classes/DelphesStream.h \ 538 external/ExRootAnalysis/ExRootTreeBranch.h 539 tmp/classes/DelphesHepMC3Reader.$(ObjSuf): \ 540 classes/DelphesHepMC3Reader.$(SrcSuf) \ 541 classes/DelphesHepMC3Reader.h \ 521 542 classes/DelphesClasses.h \ 522 543 classes/DelphesFactory.h \ … … 1145 1166 tmp/classes/DelphesFactory.$(ObjSuf) \ 1146 1167 tmp/classes/DelphesFormula.$(ObjSuf) \ 1147 tmp/classes/DelphesHepMCReader.$(ObjSuf) \ 1168 tmp/classes/DelphesHepMC2Reader.$(ObjSuf) \ 1169 tmp/classes/DelphesHepMC3Reader.$(ObjSuf) \ 1148 1170 tmp/classes/DelphesLHEFReader.$(ObjSuf) \ 1149 1171 tmp/classes/DelphesModule.$(ObjSuf) \ -
cards/delphes_card_MuonColliderDet.tcl
rb03c0d0 rc1780a5 1200 1200 set ResolutionFormula { 1201 1201 (abs(eta) <= 0.78 ) * sqrt(energy^2*0.01^2 + energy*0.156^2)+ 1202 (abs(eta) > 0.78 && abs(eta) <=0.83 ) * sqrt( energy^ 0.01^2 + energy*0.175^2 ) +1202 (abs(eta) > 0.78 && abs(eta) <=0.83 ) * sqrt( energy^2*0.01^2 + energy*0.175^2 ) + 1203 1203 (abs(eta) <= 2.5 && abs(eta) > 0.83) * sqrt( energy^2*0.01^2 + energy*0.151^2 )} 1204 1204 } -
classes/DelphesStream.cc
rb03c0d0 rc1780a5 106 106 107 107 //------------------------------------------------------------------------------ 108 109 bool DelphesStream::FindChr(int value) 110 { 111 char *position; 112 bool result = false; 113 114 position = strchr(fBuffer, value); 115 116 if(position) 117 { 118 result = true; 119 fBuffer = position + 1; 120 } 121 122 return result; 123 } 124 125 //------------------------------------------------------------------------------ 126 127 bool DelphesStream::FindStr(const char *value) 128 { 129 char *position; 130 bool result = false; 131 132 position = strstr(fBuffer, value); 133 134 if(position) 135 { 136 result = true; 137 fBuffer = position + strlen(value); 138 } 139 140 return result; 141 } 142 143 //------------------------------------------------------------------------------ -
classes/DelphesStream.h
rb03c0d0 rc1780a5 35 35 bool ReadDbl(double &value); 36 36 bool ReadInt(int &value); 37 bool FindChr(int value); 38 bool FindStr(const char *value); 37 39 38 40 private: -
converters/hepmc2pileup.cpp
rb03c0d0 rc1780a5 35 35 #include "classes/DelphesClasses.h" 36 36 #include "classes/DelphesFactory.h" 37 #include "classes/DelphesHepMC Reader.h"37 #include "classes/DelphesHepMC2Reader.h" 38 38 #include "classes/DelphesPileUpWriter.h" 39 39 … … 65 65 Candidate *candidate = 0; 66 66 DelphesPileUpWriter *writer = 0; 67 DelphesHepMC Reader *reader = 0;67 DelphesHepMC2Reader *reader = 0; 68 68 Int_t i; 69 69 Long64_t length, eventCounter; … … 98 98 itParticle = stableParticleOutputArray->MakeIterator(); 99 99 100 reader = new DelphesHepMC Reader;100 reader = new DelphesHepMC2Reader; 101 101 102 102 i = 2; -
doc/genMakefile.tcl
rb03c0d0 rc1780a5 292 292 executableDeps {converters/*.cpp} {examples/*.cpp} {validation/*.cpp} 293 293 294 executableDeps {readers/DelphesHepMC .cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}294 executableDeps {readers/DelphesHepMC2.cpp} {readers/DelphesHepMC3.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp} 295 295 296 296 puts {ifeq ($(HAS_CMSSW),true)}
Note:
See TracChangeset
for help on using the changeset viewer.