Fork me on GitHub

Changes in Makefile [832ce9e:a740c66] in git


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r832ce9e ra740c66  
    2929OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    3030endif
    31 OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
     31OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    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
     42#CXXFLAGS += -I$(PYTHIA8)/include
     43#CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
     44#OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
    4545endif
    4646
    … …  
    257257        classes/DelphesClasses.h \
    258258        classes/DelphesFactory.h \
    259         classes/DelphesLHEFReader.h \
    260259        external/ExRootAnalysis/ExRootTreeWriter.h \
    261260        external/ExRootAnalysis/ExRootTreeBranch.h \
    … …  
    309308        modules/Delphes.h \
    310309        modules/AngularSmearing.h \
    311         modules/PhotonConversions.h \
    312310        modules/ParticlePropagator.h \
    313311        modules/Efficiency.h \
    … …  
    331329        modules/JetPileUpSubtractor.h \
    332330        modules/TrackPileUpSubtractor.h \
    333         modules/TaggingParticlesSkimmer.h \
    334331        modules/PileUpJetID.h \
    335332        modules/ConstituentFilter.h \
    … …  
    339336        modules/Weighter.h \
    340337        modules/Hector.h \
    341         modules/JetFlavorAssociation.h \
    342         modules/JetFakeParticle.h \
    343338        modules/ExampleModule.h
    344339ModulesDict$(PcmSuf): \
    … …  
    358353        modules/FastJetLinkDef.h \
    359354        modules/FastJetFinder.h \
    360         modules/FastJetGridMedianEstimator.h \
    361         modules/RunPUPPI.h
     355        modules/FastJetGridMedianEstimator.h
    362356FastJetDict$(PcmSuf): \
    363357        tmp/modules/FastJetDict$(PcmSuf) \
    … …  
    392386        classes/DelphesFactory.h \
    393387        classes/SortableObject.h
    394 tmp/classes/DelphesCylindricalFormula.$(ObjSuf): \
    395         classes/DelphesCylindricalFormula.$(SrcSuf) \
    396         classes/DelphesCylindricalFormula.h
    397388tmp/classes/DelphesFactory.$(ObjSuf): \
    398389        classes/DelphesFactory.$(SrcSuf) \
    … …  
    543534        classes/DelphesClasses.h \
    544535        classes/DelphesFactory.h \
    545         classes/DelphesFormula.h
     536        classes/DelphesFormula.h \
     537        external/ExRootAnalysis/ExRootResult.h \
     538        external/ExRootAnalysis/ExRootFilter.h \
     539        external/ExRootAnalysis/ExRootClassifier.h
    546540tmp/modules/Calorimeter.$(ObjSuf): \
    547541        modules/Calorimeter.$(SrcSuf) \
    … …  
    657651        external/ExRootAnalysis/ExRootFilter.h \
    658652        external/ExRootAnalysis/ExRootClassifier.h
    659 tmp/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
    668 tmp/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
    677653tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
    678654        modules/JetPileUpSubtractor.$(SrcSuf) \
    … …  
    729705        external/ExRootAnalysis/ExRootFilter.h \
    730706        external/ExRootAnalysis/ExRootClassifier.h
    731 tmp/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
    740707tmp/modules/PileUpJetID.$(ObjSuf): \
    741708        modules/PileUpJetID.$(SrcSuf) \
    … …  
    762729        classes/DelphesClasses.h \
    763730        classes/DelphesFactory.h \
    764         classes/DelphesTF2.h \
     731        classes/DelphesFormula.h \
    765732        classes/DelphesPileUpReader.h \
    766733        external/ExRootAnalysis/ExRootResult.h \
    … …  
    785752        external/ExRootAnalysis/ExRootFilter.h \
    786753        external/ExRootAnalysis/ExRootClassifier.h
    787 tmp/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
    797754tmp/modules/TauTagging.$(ObjSuf): \
    798755        modules/TauTagging.$(SrcSuf) \
    … …  
    800757        classes/DelphesClasses.h \
    801758        classes/DelphesFactory.h \
    802         classes/DelphesFormula.h
     759        classes/DelphesFormula.h \
     760        external/ExRootAnalysis/ExRootResult.h \
     761        external/ExRootAnalysis/ExRootFilter.h \
     762        external/ExRootAnalysis/ExRootClassifier.h
    803763tmp/modules/TimeSmearing.$(ObjSuf): \
    804764        modules/TimeSmearing.$(SrcSuf) \
    … …  
    855815DELPHES_OBJ +=  \
    856816        tmp/classes/DelphesClasses.$(ObjSuf) \
    857         tmp/classes/DelphesCylindricalFormula.$(ObjSuf) \
    858817        tmp/classes/DelphesFactory.$(ObjSuf) \
    859818        tmp/classes/DelphesFormula.$(ObjSuf) \
    … …  
    916875        tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
    917876        tmp/modules/Isolation.$(ObjSuf) \
    918         tmp/modules/JetFakeParticle.$(ObjSuf) \
    919         tmp/modules/JetFlavorAssociation.$(ObjSuf) \
    920877        tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
    921878        tmp/modules/LeptonDressing.$(ObjSuf) \
    … …  
    924881        tmp/modules/ParticlePropagator.$(ObjSuf) \
    925882        tmp/modules/PdgCodeFilter.$(ObjSuf) \
    926         tmp/modules/PhotonConversions.$(ObjSuf) \
    927883        tmp/modules/PileUpJetID.$(ObjSuf) \
    928884        tmp/modules/PileUpMerger.$(ObjSuf) \
    929885        tmp/modules/SimpleCalorimeter.$(ObjSuf) \
    930886        tmp/modules/StatusPidFilter.$(ObjSuf) \
    931         tmp/modules/TaggingParticlesSkimmer.$(ObjSuf) \
    932887        tmp/modules/TauTagging.$(ObjSuf) \
    933888        tmp/modules/TimeSmearing.$(ObjSuf) \
    … …  
    943898endif
    944899
    945 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
    946         external/PUPPI/puppiCleanContainer.$(SrcSuf) \
    947         external/fastjet/Selector.hh
    948900tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
    949901        external/fastjet/AreaDefinition.$(SrcSuf) \
    … …  
    11191071tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
    11201072        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
    1121 tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
    1122         external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
    1123         external/fastjet/JetDefinition.hh \
    1124         external/fastjet/ClusterSequenceAreaBase.hh
    1125 tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \
    1126         external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf)
    1127 tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \
    1128         external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \
    1129         external/fastjet/JetDefinition.hh \
    1130         external/fastjet/ClusterSequenceAreaBase.hh
    1131 tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf): \
    1132         external/fastjet/contribs/RecursiveTools/SoftDrop.$(SrcSuf)
    11331073tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
    11341074        external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
    … …  
    12641204        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    12651205        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.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
     1206        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
    12701207tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \
    12711208        modules/FastJetGridMedianEstimator.$(SrcSuf) \
    … …  
    12921229        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    12931230        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
    1294 tmp/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
    13041231FASTJET_OBJ +=  \
    1305         tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    13061232        tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
    13071233        tmp/external/fastjet/BasicRandom.$(ObjSuf) \
    … …  
    13501276        tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
    13511277        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) \
    13561278        tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
    13571279        tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
    … …  
    13971319        tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
    13981320        tmp/modules/FastJetFinder.$(ObjSuf) \
    1399         tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
    1400         tmp/modules/RunPUPPI.$(ObjSuf)
     1321        tmp/modules/FastJetGridMedianEstimator.$(ObjSuf)
    14011322
    14021323ifeq ($(HAS_PYTHIA8),true)
    … …  
    14081329        display/Delphes3DGeometry.$(SrcSuf) \
    14091330        display/Delphes3DGeometry.h \
    1410         classes/DelphesClasses.h \
    1411         external/ExRootAnalysis/ExRootConfReader.h
     1331        external/ExRootAnalysis/ExRootConfReader.h \
     1332        classes/DelphesClasses.h
    14121333tmp/display/DelphesBranchElement.$(ObjSuf): \
    14131334        display/DelphesBranchElement.$(SrcSuf) \
    … …  
    14221343tmp/display/DelphesEventDisplay.$(ObjSuf): \
    14231344        display/DelphesEventDisplay.$(SrcSuf) \
     1345        external/ExRootAnalysis/ExRootConfReader.h \
     1346        external/ExRootAnalysis/ExRootTreeReader.h \
    14241347        display/DelphesCaloData.h \
    14251348        display/DelphesBranchElement.h \
    14261349        display/Delphes3DGeometry.h \
    14271350        display/DelphesEventDisplay.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
     1351        classes/DelphesClasses.h
    14351352tmp/display/DelphesHtmlSummary.$(ObjSuf): \
    14361353        display/DelphesHtmlSummary.$(SrcSuf) \
    … …  
    14791396tmp/external/tcl/tclHash.$(ObjSuf): \
    14801397        external/tcl/tclHash.c
     1398tmp/external/tcl/tclHistory.$(ObjSuf): \
     1399        external/tcl/tclHistory.c
    14811400tmp/external/tcl/tclIndexObj.$(ObjSuf): \
    14821401        external/tcl/tclIndexObj.c
    … …  
    14911410tmp/external/tcl/tclParse.$(ObjSuf): \
    14921411        external/tcl/tclParse.c
     1412tmp/external/tcl/tclPosixStr.$(ObjSuf): \
     1413        external/tcl/tclPosixStr.c
    14931414tmp/external/tcl/tclPreserve.$(ObjSuf): \
    14941415        external/tcl/tclPreserve.c
    … …  
    15171438        tmp/external/tcl/tclGet.$(ObjSuf) \
    15181439        tmp/external/tcl/tclHash.$(ObjSuf) \
     1440        tmp/external/tcl/tclHistory.$(ObjSuf) \
    15191441        tmp/external/tcl/tclIndexObj.$(ObjSuf) \
    15201442        tmp/external/tcl/tclLink.$(ObjSuf) \
    … …  
    15231445        tmp/external/tcl/tclObj.$(ObjSuf) \
    15241446        tmp/external/tcl/tclParse.$(ObjSuf) \
     1447        tmp/external/tcl/tclPosixStr.$(ObjSuf) \
    15251448        tmp/external/tcl/tclPreserve.$(ObjSuf) \
    15261449        tmp/external/tcl/tclProc.$(ObjSuf) \
    … …  
    16151538        @touch $@
    16161539
     1540external/fastjet/Selector.hh: \
     1541        external/fastjet/PseudoJet.hh \
     1542        external/fastjet/RangeDefinition.hh
     1543        @touch $@
     1544
    16171545external/fastjet/internal/Dnn2piCylinder.hh: \
    16181546        external/fastjet/internal/DynamicNearestNeighbours.hh \
    16191547        external/fastjet/internal/DnnPlane.hh \
    16201548        external/fastjet/internal/numconsts.hh
    1621         @touch $@
    1622 
    1623 external/fastjet/Selector.hh: \
    1624         external/fastjet/PseudoJet.hh \
    1625         external/fastjet/RangeDefinition.hh
    16261549        @touch $@
    16271550
    … …  
    16791602        @touch $@
    16801603
    1681 modules/JetFakeParticle.h: \
    1682         classes/DelphesModule.h
    1683         @touch $@
    1684 
    16851604external/fastjet/ClusterSequence1GhostPassiveArea.hh: \
    16861605        external/fastjet/PseudoJet.hh \
    … …  
    17151634        external/fastjet/internal/numconsts.hh \
    17161635        external/fastjet/Error.hh
    1717         @touch $@
    1718 
    1719 modules/RunPUPPI.h: \
    1720         classes/DelphesModule.h
    17211636        @touch $@
    17221637
    … …  
    17571672        @touch $@
    17581673
     1674display/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
    17591682modules/TauTagging.h: \
    1760         classes/DelphesModule.h \
    1761         external/ExRootAnalysis/ExRootResult.h \
    1762         external/ExRootAnalysis/ExRootFilter.h \
    1763         external/ExRootAnalysis/ExRootClassifier.h
     1683        classes/DelphesModule.h
    17641684        @touch $@
    17651685
    … …  
    17991719        @touch $@
    18001720
    1801 modules/JetFlavorAssociation.h: \
    1802         classes/DelphesModule.h \
    1803         classes/DelphesClasses.h
    1804         @touch $@
    1805 
    18061721modules/ParticlePropagator.h: \
    18071722        classes/DelphesModule.h
    … …  
    18321747        @touch $@
    18331748
    1834 modules/PhotonConversions.h: \
    1835         classes/DelphesModule.h
    1836         @touch $@
    1837 
    18381749external/fastjet/ClusterSequenceVoronoiArea.hh: \
    18391750        external/fastjet/PseudoJet.hh \
    … …  
    18421753        @touch $@
    18431754
    1844 external/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 
    18521755modules/BTagging.h: \
    18531756        classes/DelphesModule.h
    … …  
    18721775
    18731776modules/Weighter.h: \
    1874         classes/DelphesModule.h
    1875         @touch $@
    1876 
    1877 modules/TaggingParticlesSkimmer.h: \
    18781777        classes/DelphesModule.h
    18791778        @touch $@
    … …  
    20641963        @echo ">> Building $(DISTTAR)"
    20651964        @mkdir -p $(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)
     1965        @cp -a CHANGELOG COPYING CREDITS README VERSION Makefile configure cards classes converters display doc examples external modules python readers $(DISTDIR)
    20671966        @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
    20681967        @tar -czf $(DISTTAR) $(DISTDIR)
Note: See TracChangeset for help on using the changeset viewer.