- Timestamp:
- Aug 25, 2016, 2:04:58 PM (8 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- 629e819
- Parents:
- 7bb13cd (diff), 1408174 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r7bb13cd r70b9632 250 250 external/ExRootAnalysis/ExRootTreeBranch.h \ 251 251 external/ExRootAnalysis/ExRootProgressBar.h 252 DelphesROOT$(ExeSuf): \ 253 tmp/readers/DelphesROOT.$(ObjSuf) 254 255 tmp/readers/DelphesROOT.$(ObjSuf): \ 256 readers/DelphesROOT.cpp \ 257 modules/Delphes.h \ 258 classes/DelphesStream.h \ 259 classes/DelphesClasses.h \ 260 classes/DelphesFactory.h \ 261 external/ExRootAnalysis/ExRootTreeWriter.h \ 262 external/ExRootAnalysis/ExRootTreeReader.h \ 263 external/ExRootAnalysis/ExRootTreeBranch.h \ 264 external/ExRootAnalysis/ExRootProgressBar.h 252 265 DelphesSTDHEP$(ExeSuf): \ 253 266 tmp/readers/DelphesSTDHEP.$(ObjSuf) … … 265 278 DelphesHepMC$(ExeSuf) \ 266 279 DelphesLHEF$(ExeSuf) \ 280 DelphesROOT$(ExeSuf) \ 267 281 DelphesSTDHEP$(ExeSuf) 268 282 … … 270 284 tmp/readers/DelphesHepMC.$(ObjSuf) \ 271 285 tmp/readers/DelphesLHEF.$(ObjSuf) \ 286 tmp/readers/DelphesROOT.$(ObjSuf) \ 272 287 tmp/readers/DelphesSTDHEP.$(ObjSuf) 273 288 … … 384 399 modules/EnergySmearing.h \ 385 400 modules/MomentumSmearing.h \ 401 modules/TrackSmearing.h \ 386 402 modules/ImpactParameterSmearing.h \ 387 403 modules/TimeSmearing.h \ … … 407 423 modules/StatusPidFilter.h \ 408 424 modules/PdgCodeFilter.h \ 425 modules/BeamSpotFilter.h \ 426 modules/RecoPuFilter.h \ 409 427 modules/Cloner.h \ 410 428 modules/Weighter.h \ … … 412 430 modules/JetFlavorAssociation.h \ 413 431 modules/JetFakeParticle.h \ 432 modules/VertexSorter.h \ 433 modules/VertexFinder.h \ 434 modules/VertexFinderDA4D.h \ 414 435 modules/ExampleModule.h 415 436 tmp/modules/ModulesDict$(PcmSuf): \ … … 618 639 classes/DelphesFactory.h \ 619 640 classes/DelphesFormula.h 641 tmp/modules/BeamSpotFilter.$(ObjSuf): \ 642 modules/BeamSpotFilter.$(SrcSuf) \ 643 modules/BeamSpotFilter.h \ 644 classes/DelphesClasses.h \ 645 classes/DelphesFactory.h \ 646 classes/DelphesFormula.h \ 647 external/ExRootAnalysis/ExRootResult.h \ 648 external/ExRootAnalysis/ExRootFilter.h \ 649 external/ExRootAnalysis/ExRootClassifier.h 620 650 tmp/modules/Calorimeter.$(ObjSuf): \ 621 651 modules/Calorimeter.$(SrcSuf) \ … … 850 880 external/ExRootAnalysis/ExRootFilter.h \ 851 881 external/ExRootAnalysis/ExRootClassifier.h 882 tmp/modules/RecoPuFilter.$(ObjSuf): \ 883 modules/RecoPuFilter.$(SrcSuf) \ 884 modules/RecoPuFilter.h \ 885 classes/DelphesClasses.h \ 886 classes/DelphesFactory.h \ 887 classes/DelphesFormula.h \ 888 external/ExRootAnalysis/ExRootResult.h \ 889 external/ExRootAnalysis/ExRootFilter.h \ 890 external/ExRootAnalysis/ExRootClassifier.h 852 891 tmp/modules/SimpleCalorimeter.$(ObjSuf): \ 853 892 modules/SimpleCalorimeter.$(SrcSuf) \ … … 911 950 modules/TrackPileUpSubtractor.$(SrcSuf) \ 912 951 modules/TrackPileUpSubtractor.h \ 952 classes/DelphesClasses.h \ 953 classes/DelphesFactory.h \ 954 classes/DelphesFormula.h \ 955 external/ExRootAnalysis/ExRootResult.h \ 956 external/ExRootAnalysis/ExRootFilter.h \ 957 external/ExRootAnalysis/ExRootClassifier.h 958 tmp/modules/TrackSmearing.$(ObjSuf): \ 959 modules/TrackSmearing.$(SrcSuf) \ 960 modules/TrackSmearing.h \ 913 961 classes/DelphesClasses.h \ 914 962 classes/DelphesFactory.h \ … … 933 981 classes/DelphesFactory.h \ 934 982 classes/DelphesFormula.h \ 983 external/ExRootAnalysis/ExRootResult.h \ 984 external/ExRootAnalysis/ExRootFilter.h \ 985 external/ExRootAnalysis/ExRootClassifier.h 986 tmp/modules/VertexFinder.$(ObjSuf): \ 987 modules/VertexFinder.$(SrcSuf) \ 988 modules/VertexFinder.h \ 989 classes/DelphesClasses.h \ 990 classes/DelphesFactory.h \ 991 classes/DelphesFormula.h \ 992 classes/DelphesPileUpReader.h \ 993 external/ExRootAnalysis/ExRootResult.h \ 994 external/ExRootAnalysis/ExRootFilter.h \ 995 external/ExRootAnalysis/ExRootClassifier.h 996 tmp/modules/VertexFinderDA4D.$(ObjSuf): \ 997 modules/VertexFinderDA4D.$(SrcSuf) \ 998 modules/VertexFinderDA4D.h \ 999 classes/DelphesClasses.h \ 1000 classes/DelphesFactory.h \ 1001 classes/DelphesFormula.h \ 1002 classes/DelphesPileUpReader.h \ 1003 external/ExRootAnalysis/ExRootResult.h \ 1004 external/ExRootAnalysis/ExRootFilter.h \ 1005 external/ExRootAnalysis/ExRootClassifier.h 1006 tmp/modules/VertexSorter.$(ObjSuf): \ 1007 modules/VertexSorter.$(SrcSuf) \ 1008 modules/VertexSorter.h \ 1009 classes/DelphesClasses.h \ 1010 classes/DelphesFactory.h \ 1011 classes/DelphesFormula.h \ 1012 classes/DelphesPileUpReader.h \ 935 1013 external/ExRootAnalysis/ExRootResult.h \ 936 1014 external/ExRootAnalysis/ExRootFilter.h \ … … 996 1074 tmp/modules/AngularSmearing.$(ObjSuf) \ 997 1075 tmp/modules/BTagging.$(ObjSuf) \ 1076 tmp/modules/BeamSpotFilter.$(ObjSuf) \ 998 1077 tmp/modules/Calorimeter.$(ObjSuf) \ 999 1078 tmp/modules/Cloner.$(ObjSuf) \ … … 1020 1099 tmp/modules/PileUpJetID.$(ObjSuf) \ 1021 1100 tmp/modules/PileUpMerger.$(ObjSuf) \ 1101 tmp/modules/RecoPuFilter.$(ObjSuf) \ 1022 1102 tmp/modules/SimpleCalorimeter.$(ObjSuf) \ 1023 1103 tmp/modules/StatusPidFilter.$(ObjSuf) \ … … 1028 1108 tmp/modules/TrackCountingTauTagging.$(ObjSuf) \ 1029 1109 tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \ 1110 tmp/modules/TrackSmearing.$(ObjSuf) \ 1030 1111 tmp/modules/TreeWriter.$(ObjSuf) \ 1031 1112 tmp/modules/UniqueObjectFinder.$(ObjSuf) \ 1113 tmp/modules/VertexFinder.$(ObjSuf) \ 1114 tmp/modules/VertexFinderDA4D.$(ObjSuf) \ 1115 tmp/modules/VertexSorter.$(ObjSuf) \ 1032 1116 tmp/modules/Weighter.$(ObjSuf) 1033 1117 … … 1634 1718 tmp/external/tcl/tclVar.$(ObjSuf) 1635 1719 1720 modules/VertexFinderDA4D.h: \ 1721 classes/DelphesModule.h \ 1722 classes/DelphesClasses.h 1723 @touch $@ 1724 1725 modules/TrackSmearing.h: \ 1726 classes/DelphesModule.h 1727 @touch $@ 1728 1636 1729 external/fastjet/ClusterSequence.hh: \ 1637 1730 external/fastjet/PseudoJet.hh \ … … 1894 1987 @touch $@ 1895 1988 1989 modules/VertexSorter.h: \ 1990 classes/DelphesModule.h \ 1991 classes/DelphesClasses.h 1992 @touch $@ 1993 1896 1994 modules/Delphes.h: \ 1897 1995 classes/DelphesModule.h 1996 @touch $@ 1997 1998 modules/VertexFinder.h: \ 1999 classes/DelphesModule.h \ 2000 classes/DelphesClasses.h 1898 2001 @touch $@ 1899 2002 … … 1967 2070 @touch $@ 1968 2071 2072 modules/RecoPuFilter.h: \ 2073 classes/DelphesModule.h 2074 @touch $@ 2075 1969 2076 modules/Hector.h: \ 1970 2077 classes/DelphesModule.h … … 2066 2173 2067 2174 modules/FastJetFinder.h: \ 2175 classes/DelphesModule.h 2176 @touch $@ 2177 2178 modules/BeamSpotFilter.h: \ 2068 2179 classes/DelphesModule.h 2069 2180 @touch $@
Note:
See TracChangeset
for help on using the changeset viewer.