Fork me on GitHub

Changeset fa33983 in git


Ignore:
Timestamp:
Mar 9, 2015, 1:59:35 PM (10 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
1f1f858
Parents:
9be57d9
Message:

add PUPPI and RunPUPPI module

Files:
7 added
3 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r9be57d9 rfa33983  
    329329        modules/JetPileUpSubtractor.h \
    330330        modules/TrackPileUpSubtractor.h \
     331        modules/TaggingParticlesSkimmer.h \
    331332        modules/PileUpJetID.h \
    332333        modules/ConstituentFilter.h \
    … …  
    336337        modules/Weighter.h \
    337338        modules/Hector.h \
     339        modules/RunPUPPI.h \
    338340        modules/ExampleModule.h
    339341ModulesDict$(PcmSuf): \
    … …  
    520522tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
    521523        external/Hector/H_VerticalQuadrupole.$(SrcSuf)
     524tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
     525        external/PUPPI/puppiCleanContainer.$(SrcSuf) \
     526        external/fastjet/Selector.hh
    522527tmp/modules/AngularSmearing.$(ObjSuf): \
    523528        modules/AngularSmearing.$(SrcSuf) \
    … …  
    729734        classes/DelphesClasses.h \
    730735        classes/DelphesFactory.h \
    731         classes/DelphesFormula.h \
     736        classes/DelphesTF2.h \
    732737        classes/DelphesPileUpReader.h \
    733738        external/ExRootAnalysis/ExRootResult.h \
    734739        external/ExRootAnalysis/ExRootFilter.h \
    735740        external/ExRootAnalysis/ExRootClassifier.h
     741tmp/modules/RunPUPPI.$(ObjSuf): \
     742        modules/RunPUPPI.$(SrcSuf) \
     743        modules/RunPUPPI.h \
     744        external/PUPPI/puppiCleanContainer.hh \
     745        external/PUPPI/RecoObj.hh \
     746        external/PUPPI/puppiParticle.hh \
     747        external/PUPPI/puppiAlgoBin.hh \
     748        classes/DelphesClasses.h \
     749        classes/DelphesFactory.h \
     750        classes/DelphesFormula.h
    736751tmp/modules/SimpleCalorimeter.$(ObjSuf): \
    737752        modules/SimpleCalorimeter.$(SrcSuf) \
    … …  
    752767        external/ExRootAnalysis/ExRootFilter.h \
    753768        external/ExRootAnalysis/ExRootClassifier.h
     769tmp/modules/TaggingParticlesSkimmer.$(ObjSuf): \
     770        modules/TaggingParticlesSkimmer.$(SrcSuf) \
     771        modules/TaggingParticlesSkimmer.h \
     772        modules/TauTagging.h \
     773        classes/DelphesClasses.h \
     774        classes/DelphesFactory.h \
     775        classes/DelphesFormula.h \
     776        external/ExRootAnalysis/ExRootResult.h \
     777        external/ExRootAnalysis/ExRootFilter.h \
     778        external/ExRootAnalysis/ExRootClassifier.h
    754779tmp/modules/TauTagging.$(ObjSuf): \
    755780        modules/TauTagging.$(SrcSuf) \
    … …  
    757782        classes/DelphesClasses.h \
    758783        classes/DelphesFactory.h \
    759         classes/DelphesFormula.h \
    760         external/ExRootAnalysis/ExRootResult.h \
    761         external/ExRootAnalysis/ExRootFilter.h \
    762         external/ExRootAnalysis/ExRootClassifier.h
     784        classes/DelphesFormula.h
    763785tmp/modules/TimeSmearing.$(ObjSuf): \
    764786        modules/TimeSmearing.$(SrcSuf) \
    … …  
    861883        tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
    862884        tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
     885        tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
    863886        tmp/modules/AngularSmearing.$(ObjSuf) \
    864887        tmp/modules/BTagging.$(ObjSuf) \
    … …  
    883906        tmp/modules/PileUpJetID.$(ObjSuf) \
    884907        tmp/modules/PileUpMerger.$(ObjSuf) \
     908        tmp/modules/RunPUPPI.$(ObjSuf) \
    885909        tmp/modules/SimpleCalorimeter.$(ObjSuf) \
    886910        tmp/modules/StatusPidFilter.$(ObjSuf) \
     911        tmp/modules/TaggingParticlesSkimmer.$(ObjSuf) \
    887912        tmp/modules/TauTagging.$(ObjSuf) \
    888913        tmp/modules/TimeSmearing.$(ObjSuf) \
    … …  
    15321557        @touch $@
    15331558
    1534 external/fastjet/Selector.hh: \
    1535         external/fastjet/PseudoJet.hh \
    1536         external/fastjet/RangeDefinition.hh
    1537         @touch $@
    1538 
    15391559external/fastjet/internal/Dnn2piCylinder.hh: \
    15401560        external/fastjet/internal/DynamicNearestNeighbours.hh \
    15411561        external/fastjet/internal/DnnPlane.hh \
    15421562        external/fastjet/internal/numconsts.hh
     1563        @touch $@
     1564
     1565external/fastjet/Selector.hh: \
     1566        external/fastjet/PseudoJet.hh \
     1567        external/fastjet/RangeDefinition.hh
    15431568        @touch $@
    15441569
    … …  
    16301655        @touch $@
    16311656
     1657modules/RunPUPPI.h: \
     1658        classes/DelphesModule.h
     1659        @touch $@
     1660
    16321661modules/Cloner.h: \
    16331662        classes/DelphesModule.h
    … …  
    16751704
    16761705modules/TauTagging.h: \
    1677         classes/DelphesModule.h
     1706        classes/DelphesModule.h \
     1707        external/ExRootAnalysis/ExRootResult.h \
     1708        external/ExRootAnalysis/ExRootFilter.h \
     1709        external/ExRootAnalysis/ExRootClassifier.h
    16781710        @touch $@
    16791711
    … …  
    17471779        @touch $@
    17481780
     1781external/PUPPI/puppiCleanContainer.hh: \
     1782        external/PUPPI/RecoObj.hh \
     1783        external/PUPPI/puppiParticle.hh \
     1784        external/PUPPI/puppiAlgoBin.hh \
     1785        external/fastjet/internal/base.hh \
     1786        external/fastjet/PseudoJet.hh
     1787        @touch $@
     1788
    17491789modules/BTagging.h: \
    17501790        classes/DelphesModule.h
    … …  
    17691809
    17701810modules/Weighter.h: \
     1811        classes/DelphesModule.h
     1812        @touch $@
     1813
     1814modules/TaggingParticlesSkimmer.h: \
    17711815        classes/DelphesModule.h
    17721816        @touch $@

  • doc/genMakefile.tcl

    r9be57d9 rfa33983  
    283283dictDeps {DISPLAY_DICT} {display/DisplayLinkDef.h}
    284284
    285 sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/Hector/*.cc}
     285sourceDeps {DELPHES} {classes/*.cc} {modules/*.cc} {external/ExRootAnalysis/*.cc} {external/Hector/*.cc} {external/PUPPI/*.cc}
    286286
    287287sourceDeps {FASTJET} {modules/FastJet*.cc} {external/fastjet/*.cc} {external/fastjet/tools/*.cc} {external/fastjet/plugins/*/*.cc} {external/fastjet/contribs/*/*.cc}

  • modules/ModulesLinkDef.h

    r9be57d9 rfa33983  
    5858#include "modules/Weighter.h"
    5959#include "modules/Hector.h"
     60#include "modules/RunPUPPI.h"
    6061#include "modules/ExampleModule.h"
    6162
    … …  
    9899#pragma link C++ class Weighter+;
    99100#pragma link C++ class Hector+;
     101#pragma link C++ class RunPUPPI+;
    100102#pragma link C++ class ExampleModule+;
    101103
Note: See TracChangeset for help on using the changeset viewer.