Fork me on GitHub

Changeset 4acf2fd in git for Makefile


Ignore:
Timestamp:
May 17, 2021, 6:05:38 PM (4 years ago)
Author:
GitHub <noreply@…>
Branches:
master
Children:
7dac4ea
Parents:
46d3442 (diff), 4afb18d (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.
git-author:
Michele Selvaggi <michele.selvaggi@…> (05/17/21 18:05:38)
git-committer:
GitHub <noreply@…> (05/17/21 18:05:38)
Message:

Merge branch 'master' into master

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r46d3442 r4acf2fd  
    412412        modules/ImpactParameterSmearing.h \
    413413        modules/TimeSmearing.h \
     414        modules/TimeOfFlight.h \
    414415        modules/SimpleCalorimeter.h \
    415416        modules/DenseTrackFilter.h \
     
    448449        modules/DecayFilter.h \
    449450        modules/ParticleDensity.h \
     451        modules/TruthVertexFinder.h \
    450452        modules/ExampleModule.h
    451453tmp/modules/ModulesDict$(PcmSuf): \
     
    10121014        classes/DelphesFactory.h \
    10131015        classes/DelphesFormula.h
     1016tmp/modules/TimeOfFlight.$(ObjSuf): \
     1017        modules/TimeOfFlight.$(SrcSuf) \
     1018        modules/TimeOfFlight.h \
     1019        classes/DelphesClasses.h \
     1020        classes/DelphesFactory.h \
     1021        classes/DelphesFormula.h \
     1022        external/ExRootAnalysis/ExRootClassifier.h \
     1023        external/ExRootAnalysis/ExRootFilter.h \
     1024        external/ExRootAnalysis/ExRootResult.h
    10141025tmp/modules/TimeSmearing.$(ObjSuf): \
    10151026        modules/TimeSmearing.$(SrcSuf) \
     
    10711082        external/ExRootAnalysis/ExRootResult.h \
    10721083        external/ExRootAnalysis/ExRootTreeBranch.h
     1084tmp/modules/TruthVertexFinder.$(ObjSuf): \
     1085        modules/TruthVertexFinder.$(SrcSuf) \
     1086        modules/TruthVertexFinder.h \
     1087        classes/DelphesClasses.h \
     1088        classes/DelphesFactory.h \
     1089        classes/DelphesPileUpReader.h \
     1090        classes/DelphesTF2.h \
     1091        external/ExRootAnalysis/ExRootClassifier.h \
     1092        external/ExRootAnalysis/ExRootFilter.h \
     1093        external/ExRootAnalysis/ExRootResult.h
    10731094tmp/modules/UniqueObjectFinder.$(ObjSuf): \
    10741095        modules/UniqueObjectFinder.$(SrcSuf) \
     
    12151236        tmp/modules/TaggingParticlesSkimmer.$(ObjSuf) \
    12161237        tmp/modules/TauTagging.$(ObjSuf) \
     1238        tmp/modules/TimeOfFlight.$(ObjSuf) \
    12171239        tmp/modules/TimeSmearing.$(ObjSuf) \
    12181240        tmp/modules/TrackCountingBTagging.$(ObjSuf) \
     
    12221244        tmp/modules/TrackSmearing.$(ObjSuf) \
    12231245        tmp/modules/TreeWriter.$(ObjSuf) \
     1246        tmp/modules/TruthVertexFinder.$(ObjSuf) \
    12241247        tmp/modules/UniqueObjectFinder.$(ObjSuf) \
    12251248        tmp/modules/VertexFinder.$(ObjSuf) \
     
    20672090        @touch $@
    20682091
     2092modules/TimeOfFlight.h: \
     2093        classes/DelphesModule.h
     2094        @touch $@
     2095
    20692096external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
    20702097        external/fastjet/ClusterSequence.hh \
     
    21852212        @touch $@
    21862213
     2214modules/TruthVertexFinder.h: \
     2215        classes/DelphesModule.h
     2216        @touch $@
     2217
    21872218classes/DelphesSTDHEPReader.h: \
    21882219        classes/DelphesXDRReader.h
     
    23002331        @touch $@
    23012332
     2333modules/TreeWriter.h: \
     2334        classes/DelphesModule.h
     2335        @touch $@
     2336
    23022337modules/TimeSmearing.h: \
    2303         classes/DelphesModule.h
    2304         @touch $@
    2305 
    2306 modules/TreeWriter.h: \
    23072338        classes/DelphesModule.h
    23082339        @touch $@
Note: See TracChangeset for help on using the changeset viewer.