Fork me on GitHub

Changeset 5cecbc1 in git for Makefile


Ignore:
Timestamp:
Jul 24, 2015, 2:41:51 PM (9 years ago)
Author:
Michele Selvaggi <selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
ab24890
Parents:
1343a07
Message:

fix make rules for FastJet modules

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r1343a07 r5cecbc1  
    339339        modules/Weighter.h \
    340340        modules/Hector.h \
    341         modules/RunPUPPI.h \
    342341        modules/JetFlavorAssociation.h \
    343342        modules/ExampleModule.h
     
    358357        modules/FastJetLinkDef.h \
    359358        modules/FastJetFinder.h \
    360         modules/FastJetGridMedianEstimator.h
     359        modules/FastJetGridMedianEstimator.h \
     360        modules/RunPUPPI.h
    361361FastJetDict$(PcmSuf): \
    362362        tmp/modules/FastJetDict$(PcmSuf) \
     
    528528tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
    529529        external/Hector/H_VerticalQuadrupole.$(SrcSuf)
    530 tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
    531         external/PUPPI/puppiCleanContainer.$(SrcSuf) \
    532         external/fastjet/Selector.hh
    533530tmp/modules/AngularSmearing.$(ObjSuf): \
    534531        modules/AngularSmearing.$(SrcSuf) \
     
    545542        classes/DelphesClasses.h \
    546543        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
    551545tmp/modules/Calorimeter.$(ObjSuf): \
    552546        modules/Calorimeter.$(SrcSuf) \
     
    763757        external/ExRootAnalysis/ExRootFilter.h \
    764758        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.h
    775759tmp/modules/SimpleCalorimeter.$(ObjSuf): \
    776760        modules/SimpleCalorimeter.$(SrcSuf) \
     
    908892        tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
    909893        tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
    910         tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    911894        tmp/modules/AngularSmearing.$(ObjSuf) \
    912895        tmp/modules/BTagging.$(ObjSuf) \
     
    933916        tmp/modules/PileUpJetID.$(ObjSuf) \
    934917        tmp/modules/PileUpMerger.$(ObjSuf) \
    935         tmp/modules/RunPUPPI.$(ObjSuf) \
    936918        tmp/modules/SimpleCalorimeter.$(ObjSuf) \
    937919        tmp/modules/StatusPidFilter.$(ObjSuf) \
     
    950932endif
    951933
     934tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
     935        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
     936        external/fastjet/Selector.hh
    952937tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
    953938        external/fastjet/AreaDefinition.$(SrcSuf) \
     
    12961281        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    12971282        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
     1283tmp/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
    12981293FASTJET_OBJ +=  \
     1294        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    12991295        tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
    13001296        tmp/external/fastjet/BasicRandom.$(ObjSuf) \
     
    13901386        tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
    13911387        tmp/modules/FastJetFinder.$(ObjSuf) \
    1392         tmp/modules/FastJetGridMedianEstimator.$(ObjSuf)
     1388        tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
     1389        tmp/modules/RunPUPPI.$(ObjSuf)
    13931390
    13941391ifeq ($(HAS_PYTHIA8),true)
Note: See TracChangeset for help on using the changeset viewer.