Fork me on GitHub

Changeset d77b51d in git for Makefile


Ignore:
Timestamp:
Sep 29, 2015, 2:08:10 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
a98c7ef
Parents:
d870fc5 (diff), 06ec139 (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.
Message:

Merge remote-tracking branch 'upstream/master'

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rd870fc5 rd77b51d  
    2929OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    3030endif
    31 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     31OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
    3232endif
    3333
    … …  
    4040ifneq ($(PYTHIA8),)
    4141#HAS_PYTHIA8 = true
    42 #CXXFLAGS += -I$(PYTHIA8)/include
    43 #CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
    44 #OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
     42CXXFLAGS += -I$(PYTHIA8)/include
     43CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
     44OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
    4545endif
    4646
    … …  
    257257        classes/DelphesClasses.h \
    258258        classes/DelphesFactory.h \
     259        classes/DelphesLHEFReader.h \
    259260        external/ExRootAnalysis/ExRootTreeWriter.h \
    260261        external/ExRootAnalysis/ExRootTreeBranch.h \
    … …  
    308309        modules/Delphes.h \
    309310        modules/AngularSmearing.h \
     311        modules/PhotonConversions.h \
    310312        modules/ParticlePropagator.h \
    311313        modules/Efficiency.h \
    … …  
    329331        modules/JetPileUpSubtractor.h \
    330332        modules/TrackPileUpSubtractor.h \
     333        modules/TaggingParticlesSkimmer.h \
    331334        modules/PileUpJetID.h \
    332335        modules/ConstituentFilter.h \
    … …  
    336339        modules/Weighter.h \
    337340        modules/Hector.h \
     341        modules/JetFlavorAssociation.h \
     342        modules/JetFakeParticle.h \
    338343        modules/ExampleModule.h
    339344ModulesDict$(PcmSuf): \
    … …  
    353358        modules/FastJetLinkDef.h \
    354359        modules/FastJetFinder.h \
    355         modules/FastJetGridMedianEstimator.h
     360        modules/FastJetGridMedianEstimator.h \
     361        modules/RunPUPPI.h
    356362FastJetDict$(PcmSuf): \
    357363        tmp/modules/FastJetDict$(PcmSuf) \
    … …  
    386392        classes/DelphesFactory.h \
    387393        classes/SortableObject.h
     394tmp/classes/DelphesCylindricalFormula.$(ObjSuf): \
     395        classes/DelphesCylindricalFormula.$(SrcSuf) \
     396        classes/DelphesCylindricalFormula.h
    388397tmp/classes/DelphesFactory.$(ObjSuf): \
    389398        classes/DelphesFactory.$(SrcSuf) \
    … …  
    534543        classes/DelphesClasses.h \
    535544        classes/DelphesFactory.h \
    536         classes/DelphesFormula.h \
    537         external/ExRootAnalysis/ExRootResult.h \
    538         external/ExRootAnalysis/ExRootFilter.h \
    539         external/ExRootAnalysis/ExRootClassifier.h
     545        classes/DelphesFormula.h
    540546tmp/modules/Calorimeter.$(ObjSuf): \
    541547        modules/Calorimeter.$(SrcSuf) \
    … …  
    651657        external/ExRootAnalysis/ExRootFilter.h \
    652658        external/ExRootAnalysis/ExRootClassifier.h
     659tmp/modules/JetFakeParticle.$(ObjSuf): \
     660        modules/JetFakeParticle.$(SrcSuf) \
     661        modules/JetFakeParticle.h \
     662        classes/DelphesClasses.h \
     663        classes/DelphesFactory.h \
     664        classes/DelphesFormula.h \
     665        external/ExRootAnalysis/ExRootResult.h \
     666        external/ExRootAnalysis/ExRootFilter.h \
     667        external/ExRootAnalysis/ExRootClassifier.h
     668tmp/modules/JetFlavorAssociation.$(ObjSuf): \
     669        modules/JetFlavorAssociation.$(SrcSuf) \
     670        modules/JetFlavorAssociation.h \
     671        classes/DelphesClasses.h \
     672        classes/DelphesFactory.h \
     673        classes/DelphesFormula.h \
     674        external/ExRootAnalysis/ExRootResult.h \
     675        external/ExRootAnalysis/ExRootFilter.h \
     676        external/ExRootAnalysis/ExRootClassifier.h
    653677tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
    654678        modules/JetPileUpSubtractor.$(SrcSuf) \
    … …  
    705729        external/ExRootAnalysis/ExRootFilter.h \
    706730        external/ExRootAnalysis/ExRootClassifier.h
     731tmp/modules/PhotonConversions.$(ObjSuf): \
     732        modules/PhotonConversions.$(SrcSuf) \
     733        modules/PhotonConversions.h \
     734        classes/DelphesClasses.h \
     735        classes/DelphesFactory.h \
     736        classes/DelphesCylindricalFormula.h \
     737        external/ExRootAnalysis/ExRootResult.h \
     738        external/ExRootAnalysis/ExRootFilter.h \
     739        external/ExRootAnalysis/ExRootClassifier.h
    707740tmp/modules/PileUpJetID.$(ObjSuf): \
    708741        modules/PileUpJetID.$(SrcSuf) \
    … …  
    729762        classes/DelphesClasses.h \
    730763        classes/DelphesFactory.h \
    731         classes/DelphesFormula.h \
     764        classes/DelphesTF2.h \
    732765        classes/DelphesPileUpReader.h \
    733766        external/ExRootAnalysis/ExRootResult.h \
    … …  
    752785        external/ExRootAnalysis/ExRootFilter.h \
    753786        external/ExRootAnalysis/ExRootClassifier.h
     787tmp/modules/TaggingParticlesSkimmer.$(ObjSuf): \
     788        modules/TaggingParticlesSkimmer.$(SrcSuf) \
     789        modules/TaggingParticlesSkimmer.h \
     790        modules/TauTagging.h \
     791        classes/DelphesClasses.h \
     792        classes/DelphesFactory.h \
     793        classes/DelphesFormula.h \
     794        external/ExRootAnalysis/ExRootResult.h \
     795        external/ExRootAnalysis/ExRootFilter.h \
     796        external/ExRootAnalysis/ExRootClassifier.h
    754797tmp/modules/TauTagging.$(ObjSuf): \
    755798        modules/TauTagging.$(SrcSuf) \
    … …  
    757800        classes/DelphesClasses.h \
    758801        classes/DelphesFactory.h \
    759         classes/DelphesFormula.h \
    760         external/ExRootAnalysis/ExRootResult.h \
    761         external/ExRootAnalysis/ExRootFilter.h \
    762         external/ExRootAnalysis/ExRootClassifier.h
     802        classes/DelphesFormula.h
    763803tmp/modules/TimeSmearing.$(ObjSuf): \
    764804        modules/TimeSmearing.$(SrcSuf) \
    … …  
    815855DELPHES_OBJ +=  \
    816856        tmp/classes/DelphesClasses.$(ObjSuf) \
     857        tmp/classes/DelphesCylindricalFormula.$(ObjSuf) \
    817858        tmp/classes/DelphesFactory.$(ObjSuf) \
    818859        tmp/classes/DelphesFormula.$(ObjSuf) \
    … …  
    875916        tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
    876917        tmp/modules/Isolation.$(ObjSuf) \
     918        tmp/modules/JetFakeParticle.$(ObjSuf) \
     919        tmp/modules/JetFlavorAssociation.$(ObjSuf) \
    877920        tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
    878921        tmp/modules/LeptonDressing.$(ObjSuf) \
    … …  
    881924        tmp/modules/ParticlePropagator.$(ObjSuf) \
    882925        tmp/modules/PdgCodeFilter.$(ObjSuf) \
     926        tmp/modules/PhotonConversions.$(ObjSuf) \
    883927        tmp/modules/PileUpJetID.$(ObjSuf) \
    884928        tmp/modules/PileUpMerger.$(ObjSuf) \
    885929        tmp/modules/SimpleCalorimeter.$(ObjSuf) \
    886930        tmp/modules/StatusPidFilter.$(ObjSuf) \
     931        tmp/modules/TaggingParticlesSkimmer.$(ObjSuf) \
    887932        tmp/modules/TauTagging.$(ObjSuf) \
    888933        tmp/modules/TimeSmearing.$(ObjSuf) \
    … …  
    898943endif
    899944
     945tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
     946        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
     947        external/fastjet/Selector.hh
    900948tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
    901949        external/fastjet/AreaDefinition.$(SrcSuf) \
    … …  
    10711119tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
    10721120        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
     1121tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
     1122        external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
     1123        external/fastjet/JetDefinition.hh \
     1124        external/fastjet/ClusterSequenceAreaBase.hh
     1125tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \
     1126        external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf)
     1127tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \
     1128        external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \
     1129        external/fastjet/JetDefinition.hh \
     1130        external/fastjet/ClusterSequenceAreaBase.hh
     1131tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf): \
     1132        external/fastjet/contribs/RecursiveTools/SoftDrop.$(SrcSuf)
    10731133tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
    10741134        external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
    … …  
    12041264        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    12051265        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    1206         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
     1266        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh \
     1267        external/fastjet/tools/Filter.hh \
     1268        external/fastjet/tools/Pruner.hh \
     1269        external/fastjet/contribs/RecursiveTools/SoftDrop.hh
    12071270tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \
    12081271        modules/FastJetGridMedianEstimator.$(SrcSuf) \
    … …  
    12291292        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    12301293        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
     1294tmp/modules/RunPUPPI.$(ObjSuf): \
     1295        modules/RunPUPPI.$(SrcSuf) \
     1296        modules/RunPUPPI.h \
     1297        external/PUPPI/puppiCleanContainer.hh \
     1298        external/PUPPI/RecoObj.hh \
     1299        external/PUPPI/puppiParticle.hh \
     1300        external/PUPPI/puppiAlgoBin.hh \
     1301        classes/DelphesClasses.h \
     1302        classes/DelphesFactory.h \
     1303        classes/DelphesFormula.h
    12311304FASTJET_OBJ +=  \
     1305        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    12321306        tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
    12331307        tmp/external/fastjet/BasicRandom.$(ObjSuf) \
    … …  
    12761350        tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
    12771351        tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
     1352        tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
     1353        tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
     1354        tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf) \
     1355        tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \
    12781356        tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
    12791357        tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
    … …  
    13191397        tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
    13201398        tmp/modules/FastJetFinder.$(ObjSuf) \
    1321         tmp/modules/FastJetGridMedianEstimator.$(ObjSuf)
     1399        tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
     1400        tmp/modules/RunPUPPI.$(ObjSuf)
    13221401
    13231402ifeq ($(HAS_PYTHIA8),true)
    … …  
    13291408        display/Delphes3DGeometry.$(SrcSuf) \
    13301409        display/Delphes3DGeometry.h \
    1331         external/ExRootAnalysis/ExRootConfReader.h \
    1332         classes/DelphesClasses.h
     1410        classes/DelphesClasses.h \
     1411        external/ExRootAnalysis/ExRootConfReader.h
    13331412tmp/display/DelphesBranchElement.$(ObjSuf): \
    13341413        display/DelphesBranchElement.$(SrcSuf) \
    … …  
    13431422tmp/display/DelphesEventDisplay.$(ObjSuf): \
    13441423        display/DelphesEventDisplay.$(SrcSuf) \
    1345         external/ExRootAnalysis/ExRootConfReader.h \
    1346         external/ExRootAnalysis/ExRootTreeReader.h \
    13471424        display/DelphesCaloData.h \
    13481425        display/DelphesBranchElement.h \
    13491426        display/Delphes3DGeometry.h \
    13501427        display/DelphesEventDisplay.h \
    1351         classes/DelphesClasses.h
     1428        display/DelphesDisplay.h \
     1429        display/Delphes3DGeometry.h \
     1430        display/DelphesHtmlSummary.h \
     1431        display/DelphesPlotSummary.h \
     1432        classes/DelphesClasses.h \
     1433        external/ExRootAnalysis/ExRootConfReader.h \
     1434        external/ExRootAnalysis/ExRootTreeReader.h
    13521435tmp/display/DelphesHtmlSummary.$(ObjSuf): \
    13531436        display/DelphesHtmlSummary.$(SrcSuf) \
    … …  
    13961479tmp/external/tcl/tclHash.$(ObjSuf): \
    13971480        external/tcl/tclHash.c
    1398 tmp/external/tcl/tclHistory.$(ObjSuf): \
    1399         external/tcl/tclHistory.c
    14001481tmp/external/tcl/tclIndexObj.$(ObjSuf): \
    14011482        external/tcl/tclIndexObj.c
    … …  
    14101491tmp/external/tcl/tclParse.$(ObjSuf): \
    14111492        external/tcl/tclParse.c
    1412 tmp/external/tcl/tclPosixStr.$(ObjSuf): \
    1413         external/tcl/tclPosixStr.c
    14141493tmp/external/tcl/tclPreserve.$(ObjSuf): \
    14151494        external/tcl/tclPreserve.c
    … …  
    14381517        tmp/external/tcl/tclGet.$(ObjSuf) \
    14391518        tmp/external/tcl/tclHash.$(ObjSuf) \
    1440         tmp/external/tcl/tclHistory.$(ObjSuf) \
    14411519        tmp/external/tcl/tclIndexObj.$(ObjSuf) \
    14421520        tmp/external/tcl/tclLink.$(ObjSuf) \
    … …  
    14451523        tmp/external/tcl/tclObj.$(ObjSuf) \
    14461524        tmp/external/tcl/tclParse.$(ObjSuf) \
    1447         tmp/external/tcl/tclPosixStr.$(ObjSuf) \
    14481525        tmp/external/tcl/tclPreserve.$(ObjSuf) \
    14491526        tmp/external/tcl/tclProc.$(ObjSuf) \
    … …  
    15381615        @touch $@
    15391616
    1540 external/fastjet/Selector.hh: \
    1541         external/fastjet/PseudoJet.hh \
    1542         external/fastjet/RangeDefinition.hh
    1543         @touch $@
    1544 
    15451617external/fastjet/internal/Dnn2piCylinder.hh: \
    15461618        external/fastjet/internal/DynamicNearestNeighbours.hh \
    15471619        external/fastjet/internal/DnnPlane.hh \
    15481620        external/fastjet/internal/numconsts.hh
     1621        @touch $@
     1622
     1623external/fastjet/Selector.hh: \
     1624        external/fastjet/PseudoJet.hh \
     1625        external/fastjet/RangeDefinition.hh
    15491626        @touch $@
    15501627
    … …  
    16021679        @touch $@
    16031680
     1681modules/JetFakeParticle.h: \
     1682        classes/DelphesModule.h
     1683        @touch $@
     1684
    16041685external/fastjet/ClusterSequence1GhostPassiveArea.hh: \
    16051686        external/fastjet/PseudoJet.hh \
    … …  
    16341715        external/fastjet/internal/numconsts.hh \
    16351716        external/fastjet/Error.hh
     1717        @touch $@
     1718
     1719modules/RunPUPPI.h: \
     1720        classes/DelphesModule.h
    16361721        @touch $@
    16371722
    … …  
    16721757        @touch $@
    16731758
    1674 display/DelphesEventDisplay.h: \
    1675         external/ExRootAnalysis/ExRootTreeReader.h \
    1676         display/DelphesDisplay.h \
    1677         display/Delphes3DGeometry.h \
    1678         display/DelphesHtmlSummary.h \
    1679         display/DelphesPlotSummary.h
    1680         @touch $@
    1681 
    16821759modules/TauTagging.h: \
    1683         classes/DelphesModule.h
     1760        classes/DelphesModule.h \
     1761        external/ExRootAnalysis/ExRootResult.h \
     1762        external/ExRootAnalysis/ExRootFilter.h \
     1763        external/ExRootAnalysis/ExRootClassifier.h
    16841764        @touch $@
    16851765
    … …  
    17191799        @touch $@
    17201800
     1801modules/JetFlavorAssociation.h: \
     1802        classes/DelphesModule.h \
     1803        classes/DelphesClasses.h
     1804        @touch $@
     1805
    17211806modules/ParticlePropagator.h: \
    17221807        classes/DelphesModule.h
    … …  
    17471832        @touch $@
    17481833
     1834modules/PhotonConversions.h: \
     1835        classes/DelphesModule.h
     1836        @touch $@
     1837
    17491838external/fastjet/ClusterSequenceVoronoiArea.hh: \
    17501839        external/fastjet/PseudoJet.hh \
    … …  
    17531842        @touch $@
    17541843
     1844external/PUPPI/puppiCleanContainer.hh: \
     1845        external/PUPPI/RecoObj.hh \
     1846        external/PUPPI/puppiParticle.hh \
     1847        external/PUPPI/puppiAlgoBin.hh \
     1848        external/fastjet/internal/base.hh \
     1849        external/fastjet/PseudoJet.hh
     1850        @touch $@
     1851
    17551852modules/BTagging.h: \
    17561853        classes/DelphesModule.h
    … …  
    17751872
    17761873modules/Weighter.h: \
     1874        classes/DelphesModule.h
     1875        @touch $@
     1876
     1877modules/TaggingParticlesSkimmer.h: \
    17771878        classes/DelphesModule.h
    17781879        @touch $@
    … …  
    19632064        @echo ">> Building $(DISTTAR)"
    19642065        @mkdir -p $(DISTDIR)
    1965         @cp -a CHANGELOG COPYING CREDITS README VERSION Makefile configure cards classes converters display doc examples external modules python readers $(DISTDIR)
     2066        @cp -a CHANGELOG CMakeLists.txt COPYING CREDITS DelphesEnv.sh README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers $(DISTDIR)
    19662067        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    19672068        @tar -czf $(DISTTAR) $(DISTDIR)
Note: See TracChangeset for help on using the changeset viewer.