Changeset 1123 in svn
- Timestamp:
- May 26, 2013, 2:00:39 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r1113 r1123 186 186 modules/StatusPidFilter.h \ 187 187 modules/Cloner.h \ 188 modules/Weighter.h \ 188 189 modules/ExampleModule.h 189 190 tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \ … … 396 397 external/ExRootAnalysis/ExRootClassifier.h \ 397 398 external/ExRootAnalysis/ExRootTreeBranch.h 399 tmp/modules/Weighter.$(ObjSuf): \ 400 modules/Weighter.$(SrcSuf) \ 401 modules/Weighter.h \ 402 classes/DelphesClasses.h \ 403 classes/DelphesFactory.h \ 404 classes/DelphesFormula.h \ 405 external/ExRootAnalysis/ExRootResult.h \ 406 external/ExRootAnalysis/ExRootFilter.h \ 407 external/ExRootAnalysis/ExRootClassifier.h 398 408 tmp/modules/Delphes.$(ObjSuf): \ 399 409 modules/Delphes.$(SrcSuf) \ … … 763 773 tmp/modules/BTagging.$(ObjSuf) \ 764 774 tmp/modules/TreeWriter.$(ObjSuf) \ 775 tmp/modules/Weighter.$(ObjSuf) \ 765 776 tmp/modules/Delphes.$(ObjSuf) \ 766 777 tmp/modules/Calorimeter.$(ObjSuf) \ … … 1022 1033 @touch $@ 1023 1034 1035 external/fastjet/Selector.hh: \ 1036 external/fastjet/PseudoJet.hh \ 1037 external/fastjet/RangeDefinition.hh 1038 @touch $@ 1039 1024 1040 modules/JetPileUpSubtractor.h: \ 1025 1041 classes/DelphesModule.h 1026 @touch $@1027 1028 external/fastjet/Selector.hh: \1029 external/fastjet/PseudoJet.hh \1030 external/fastjet/RangeDefinition.hh1031 1042 @touch $@ 1032 1043 … … 1159 1170 1160 1171 modules/BTagging.h: \ 1172 classes/DelphesModule.h 1173 @touch $@ 1174 1175 modules/Weighter.h: \ 1161 1176 classes/DelphesModule.h 1162 1177 @touch $@ -
trunk/classes/ClassesLinkDef.h
r1114 r1123 37 37 #pragma link C++ class ScalarHT+; 38 38 #pragma link C++ class Rho+; 39 #pragma link C++ class Weight+; 39 40 #pragma link C++ class Photon+; 40 41 #pragma link C++ class Electron+; -
trunk/classes/DelphesClasses.h
r1114 r1123 175 175 //--------------------------------------------------------------------------- 176 176 177 class Weight: public TObject 178 { 179 public: 180 Float_t Weight; // weight for the event 181 182 ClassDef(Weight, 1) 183 }; 184 185 //--------------------------------------------------------------------------- 186 177 187 class Photon: public SortableObject 178 188 { -
trunk/modules/ModulesLinkDef.h
r1099 r1123 7 7 * $Revision$ 8 8 * 9 * 9 * 10 10 * \author P. Demin - UCL, Louvain-la-Neuve 11 11 * … … 13 13 14 14 #include "modules/Delphes.h" 15 15 16 16 #include "modules/FastJetFinder.h" 17 17 #include "modules/ParticlePropagator.h" … … 33 33 #include "modules/StatusPidFilter.h" 34 34 #include "modules/Cloner.h" 35 #include "modules/Weighter.h" 35 36 #include "modules/ExampleModule.h" 36 37 … … 62 63 #pragma link C++ class StatusPidFilter+; 63 64 #pragma link C++ class Cloner+; 65 #pragma link C++ class Weighter+; 64 66 #pragma link C++ class ExampleModule+; 65 67 -
trunk/modules/TreeWriter.cc
r1115 r1123 65 65 fClassMap[ScalarHT::Class()] = &TreeWriter::ProcessScalarHT; 66 66 fClassMap[Rho::Class()] = &TreeWriter::ProcessRho; 67 fClassMap[Weight::Class()] = &TreeWriter::ProcessWeight; 67 68 68 69 TBranchMap::iterator itBranchMap; … … 538 539 //------------------------------------------------------------------------------ 539 540 541 void TreeWriter::ProcessWeight(ExRootTreeBranch *branch, TObjArray *array) 542 { 543 Candidate *candidate = 0; 544 Weight *entry = 0; 545 546 // get the first entry 547 if((candidate = static_cast<Candidate*>(array->At(0)))) 548 { 549 const TLorentzVector &momentum = candidate->Momentum; 550 551 entry = static_cast<Weight*>(branch->NewEntry()); 552 553 entry->Weight = momentum.E(); 554 } 555 } 556 557 //------------------------------------------------------------------------------ 558 540 559 void TreeWriter::Process() 541 560 { -
trunk/modules/TreeWriter.h
r1114 r1123 51 51 void ProcessScalarHT(ExRootTreeBranch *branch, TObjArray *array); 52 52 void ProcessRho(ExRootTreeBranch *branch, TObjArray *array); 53 void ProcessWeight(ExRootTreeBranch *branch, TObjArray *array); 53 54 54 55 #ifndef __CINT__
Note:
See TracChangeset
for help on using the changeset viewer.