Changeset 5cecbc1 in git
- Timestamp:
- Jul 24, 2015, 2:41:51 PM (9 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- ab24890
- Parents:
- 1343a07
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r1343a07 r5cecbc1 339 339 modules/Weighter.h \ 340 340 modules/Hector.h \ 341 modules/RunPUPPI.h \342 341 modules/JetFlavorAssociation.h \ 343 342 modules/ExampleModule.h … … 358 357 modules/FastJetLinkDef.h \ 359 358 modules/FastJetFinder.h \ 360 modules/FastJetGridMedianEstimator.h 359 modules/FastJetGridMedianEstimator.h \ 360 modules/RunPUPPI.h 361 361 FastJetDict$(PcmSuf): \ 362 362 tmp/modules/FastJetDict$(PcmSuf) \ … … 528 528 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \ 529 529 external/Hector/H_VerticalQuadrupole.$(SrcSuf) 530 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \531 external/PUPPI/puppiCleanContainer.$(SrcSuf) \532 external/fastjet/Selector.hh533 530 tmp/modules/AngularSmearing.$(ObjSuf): \ 534 531 modules/AngularSmearing.$(SrcSuf) \ … … 545 542 classes/DelphesClasses.h \ 546 543 classes/DelphesFactory.h \ 547 classes/DelphesFormula.h \ 548 external/ExRootAnalysis/ExRootResult.h \ 549 external/ExRootAnalysis/ExRootFilter.h \ 550 external/ExRootAnalysis/ExRootClassifier.h 544 classes/DelphesFormula.h 551 545 tmp/modules/Calorimeter.$(ObjSuf): \ 552 546 modules/Calorimeter.$(SrcSuf) \ … … 763 757 external/ExRootAnalysis/ExRootFilter.h \ 764 758 external/ExRootAnalysis/ExRootClassifier.h 765 tmp/modules/RunPUPPI.$(ObjSuf): \766 modules/RunPUPPI.$(SrcSuf) \767 modules/RunPUPPI.h \768 external/PUPPI/puppiCleanContainer.hh \769 external/PUPPI/RecoObj.hh \770 external/PUPPI/puppiParticle.hh \771 external/PUPPI/puppiAlgoBin.hh \772 classes/DelphesClasses.h \773 classes/DelphesFactory.h \774 classes/DelphesFormula.h775 759 tmp/modules/SimpleCalorimeter.$(ObjSuf): \ 776 760 modules/SimpleCalorimeter.$(SrcSuf) \ … … 908 892 tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \ 909 893 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \ 910 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \911 894 tmp/modules/AngularSmearing.$(ObjSuf) \ 912 895 tmp/modules/BTagging.$(ObjSuf) \ … … 933 916 tmp/modules/PileUpJetID.$(ObjSuf) \ 934 917 tmp/modules/PileUpMerger.$(ObjSuf) \ 935 tmp/modules/RunPUPPI.$(ObjSuf) \936 918 tmp/modules/SimpleCalorimeter.$(ObjSuf) \ 937 919 tmp/modules/StatusPidFilter.$(ObjSuf) \ … … 950 932 endif 951 933 934 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \ 935 external/PUPPI/puppiCleanContainer.$(SrcSuf) \ 936 external/fastjet/Selector.hh 952 937 tmp/external/fastjet/AreaDefinition.$(ObjSuf): \ 953 938 external/fastjet/AreaDefinition.$(SrcSuf) \ … … 1296 1281 external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \ 1297 1282 external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh 1283 tmp/modules/RunPUPPI.$(ObjSuf): \ 1284 modules/RunPUPPI.$(SrcSuf) \ 1285 modules/RunPUPPI.h \ 1286 external/PUPPI/puppiCleanContainer.hh \ 1287 external/PUPPI/RecoObj.hh \ 1288 external/PUPPI/puppiParticle.hh \ 1289 external/PUPPI/puppiAlgoBin.hh \ 1290 classes/DelphesClasses.h \ 1291 classes/DelphesFactory.h \ 1292 classes/DelphesFormula.h 1298 1293 FASTJET_OBJ += \ 1294 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \ 1299 1295 tmp/external/fastjet/AreaDefinition.$(ObjSuf) \ 1300 1296 tmp/external/fastjet/BasicRandom.$(ObjSuf) \ … … 1390 1386 tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \ 1391 1387 tmp/modules/FastJetFinder.$(ObjSuf) \ 1392 tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) 1388 tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \ 1389 tmp/modules/RunPUPPI.$(ObjSuf) 1393 1390 1394 1391 ifeq ($(HAS_PYTHIA8),true) -
doc/genMakefile.tcl
r1343a07 r5cecbc1 103 103 if {$fileName == "modules/PileUpMergerPythia8.cc"} { 104 104 lappend srcObjFilesPythia8 $srcObjName$objSuf 105 } elseif { [string match {modules/FastJet*.cc} $fileName] || [string match {modules/RunPUPPI.cc} $fileName]&& $srcPrefix != {FASTJET}} {105 } elseif {([string match {modules/FastJet*.cc} $fileName] || [string match {modules/RunPUPPI.cc} $fileName]) && $srcPrefix != {FASTJET}} { 106 106 continue 107 107 } else {
Note:
See TracChangeset
for help on using the changeset viewer.