Fork me on GitHub

Changeset 28027d5 in git for Makefile


Ignore:
Timestamp:
Jun 26, 2015, 3:13:55 PM (9 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
f3c4047
Parents:
f53a4d2 (diff), fe0273c (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 pull request #15 from delphes/mergeCMS

merge with the CMS code

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rf53a4d2 r28027d5  
    257257        classes/DelphesClasses.h \
    258258        classes/DelphesFactory.h \
     259        classes/DelphesLHEFReader.h \
    259260        external/ExRootAnalysis/ExRootTreeWriter.h \
    260261        external/ExRootAnalysis/ExRootTreeBranch.h \
    … …  
    337338        modules/Weighter.h \
    338339        modules/Hector.h \
     340        modules/RunPUPPI.h \
     341        modules/JetFlavorAssociation.h \
    339342        modules/ExampleModule.h
    340343ModulesDict$(PcmSuf): \
    … …  
    521524tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
    522525        external/Hector/H_VerticalQuadrupole.$(SrcSuf)
     526tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
     527        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
     528        external/fastjet/Selector.hh
    523529tmp/modules/AngularSmearing.$(ObjSuf): \
    524530        modules/AngularSmearing.$(SrcSuf) \
    … …  
    652658        external/ExRootAnalysis/ExRootFilter.h \
    653659        external/ExRootAnalysis/ExRootClassifier.h
     660tmp/modules/JetFlavorAssociation.$(ObjSuf): \
     661        modules/JetFlavorAssociation.$(SrcSuf) \
     662        modules/JetFlavorAssociation.h \
     663        classes/DelphesClasses.h \
     664        classes/DelphesFactory.h \
     665        classes/DelphesFormula.h \
     666        external/ExRootAnalysis/ExRootResult.h \
     667        external/ExRootAnalysis/ExRootFilter.h \
     668        external/ExRootAnalysis/ExRootClassifier.h
    654669tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
    655670        modules/JetPileUpSubtractor.$(SrcSuf) \
    … …  
    730745        classes/DelphesClasses.h \
    731746        classes/DelphesFactory.h \
    732         classes/DelphesFormula.h \
     747        classes/DelphesTF2.h \
    733748        classes/DelphesPileUpReader.h \
    734749        external/ExRootAnalysis/ExRootResult.h \
    735750        external/ExRootAnalysis/ExRootFilter.h \
    736751        external/ExRootAnalysis/ExRootClassifier.h
     752tmp/modules/RunPUPPI.$(ObjSuf): \
     753        modules/RunPUPPI.$(SrcSuf) \
     754        modules/RunPUPPI.h \
     755        external/PUPPI/puppiCleanContainer.hh \
     756        external/PUPPI/RecoObj.hh \
     757        external/PUPPI/puppiParticle.hh \
     758        external/PUPPI/puppiAlgoBin.hh \
     759        classes/DelphesClasses.h \
     760        classes/DelphesFactory.h \
     761        classes/DelphesFormula.h
    737762tmp/modules/SimpleCalorimeter.$(ObjSuf): \
    738763        modules/SimpleCalorimeter.$(SrcSuf) \
    … …  
    869894        tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
    870895        tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
     896        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    871897        tmp/modules/AngularSmearing.$(ObjSuf) \
    872898        tmp/modules/BTagging.$(ObjSuf) \
    … …  
    883909        tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
    884910        tmp/modules/Isolation.$(ObjSuf) \
     911        tmp/modules/JetFlavorAssociation.$(ObjSuf) \
    885912        tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
    886913        tmp/modules/LeptonDressing.$(ObjSuf) \
    … …  
    891918        tmp/modules/PileUpJetID.$(ObjSuf) \
    892919        tmp/modules/PileUpMerger.$(ObjSuf) \
     920        tmp/modules/RunPUPPI.$(ObjSuf) \
    893921        tmp/modules/SimpleCalorimeter.$(ObjSuf) \
    894922        tmp/modules/StatusPidFilter.$(ObjSuf) \
    … …  
    10801108tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
    10811109        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
     1110tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
     1111        external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
     1112        external/fastjet/JetDefinition.hh \
     1113        external/fastjet/ClusterSequenceAreaBase.hh
     1114tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \
     1115        external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf)
     1116tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \
     1117        external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \
     1118        external/fastjet/JetDefinition.hh \
     1119        external/fastjet/ClusterSequenceAreaBase.hh
     1120tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf): \
     1121        external/fastjet/contribs/RecursiveTools/SoftDrop.$(SrcSuf)
    10821122tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
    10831123        external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
    … …  
    12131253        external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
    12141254        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    1215         external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
     1255        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh \
     1256        external/fastjet/tools/Filter.hh \
     1257        external/fastjet/tools/Pruner.hh \
     1258        external/fastjet/contribs/RecursiveTools/SoftDrop.hh
    12161259tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \
    12171260        modules/FastJetGridMedianEstimator.$(SrcSuf) \
    … …  
    12851328        tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
    12861329        tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
     1330        tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
     1331        tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
     1332        tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf) \
     1333        tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \
    12871334        tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
    12881335        tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
    … …  
    13381385        display/Delphes3DGeometry.$(SrcSuf) \
    13391386        display/Delphes3DGeometry.h \
    1340         external/ExRootAnalysis/ExRootConfReader.h \
    1341         classes/DelphesClasses.h
     1387        classes/DelphesClasses.h \
     1388        external/ExRootAnalysis/ExRootConfReader.h
    13421389tmp/display/DelphesBranchElement.$(ObjSuf): \
    13431390        display/DelphesBranchElement.$(SrcSuf) \
    … …  
    13521399tmp/display/DelphesEventDisplay.$(ObjSuf): \
    13531400        display/DelphesEventDisplay.$(SrcSuf) \
    1354         external/ExRootAnalysis/ExRootConfReader.h \
    1355         external/ExRootAnalysis/ExRootTreeReader.h \
    13561401        display/DelphesCaloData.h \
    13571402        display/DelphesBranchElement.h \
    13581403        display/Delphes3DGeometry.h \
    13591404        display/DelphesEventDisplay.h \
    1360         classes/DelphesClasses.h
     1405        display/DelphesDisplay.h \
     1406        display/Delphes3DGeometry.h \
     1407        display/DelphesHtmlSummary.h \
     1408        display/DelphesPlotSummary.h \
     1409        classes/DelphesClasses.h \
     1410        external/ExRootAnalysis/ExRootConfReader.h \
     1411        external/ExRootAnalysis/ExRootTreeReader.h
    13611412tmp/display/DelphesHtmlSummary.$(ObjSuf): \
    13621413        display/DelphesHtmlSummary.$(SrcSuf) \
    … …  
    15411592        @touch $@
    15421593
    1543 external/fastjet/Selector.hh: \
    1544         external/fastjet/PseudoJet.hh \
    1545         external/fastjet/RangeDefinition.hh
    1546         @touch $@
    1547 
    15481594external/fastjet/internal/Dnn2piCylinder.hh: \
    15491595        external/fastjet/internal/DynamicNearestNeighbours.hh \
    15501596        external/fastjet/internal/DnnPlane.hh \
    15511597        external/fastjet/internal/numconsts.hh
     1598        @touch $@
     1599
     1600external/fastjet/Selector.hh: \
     1601        external/fastjet/PseudoJet.hh \
     1602        external/fastjet/RangeDefinition.hh
    15521603        @touch $@
    15531604
    … …  
    16391690        @touch $@
    16401691
     1692modules/RunPUPPI.h: \
     1693        classes/DelphesModule.h
     1694        @touch $@
     1695
    16411696modules/Cloner.h: \
    16421697        classes/DelphesModule.h
    … …  
    16751730        @touch $@
    16761731
    1677 display/DelphesEventDisplay.h: \
    1678         external/ExRootAnalysis/ExRootTreeReader.h \
    1679         display/DelphesDisplay.h \
    1680         display/Delphes3DGeometry.h \
    1681         display/DelphesHtmlSummary.h \
    1682         display/DelphesPlotSummary.h
    1683         @touch $@
    1684 
    16851732modules/TauTagging.h: \
    16861733        classes/DelphesModule.h \
    … …  
    17251772        @touch $@
    17261773
     1774modules/JetFlavorAssociation.h: \
     1775        classes/DelphesModule.h \
     1776        classes/DelphesClasses.h
     1777        @touch $@
     1778
    17271779modules/ParticlePropagator.h: \
    17281780        classes/DelphesModule.h
    … …  
    17571809        external/fastjet/AreaDefinition.hh \
    17581810        external/fastjet/ClusterSequenceAreaBase.hh
     1811        @touch $@
     1812
     1813external/PUPPI/puppiCleanContainer.hh: \
     1814        external/PUPPI/RecoObj.hh \
     1815        external/PUPPI/puppiParticle.hh \
     1816        external/PUPPI/puppiAlgoBin.hh \
     1817        external/fastjet/internal/base.hh \
     1818        external/fastjet/PseudoJet.hh
    17591819        @touch $@
    17601820
Note: See TracChangeset for help on using the changeset viewer.