Fork me on GitHub

Changeset e7e90df in git


Ignore:
Timestamp:
Dec 9, 2014, 1:26:26 PM (10 years ago)
Author:
Michele <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
49234af
Parents:
01f457a (diff), f6b6ee7 (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 branch 'master' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

Files:
13 added
11 deleted
20 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r01f457a re7e90df  
    77
    88# Declare ROOT dependency
    9 find_package(ROOT COMPONENTS EG Eve GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
     9find_package(ROOT COMPONENTS EG Eve Geom Gui GuiHtml GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
    1010include(${ROOT_USE_FILE})
    1111
  • Makefile

    r01f457a re7e90df  
    1717CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    1818DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
    19 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
     19DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
    2020
    2121ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
    2222HAS_CMSSW = true
    2323CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
    24 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
     24OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
    2525ifneq ($(CMSSW_RELEASE_BASE),)
    2626CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
    2727endif
    2828ifneq ($(LD_LIBRARY_PATH),)
    29 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    30 endif
    31 DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     29OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
     30endif
     31OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    3232endif
    3333
    3434ifneq ($(PROMC),)
    3535HAS_PROMC = true
    36 CXXFLAGS += -I$(PROMC)/include
    37 DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     36CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
     37OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
    3838endif
    3939
     
    4141HAS_PYTHIA8 = true
    4242CXXFLAGS += -I$(PYTHIA8)/include
    43 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
     43OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    4444else
    4545ifneq ($(PYTHIA8DATA),)
    4646HAS_PYTHIA8 = true
    4747CXXFLAGS += -I$(PYTHIA8DATA)/../include
    48 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    49 endif
    50 endif
     48OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
     49endif
     50endif
     51
     52DELPHES_LIBS += $(OPT_LIBS)
     53DISPLAY_LIBS += $(OPT_LIBS)
    5154
    5255###
     
    6568
    6669
    67 hepmc2pileup$(ExeSuf): \
    68         tmp/converters/hepmc2pileup.$(ObjSuf)
    69 
    70 tmp/converters/hepmc2pileup.$(ObjSuf): \
    71         converters/hepmc2pileup.cpp \
    72         classes/DelphesClasses.h \
    73         classes/DelphesFactory.h \
    74         classes/DelphesHepMCReader.h \
     70stdhep2pileup$(ExeSuf): \
     71        tmp/converters/stdhep2pileup.$(ObjSuf)
     72
     73tmp/converters/stdhep2pileup.$(ObjSuf): \
     74        converters/stdhep2pileup.cpp \
     75        classes/DelphesClasses.h \
     76        classes/DelphesFactory.h \
     77        classes/DelphesSTDHEPReader.h \
    7578        classes/DelphesPileUpWriter.h \
    7679        external/ExRootAnalysis/ExRootTreeWriter.h \
    7780        external/ExRootAnalysis/ExRootTreeBranch.h \
     81        external/ExRootAnalysis/ExRootProgressBar.h
     82lhco2root$(ExeSuf): \
     83        tmp/converters/lhco2root.$(ObjSuf)
     84
     85tmp/converters/lhco2root.$(ObjSuf): \
     86        converters/lhco2root.cpp \
     87        modules/Delphes.h \
     88        classes/DelphesStream.h \
     89        classes/DelphesClasses.h \
     90        classes/DelphesFactory.h \
     91        external/ExRootAnalysis/ExRootTreeWriter.h \
     92        external/ExRootAnalysis/ExRootTreeBranch.h \
     93        external/ExRootAnalysis/ExRootProgressBar.h
     94root2lhco$(ExeSuf): \
     95        tmp/converters/root2lhco.$(ObjSuf)
     96
     97tmp/converters/root2lhco.$(ObjSuf): \
     98        converters/root2lhco.cpp \
     99        classes/DelphesClasses.h \
     100        external/ExRootAnalysis/ExRootTreeReader.h \
    78101        external/ExRootAnalysis/ExRootProgressBar.h
    79102pileup2root$(ExeSuf): \
     
    98121        external/ExRootAnalysis/ExRootTreeReader.h \
    99122        external/ExRootAnalysis/ExRootProgressBar.h
    100 lhco2root$(ExeSuf): \
    101         tmp/converters/lhco2root.$(ObjSuf)
    102 
    103 tmp/converters/lhco2root.$(ObjSuf): \
    104         converters/lhco2root.cpp \
    105         modules/Delphes.h \
    106         classes/DelphesStream.h \
    107         classes/DelphesClasses.h \
    108         classes/DelphesFactory.h \
    109         external/ExRootAnalysis/ExRootTreeWriter.h \
    110         external/ExRootAnalysis/ExRootTreeBranch.h \
    111         external/ExRootAnalysis/ExRootProgressBar.h
    112 stdhep2pileup$(ExeSuf): \
    113         tmp/converters/stdhep2pileup.$(ObjSuf)
    114 
    115 tmp/converters/stdhep2pileup.$(ObjSuf): \
    116         converters/stdhep2pileup.cpp \
    117         classes/DelphesClasses.h \
    118         classes/DelphesFactory.h \
    119         classes/DelphesSTDHEPReader.h \
     123hepmc2pileup$(ExeSuf): \
     124        tmp/converters/hepmc2pileup.$(ObjSuf)
     125
     126tmp/converters/hepmc2pileup.$(ObjSuf): \
     127        converters/hepmc2pileup.cpp \
     128        classes/DelphesClasses.h \
     129        classes/DelphesFactory.h \
     130        classes/DelphesHepMCReader.h \
    120131        classes/DelphesPileUpWriter.h \
    121132        external/ExRootAnalysis/ExRootTreeWriter.h \
    122133        external/ExRootAnalysis/ExRootTreeBranch.h \
    123134        external/ExRootAnalysis/ExRootProgressBar.h
    124 root2lhco$(ExeSuf): \
    125         tmp/converters/root2lhco.$(ObjSuf)
    126 
    127 tmp/converters/root2lhco.$(ObjSuf): \
    128         converters/root2lhco.cpp \
    129         classes/DelphesClasses.h \
    130         external/ExRootAnalysis/ExRootTreeReader.h \
    131         external/ExRootAnalysis/ExRootProgressBar.h
    132135Example1$(ExeSuf): \
    133136        tmp/examples/Example1.$(ObjSuf)
     
    142145        external/ExRootAnalysis/ExRootUtilities.h
    143146EXECUTABLE +=  \
    144         hepmc2pileup$(ExeSuf) \
     147        stdhep2pileup$(ExeSuf) \
     148        lhco2root$(ExeSuf) \
     149        root2lhco$(ExeSuf) \
    145150        pileup2root$(ExeSuf) \
    146151        root2pileup$(ExeSuf) \
    147         lhco2root$(ExeSuf) \
    148         stdhep2pileup$(ExeSuf) \
    149         root2lhco$(ExeSuf) \
     152        hepmc2pileup$(ExeSuf) \
    150153        Example1$(ExeSuf)
    151154
    152155EXECUTABLE_OBJ +=  \
    153         tmp/converters/hepmc2pileup.$(ObjSuf) \
     156        tmp/converters/stdhep2pileup.$(ObjSuf) \
     157        tmp/converters/lhco2root.$(ObjSuf) \
     158        tmp/converters/root2lhco.$(ObjSuf) \
    154159        tmp/converters/pileup2root.$(ObjSuf) \
    155160        tmp/converters/root2pileup.$(ObjSuf) \
    156         tmp/converters/lhco2root.$(ObjSuf) \
    157         tmp/converters/stdhep2pileup.$(ObjSuf) \
    158         tmp/converters/root2lhco.$(ObjSuf) \
     161        tmp/converters/hepmc2pileup.$(ObjSuf) \
    159162        tmp/examples/Example1.$(ObjSuf)
    160163
     
    238241        external/ExRootAnalysis/ExRootTreeWriter.h \
    239242        external/ExRootAnalysis/ExRootTreeBranch.h \
    240         external/ExRootAnalysis/ExRootProgressBar.h \
    241         external/ProMC/ProMCBook.h
     243        external/ExRootAnalysis/ExRootProgressBar.h
    242244EXECUTABLE +=  \
    243245        DelphesProMC$(ExeSuf)
     
    245247EXECUTABLE_OBJ +=  \
    246248        tmp/readers/DelphesProMC.$(ObjSuf)
    247 
    248 tmp/external/ProMC/ProMCBook.$(ObjSuf): \
    249         external/ProMC/ProMCBook.$(SrcSuf)
    250 tmp/external/ProMC/ProMC.pb.$(ObjSuf): \
    251         external/ProMC/ProMC.pb.$(SrcSuf)
    252 tmp/external/ProMC/ProMCStat.pb.$(ObjSuf): \
    253         external/ProMC/ProMCStat.pb.$(SrcSuf)
    254 tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf): \
    255         external/ProMC/ProMCDescription.pb.$(SrcSuf)
    256 tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf): \
    257         external/ProMC/ProMCHeader.pb.$(SrcSuf)
    258 DELPHES_OBJ +=  \
    259         tmp/external/ProMC/ProMCBook.$(ObjSuf) \
    260         tmp/external/ProMC/ProMC.pb.$(ObjSuf) \
    261         tmp/external/ProMC/ProMCStat.pb.$(ObjSuf) \
    262         tmp/external/ProMC/ProMCDescription.pb.$(ObjSuf) \
    263         tmp/external/ProMC/ProMCHeader.pb.$(ObjSuf)
    264 
    265 ifeq ($(HAS_PYTHIA8),true)
    266 DELPHES_OBJ +=  \
    267        
    268 endif
    269249
    270250endif
     
    383363        display/DisplayLinkDef.h \
    384364        display/DelphesDisplay.h \
    385         display/DelphesCaloData.h
     365        display/DelphesCaloData.h \
     366        display/DelphesBranchElement.h \
     367        display/Delphes3DGeometry.h \
     368        display/DelphesEventDisplay.h \
     369        display/DelphesHtmlSummary.h \
     370        display/DelphesPlotSummary.h
    386371DisplayDict$(PcmSuf): \
    387372        tmp/display/DisplayDict$(PcmSuf) \
     
    396381        DisplayDict$(PcmSuf)
    397382
    398 tmp/classes/DelphesPileUpWriter.$(ObjSuf): \
    399         classes/DelphesPileUpWriter.$(SrcSuf) \
    400         classes/DelphesPileUpWriter.h
     383tmp/classes/DelphesPileUpReader.$(ObjSuf): \
     384        classes/DelphesPileUpReader.$(SrcSuf) \
     385        classes/DelphesPileUpReader.h
     386tmp/classes/DelphesSTDHEPReader.$(ObjSuf): \
     387        classes/DelphesSTDHEPReader.$(SrcSuf) \
     388        classes/DelphesSTDHEPReader.h \
     389        classes/DelphesClasses.h \
     390        classes/DelphesFactory.h \
     391        external/ExRootAnalysis/ExRootTreeBranch.h
     392tmp/classes/DelphesTF2.$(ObjSuf): \
     393        classes/DelphesTF2.$(SrcSuf) \
     394        classes/DelphesTF2.h
    401395tmp/classes/DelphesHepMCReader.$(ObjSuf): \
    402396        classes/DelphesHepMCReader.$(SrcSuf) \
     
    406400        classes/DelphesStream.h \
    407401        external/ExRootAnalysis/ExRootTreeBranch.h
    408 tmp/classes/DelphesSTDHEPReader.$(ObjSuf): \
    409         classes/DelphesSTDHEPReader.$(SrcSuf) \
    410         classes/DelphesSTDHEPReader.h \
    411         classes/DelphesClasses.h \
    412         classes/DelphesFactory.h \
     402tmp/classes/DelphesLHEFReader.$(ObjSuf): \
     403        classes/DelphesLHEFReader.$(SrcSuf) \
     404        classes/DelphesLHEFReader.h \
     405        classes/DelphesClasses.h \
     406        classes/DelphesFactory.h \
     407        classes/DelphesStream.h \
    413408        external/ExRootAnalysis/ExRootTreeBranch.h
    414 tmp/classes/DelphesPileUpReader.$(ObjSuf): \
    415         classes/DelphesPileUpReader.$(SrcSuf) \
    416         classes/DelphesPileUpReader.h
     409tmp/classes/DelphesStream.$(ObjSuf): \
     410        classes/DelphesStream.$(SrcSuf) \
     411        classes/DelphesStream.h
     412tmp/classes/DelphesModule.$(ObjSuf): \
     413        classes/DelphesModule.$(SrcSuf) \
     414        classes/DelphesModule.h \
     415        classes/DelphesFactory.h \
     416        external/ExRootAnalysis/ExRootTreeReader.h \
     417        external/ExRootAnalysis/ExRootTreeBranch.h \
     418        external/ExRootAnalysis/ExRootTreeWriter.h \
     419        external/ExRootAnalysis/ExRootResult.h
     420tmp/classes/DelphesFactory.$(ObjSuf): \
     421        classes/DelphesFactory.$(SrcSuf) \
     422        classes/DelphesFactory.h \
     423        classes/DelphesClasses.h \
     424        external/ExRootAnalysis/ExRootTreeBranch.h
    417425tmp/classes/DelphesClasses.$(ObjSuf): \
    418426        classes/DelphesClasses.$(SrcSuf) \
     
    423431        classes/DelphesFormula.$(SrcSuf) \
    424432        classes/DelphesFormula.h
    425 tmp/classes/DelphesTF2.$(ObjSuf): \
    426         classes/DelphesTF2.$(SrcSuf) \
    427         classes/DelphesTF2.h
    428 tmp/classes/DelphesModule.$(ObjSuf): \
    429         classes/DelphesModule.$(SrcSuf) \
    430         classes/DelphesModule.h \
    431         classes/DelphesFactory.h \
    432         external/ExRootAnalysis/ExRootTreeReader.h \
    433         external/ExRootAnalysis/ExRootTreeBranch.h \
    434         external/ExRootAnalysis/ExRootTreeWriter.h \
    435         external/ExRootAnalysis/ExRootResult.h
    436 tmp/classes/DelphesStream.$(ObjSuf): \
    437         classes/DelphesStream.$(SrcSuf) \
    438         classes/DelphesStream.h
    439 tmp/classes/DelphesFactory.$(ObjSuf): \
    440         classes/DelphesFactory.$(SrcSuf) \
    441         classes/DelphesFactory.h \
    442         classes/DelphesClasses.h \
    443         external/ExRootAnalysis/ExRootTreeBranch.h
    444 tmp/classes/DelphesLHEFReader.$(ObjSuf): \
    445         classes/DelphesLHEFReader.$(SrcSuf) \
    446         classes/DelphesLHEFReader.h \
    447         classes/DelphesClasses.h \
    448         classes/DelphesFactory.h \
    449         classes/DelphesStream.h \
    450         external/ExRootAnalysis/ExRootTreeBranch.h
    451 tmp/modules/EnergyScale.$(ObjSuf): \
    452         modules/EnergyScale.$(SrcSuf) \
    453         modules/EnergyScale.h \
    454         classes/DelphesClasses.h \
    455         classes/DelphesFactory.h \
    456         classes/DelphesFormula.h \
    457         external/ExRootAnalysis/ExRootResult.h \
    458         external/ExRootAnalysis/ExRootFilter.h \
    459         external/ExRootAnalysis/ExRootClassifier.h
    460 tmp/modules/Cloner.$(ObjSuf): \
    461         modules/Cloner.$(SrcSuf) \
    462         modules/Cloner.h \
    463         classes/DelphesClasses.h \
    464         classes/DelphesFactory.h \
    465         classes/DelphesFormula.h \
    466         external/ExRootAnalysis/ExRootResult.h \
    467         external/ExRootAnalysis/ExRootFilter.h \
    468         external/ExRootAnalysis/ExRootClassifier.h
     433tmp/classes/DelphesPileUpWriter.$(ObjSuf): \
     434        classes/DelphesPileUpWriter.$(SrcSuf) \
     435        classes/DelphesPileUpWriter.h
     436tmp/modules/StatusPidFilter.$(ObjSuf): \
     437        modules/StatusPidFilter.$(SrcSuf) \
     438        modules/StatusPidFilter.h \
     439        classes/DelphesClasses.h \
     440        classes/DelphesFactory.h \
     441        classes/DelphesFormula.h \
     442        external/ExRootAnalysis/ExRootResult.h \
     443        external/ExRootAnalysis/ExRootFilter.h \
     444        external/ExRootAnalysis/ExRootClassifier.h
     445tmp/modules/ParticlePropagator.$(ObjSuf): \
     446        modules/ParticlePropagator.$(SrcSuf) \
     447        modules/ParticlePropagator.h \
     448        classes/DelphesClasses.h \
     449        classes/DelphesFactory.h \
     450        classes/DelphesFormula.h \
     451        external/ExRootAnalysis/ExRootResult.h \
     452        external/ExRootAnalysis/ExRootFilter.h \
     453        external/ExRootAnalysis/ExRootClassifier.h
     454tmp/modules/Delphes.$(ObjSuf): \
     455        modules/Delphes.$(SrcSuf) \
     456        modules/Delphes.h \
     457        classes/DelphesClasses.h \
     458        classes/DelphesFactory.h \
     459        classes/DelphesFormula.h \
     460        external/ExRootAnalysis/ExRootResult.h \
     461        external/ExRootAnalysis/ExRootFilter.h \
     462        external/ExRootAnalysis/ExRootClassifier.h \
     463        external/ExRootAnalysis/ExRootConfReader.h \
     464        external/ExRootAnalysis/ExRootTreeWriter.h
    469465tmp/modules/UniqueObjectFinder.$(ObjSuf): \
    470466        modules/UniqueObjectFinder.$(SrcSuf) \
     
    476472        external/ExRootAnalysis/ExRootFilter.h \
    477473        external/ExRootAnalysis/ExRootClassifier.h
    478 tmp/modules/ParticlePropagator.$(ObjSuf): \
    479         modules/ParticlePropagator.$(SrcSuf) \
    480         modules/ParticlePropagator.h \
     474tmp/modules/ConstituentFilter.$(ObjSuf): \
     475        modules/ConstituentFilter.$(SrcSuf) \
     476        modules/ConstituentFilter.h \
     477        classes/DelphesClasses.h \
     478        classes/DelphesFactory.h \
     479        classes/DelphesFormula.h \
     480        external/ExRootAnalysis/ExRootResult.h \
     481        external/ExRootAnalysis/ExRootFilter.h \
     482        external/ExRootAnalysis/ExRootClassifier.h
     483tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
     484        modules/TrackPileUpSubtractor.$(SrcSuf) \
     485        modules/TrackPileUpSubtractor.h \
     486        classes/DelphesClasses.h \
     487        classes/DelphesFactory.h \
     488        classes/DelphesFormula.h \
     489        external/ExRootAnalysis/ExRootResult.h \
     490        external/ExRootAnalysis/ExRootFilter.h \
     491        external/ExRootAnalysis/ExRootClassifier.h
     492tmp/modules/Weighter.$(ObjSuf): \
     493        modules/Weighter.$(SrcSuf) \
     494        modules/Weighter.h \
     495        classes/DelphesClasses.h \
     496        classes/DelphesFactory.h \
     497        classes/DelphesFormula.h \
     498        external/ExRootAnalysis/ExRootResult.h \
     499        external/ExRootAnalysis/ExRootFilter.h \
     500        external/ExRootAnalysis/ExRootClassifier.h
     501tmp/modules/Isolation.$(ObjSuf): \
     502        modules/Isolation.$(SrcSuf) \
     503        modules/Isolation.h \
     504        classes/DelphesClasses.h \
     505        classes/DelphesFactory.h \
     506        classes/DelphesFormula.h \
     507        external/ExRootAnalysis/ExRootResult.h \
     508        external/ExRootAnalysis/ExRootFilter.h \
     509        external/ExRootAnalysis/ExRootClassifier.h
     510tmp/modules/PileUpMerger.$(ObjSuf): \
     511        modules/PileUpMerger.$(SrcSuf) \
     512        modules/PileUpMerger.h \
     513        classes/DelphesClasses.h \
     514        classes/DelphesFactory.h \
     515        classes/DelphesTF2.h \
     516        classes/DelphesPileUpReader.h \
     517        external/ExRootAnalysis/ExRootResult.h \
     518        external/ExRootAnalysis/ExRootFilter.h \
     519        external/ExRootAnalysis/ExRootClassifier.h
     520tmp/modules/ExampleModule.$(ObjSuf): \
     521        modules/ExampleModule.$(SrcSuf) \
     522        modules/ExampleModule.h \
     523        classes/DelphesClasses.h \
     524        classes/DelphesFactory.h \
     525        classes/DelphesFormula.h \
     526        external/ExRootAnalysis/ExRootResult.h \
     527        external/ExRootAnalysis/ExRootFilter.h \
     528        external/ExRootAnalysis/ExRootClassifier.h
     529tmp/modules/Hector.$(ObjSuf): \
     530        modules/Hector.$(SrcSuf) \
     531        modules/Hector.h \
     532        classes/DelphesClasses.h \
     533        classes/DelphesFactory.h \
     534        classes/DelphesFormula.h \
     535        external/ExRootAnalysis/ExRootResult.h \
     536        external/ExRootAnalysis/ExRootFilter.h \
     537        external/ExRootAnalysis/ExRootClassifier.h \
     538        external/Hector/H_BeamLine.h \
     539        external/Hector/H_RecRPObject.h \
     540        external/Hector/H_BeamParticle.h
     541tmp/modules/EnergySmearing.$(ObjSuf): \
     542        modules/EnergySmearing.$(SrcSuf) \
     543        modules/EnergySmearing.h \
    481544        classes/DelphesClasses.h \
    482545        classes/DelphesFactory.h \
     
    507570        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    508571        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
    509 tmp/modules/Calorimeter.$(ObjSuf): \
    510         modules/Calorimeter.$(SrcSuf) \
    511         modules/Calorimeter.h \
    512         classes/DelphesClasses.h \
    513         classes/DelphesFactory.h \
    514         classes/DelphesFormula.h \
    515         external/ExRootAnalysis/ExRootResult.h \
    516         external/ExRootAnalysis/ExRootFilter.h \
    517         external/ExRootAnalysis/ExRootClassifier.h
    518 tmp/modules/TreeWriter.$(ObjSuf): \
    519         modules/TreeWriter.$(SrcSuf) \
    520         modules/TreeWriter.h \
    521         classes/DelphesClasses.h \
    522         classes/DelphesFactory.h \
    523         classes/DelphesFormula.h \
    524         external/ExRootAnalysis/ExRootResult.h \
    525         external/ExRootAnalysis/ExRootFilter.h \
    526         external/ExRootAnalysis/ExRootClassifier.h \
    527         external/ExRootAnalysis/ExRootTreeBranch.h
    528 tmp/modules/Isolation.$(ObjSuf): \
    529         modules/Isolation.$(SrcSuf) \
    530         modules/Isolation.h \
    531         classes/DelphesClasses.h \
    532         classes/DelphesFactory.h \
    533         classes/DelphesFormula.h \
    534         external/ExRootAnalysis/ExRootResult.h \
    535         external/ExRootAnalysis/ExRootFilter.h \
    536         external/ExRootAnalysis/ExRootClassifier.h
    537 tmp/modules/PileUpMerger.$(ObjSuf): \
    538         modules/PileUpMerger.$(SrcSuf) \
    539         modules/PileUpMerger.h \
    540         classes/DelphesClasses.h \
    541         classes/DelphesFactory.h \
    542         classes/DelphesTF2.h \
    543         classes/DelphesPileUpReader.h \
     572tmp/modules/SimpleCalorimeter.$(ObjSuf): \
     573        modules/SimpleCalorimeter.$(SrcSuf) \
     574        modules/SimpleCalorimeter.h \
     575        classes/DelphesClasses.h \
     576        classes/DelphesFactory.h \
     577        classes/DelphesFormula.h \
     578        external/ExRootAnalysis/ExRootResult.h \
     579        external/ExRootAnalysis/ExRootFilter.h \
     580        external/ExRootAnalysis/ExRootClassifier.h
     581tmp/modules/LeptonDressing.$(ObjSuf): \
     582        modules/LeptonDressing.$(SrcSuf) \
     583        modules/LeptonDressing.h \
     584        classes/DelphesClasses.h \
     585        classes/DelphesFactory.h \
     586        classes/DelphesFormula.h \
    544587        external/ExRootAnalysis/ExRootResult.h \
    545588        external/ExRootAnalysis/ExRootFilter.h \
     
    554597        external/ExRootAnalysis/ExRootFilter.h \
    555598        external/ExRootAnalysis/ExRootClassifier.h
    556 tmp/modules/ImpactParameterSmearing.$(ObjSuf): \
    557         modules/ImpactParameterSmearing.$(SrcSuf) \
    558         modules/ImpactParameterSmearing.h \
    559         classes/DelphesClasses.h \
    560         classes/DelphesFactory.h \
    561         classes/DelphesFormula.h \
    562         external/ExRootAnalysis/ExRootResult.h \
    563         external/ExRootAnalysis/ExRootFilter.h \
    564         external/ExRootAnalysis/ExRootClassifier.h
    565 tmp/modules/Weighter.$(ObjSuf): \
    566         modules/Weighter.$(SrcSuf) \
    567         modules/Weighter.h \
     599tmp/modules/TimeSmearing.$(ObjSuf): \
     600        modules/TimeSmearing.$(SrcSuf) \
     601        modules/TimeSmearing.h \
     602        classes/DelphesClasses.h \
     603        classes/DelphesFactory.h \
     604        classes/DelphesFormula.h \
     605        external/ExRootAnalysis/ExRootResult.h \
     606        external/ExRootAnalysis/ExRootFilter.h \
     607        external/ExRootAnalysis/ExRootClassifier.h
     608tmp/modules/PileUpJetID.$(ObjSuf): \
     609        modules/PileUpJetID.$(SrcSuf) \
     610        modules/PileUpJetID.h \
     611        classes/DelphesClasses.h \
     612        classes/DelphesFactory.h \
     613        classes/DelphesFormula.h \
     614        external/ExRootAnalysis/ExRootResult.h \
     615        external/ExRootAnalysis/ExRootFilter.h \
     616        external/ExRootAnalysis/ExRootClassifier.h
     617tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
     618        modules/JetPileUpSubtractor.$(SrcSuf) \
     619        modules/JetPileUpSubtractor.h \
    568620        classes/DelphesClasses.h \
    569621        classes/DelphesFactory.h \
     
    581633        external/ExRootAnalysis/ExRootFilter.h \
    582634        external/ExRootAnalysis/ExRootClassifier.h
    583 tmp/modules/PileUpJetID.$(ObjSuf): \
    584         modules/PileUpJetID.$(SrcSuf) \
    585         modules/PileUpJetID.h \
    586         classes/DelphesClasses.h \
    587         classes/DelphesFactory.h \
    588         classes/DelphesFormula.h \
    589         external/ExRootAnalysis/ExRootResult.h \
    590         external/ExRootAnalysis/ExRootFilter.h \
    591         external/ExRootAnalysis/ExRootClassifier.h
    592 tmp/modules/ConstituentFilter.$(ObjSuf): \
    593         modules/ConstituentFilter.$(SrcSuf) \
    594         modules/ConstituentFilter.h \
     635tmp/modules/BTagging.$(ObjSuf): \
     636        modules/BTagging.$(SrcSuf) \
     637        modules/BTagging.h \
    595638        classes/DelphesClasses.h \
    596639        classes/DelphesFactory.h \
     
    608651        external/ExRootAnalysis/ExRootFilter.h \
    609652        external/ExRootAnalysis/ExRootClassifier.h
    610 tmp/modules/PdgCodeFilter.$(ObjSuf): \
    611         modules/PdgCodeFilter.$(SrcSuf) \
    612         modules/PdgCodeFilter.h \
    613         classes/DelphesClasses.h \
    614         classes/DelphesFactory.h \
    615         classes/DelphesFormula.h \
    616         external/ExRootAnalysis/ExRootResult.h \
    617         external/ExRootAnalysis/ExRootFilter.h \
    618         external/ExRootAnalysis/ExRootClassifier.h
    619 tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
    620         modules/TrackPileUpSubtractor.$(SrcSuf) \
    621         modules/TrackPileUpSubtractor.h \
    622         classes/DelphesClasses.h \
    623         classes/DelphesFactory.h \
    624         classes/DelphesFormula.h \
    625         external/ExRootAnalysis/ExRootResult.h \
    626         external/ExRootAnalysis/ExRootFilter.h \
    627         external/ExRootAnalysis/ExRootClassifier.h
    628 tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
    629         modules/JetPileUpSubtractor.$(SrcSuf) \
    630         modules/JetPileUpSubtractor.h \
    631         classes/DelphesClasses.h \
    632         classes/DelphesFactory.h \
    633         classes/DelphesFormula.h \
    634         external/ExRootAnalysis/ExRootResult.h \
    635         external/ExRootAnalysis/ExRootFilter.h \
    636         external/ExRootAnalysis/ExRootClassifier.h
    637 tmp/modules/TimeSmearing.$(ObjSuf): \
    638         modules/TimeSmearing.$(SrcSuf) \
    639         modules/TimeSmearing.h \
    640         classes/DelphesClasses.h \
    641         classes/DelphesFactory.h \
    642         classes/DelphesFormula.h \
    643         external/ExRootAnalysis/ExRootResult.h \
    644         external/ExRootAnalysis/ExRootFilter.h \
    645         external/ExRootAnalysis/ExRootClassifier.h
    646 tmp/modules/BTagging.$(ObjSuf): \
    647         modules/BTagging.$(SrcSuf) \
    648         modules/BTagging.h \
    649         classes/DelphesClasses.h \
    650         classes/DelphesFactory.h \
    651         classes/DelphesFormula.h \
    652         external/ExRootAnalysis/ExRootResult.h \
    653         external/ExRootAnalysis/ExRootFilter.h \
    654         external/ExRootAnalysis/ExRootClassifier.h
    655 tmp/modules/Delphes.$(ObjSuf): \
    656         modules/Delphes.$(SrcSuf) \
    657         modules/Delphes.h \
    658         classes/DelphesClasses.h \
    659         classes/DelphesFactory.h \
    660         classes/DelphesFormula.h \
    661         external/ExRootAnalysis/ExRootResult.h \
    662         external/ExRootAnalysis/ExRootFilter.h \
    663         external/ExRootAnalysis/ExRootClassifier.h \
    664         external/ExRootAnalysis/ExRootConfReader.h \
    665         external/ExRootAnalysis/ExRootTreeWriter.h
    666653tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \
    667654        modules/FastJetGridMedianEstimator.$(SrcSuf) \
     
    688675        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
    689676        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.hh
    690 tmp/modules/StatusPidFilter.$(ObjSuf): \
    691         modules/StatusPidFilter.$(SrcSuf) \
    692         modules/StatusPidFilter.h \
    693         classes/DelphesClasses.h \
    694         classes/DelphesFactory.h \
    695         classes/DelphesFormula.h \
    696         external/ExRootAnalysis/ExRootResult.h \
    697         external/ExRootAnalysis/ExRootFilter.h \
    698         external/ExRootAnalysis/ExRootClassifier.h
    699 tmp/modules/Hector.$(ObjSuf): \
    700         modules/Hector.$(SrcSuf) \
    701         modules/Hector.h \
    702         classes/DelphesClasses.h \
    703         classes/DelphesFactory.h \
    704         classes/DelphesFormula.h \
    705         external/ExRootAnalysis/ExRootResult.h \
    706         external/ExRootAnalysis/ExRootFilter.h \
    707         external/ExRootAnalysis/ExRootClassifier.h \
    708         external/Hector/H_BeamLine.h \
    709         external/Hector/H_RecRPObject.h \
    710         external/Hector/H_BeamParticle.h
     677tmp/modules/Cloner.$(ObjSuf): \
     678        modules/Cloner.$(SrcSuf) \
     679        modules/Cloner.h \
     680        classes/DelphesClasses.h \
     681        classes/DelphesFactory.h \
     682        classes/DelphesFormula.h \
     683        external/ExRootAnalysis/ExRootResult.h \
     684        external/ExRootAnalysis/ExRootFilter.h \
     685        external/ExRootAnalysis/ExRootClassifier.h
     686tmp/modules/PdgCodeFilter.$(ObjSuf): \
     687        modules/PdgCodeFilter.$(SrcSuf) \
     688        modules/PdgCodeFilter.h \
     689        classes/DelphesClasses.h \
     690        classes/DelphesFactory.h \
     691        classes/DelphesFormula.h \
     692        external/ExRootAnalysis/ExRootResult.h \
     693        external/ExRootAnalysis/ExRootFilter.h \
     694        external/ExRootAnalysis/ExRootClassifier.h
     695tmp/modules/EnergyScale.$(ObjSuf): \
     696        modules/EnergyScale.$(SrcSuf) \
     697        modules/EnergyScale.h \
     698        classes/DelphesClasses.h \
     699        classes/DelphesFactory.h \
     700        classes/DelphesFormula.h \
     701        external/ExRootAnalysis/ExRootResult.h \
     702        external/ExRootAnalysis/ExRootFilter.h \
     703        external/ExRootAnalysis/ExRootClassifier.h
     704tmp/modules/TrackCountingBTagging.$(ObjSuf): \
     705        modules/TrackCountingBTagging.$(SrcSuf) \
     706        modules/TrackCountingBTagging.h \
     707        classes/DelphesClasses.h \
     708        classes/DelphesFactory.h \
     709        classes/DelphesFormula.h
     710tmp/modules/Calorimeter.$(ObjSuf): \
     711        modules/Calorimeter.$(SrcSuf) \
     712        modules/Calorimeter.h \
     713        classes/DelphesClasses.h \
     714        classes/DelphesFactory.h \
     715        classes/DelphesFormula.h \
     716        external/ExRootAnalysis/ExRootResult.h \
     717        external/ExRootAnalysis/ExRootFilter.h \
     718        external/ExRootAnalysis/ExRootClassifier.h
    711719tmp/modules/PileUpMergerPythia8.$(ObjSuf): \
    712720        modules/PileUpMergerPythia8.$(SrcSuf) \
     
    719727        external/ExRootAnalysis/ExRootFilter.h \
    720728        external/ExRootAnalysis/ExRootClassifier.h
    721 tmp/modules/LeptonDressing.$(ObjSuf): \
    722         modules/LeptonDressing.$(SrcSuf) \
    723         modules/LeptonDressing.h \
    724         classes/DelphesClasses.h \
    725         classes/DelphesFactory.h \
    726         classes/DelphesFormula.h \
    727         external/ExRootAnalysis/ExRootResult.h \
    728         external/ExRootAnalysis/ExRootFilter.h \
    729         external/ExRootAnalysis/ExRootClassifier.h
    730 tmp/modules/SimpleCalorimeter.$(ObjSuf): \
    731         modules/SimpleCalorimeter.$(SrcSuf) \
    732         modules/SimpleCalorimeter.h \
    733         classes/DelphesClasses.h \
    734         classes/DelphesFactory.h \
    735         classes/DelphesFormula.h \
    736         external/ExRootAnalysis/ExRootResult.h \
    737         external/ExRootAnalysis/ExRootFilter.h \
    738         external/ExRootAnalysis/ExRootClassifier.h
    739 tmp/modules/EnergySmearing.$(ObjSuf): \
    740         modules/EnergySmearing.$(SrcSuf) \
    741         modules/EnergySmearing.h \
    742         classes/DelphesClasses.h \
    743         classes/DelphesFactory.h \
    744         classes/DelphesFormula.h \
    745         external/ExRootAnalysis/ExRootResult.h \
    746         external/ExRootAnalysis/ExRootFilter.h \
    747         external/ExRootAnalysis/ExRootClassifier.h
    748 tmp/modules/TrackCountingBTagging.$(ObjSuf): \
    749         modules/TrackCountingBTagging.$(SrcSuf) \
    750         modules/TrackCountingBTagging.h \
    751         classes/DelphesClasses.h \
    752         classes/DelphesFactory.h \
    753         classes/DelphesFormula.h
    754 tmp/modules/ExampleModule.$(ObjSuf): \
    755         modules/ExampleModule.$(SrcSuf) \
    756         modules/ExampleModule.h \
    757         classes/DelphesClasses.h \
    758         classes/DelphesFactory.h \
    759         classes/DelphesFormula.h \
    760         external/ExRootAnalysis/ExRootResult.h \
    761         external/ExRootAnalysis/ExRootFilter.h \
    762         external/ExRootAnalysis/ExRootClassifier.h
    763729tmp/modules/MomentumSmearing.$(ObjSuf): \
    764730        modules/MomentumSmearing.$(SrcSuf) \
     
    770736        external/ExRootAnalysis/ExRootFilter.h \
    771737        external/ExRootAnalysis/ExRootClassifier.h
     738tmp/modules/ImpactParameterSmearing.$(ObjSuf): \
     739        modules/ImpactParameterSmearing.$(SrcSuf) \
     740        modules/ImpactParameterSmearing.h \
     741        classes/DelphesClasses.h \
     742        classes/DelphesFactory.h \
     743        classes/DelphesFormula.h \
     744        external/ExRootAnalysis/ExRootResult.h \
     745        external/ExRootAnalysis/ExRootFilter.h \
     746        external/ExRootAnalysis/ExRootClassifier.h
     747tmp/modules/TreeWriter.$(ObjSuf): \
     748        modules/TreeWriter.$(SrcSuf) \
     749        modules/TreeWriter.h \
     750        classes/DelphesClasses.h \
     751        classes/DelphesFactory.h \
     752        classes/DelphesFormula.h \
     753        external/ExRootAnalysis/ExRootResult.h \
     754        external/ExRootAnalysis/ExRootFilter.h \
     755        external/ExRootAnalysis/ExRootClassifier.h \
     756        external/ExRootAnalysis/ExRootTreeBranch.h
     757tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf): \
     758        external/ExRootAnalysis/ExRootTreeWriter.$(SrcSuf) \
     759        external/ExRootAnalysis/ExRootTreeWriter.h \
     760        external/ExRootAnalysis/ExRootTreeBranch.h
     761tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf): \
     762        external/ExRootAnalysis/ExRootFilter.$(SrcSuf) \
     763        external/ExRootAnalysis/ExRootFilter.h \
     764        external/ExRootAnalysis/ExRootClassifier.h
     765tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf): \
     766        external/ExRootAnalysis/ExRootResult.$(SrcSuf) \
     767        external/ExRootAnalysis/ExRootResult.h \
     768        external/ExRootAnalysis/ExRootUtilities.h
     769tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf): \
     770        external/ExRootAnalysis/ExRootConfReader.$(SrcSuf) \
     771        external/ExRootAnalysis/ExRootConfReader.h \
     772        external/tcl/tcl.h
     773tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf): \
     774        external/ExRootAnalysis/ExRootProgressBar.$(SrcSuf) \
     775        external/ExRootAnalysis/ExRootProgressBar.h
     776tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf): \
     777        external/ExRootAnalysis/ExRootTreeBranch.$(SrcSuf) \
     778        external/ExRootAnalysis/ExRootTreeBranch.h
    772779tmp/external/ExRootAnalysis/ExRootTreeReader.$(ObjSuf): \
    773780        external/ExRootAnalysis/ExRootTreeReader.$(SrcSuf) \
     
    777784        external/ExRootAnalysis/ExRootTask.h \
    778785        external/ExRootAnalysis/ExRootConfReader.h
    779 tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf): \
    780         external/ExRootAnalysis/ExRootTreeBranch.$(SrcSuf) \
    781         external/ExRootAnalysis/ExRootTreeBranch.h
    782786tmp/external/ExRootAnalysis/ExRootUtilities.$(ObjSuf): \
    783787        external/ExRootAnalysis/ExRootUtilities.$(SrcSuf) \
    784788        external/ExRootAnalysis/ExRootUtilities.h
    785 tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf): \
    786         external/ExRootAnalysis/ExRootFilter.$(SrcSuf) \
    787         external/ExRootAnalysis/ExRootFilter.h \
    788         external/ExRootAnalysis/ExRootClassifier.h
    789 tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf): \
    790         external/ExRootAnalysis/ExRootResult.$(SrcSuf) \
    791         external/ExRootAnalysis/ExRootResult.h \
    792         external/ExRootAnalysis/ExRootUtilities.h
    793 tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf): \
    794         external/ExRootAnalysis/ExRootTreeWriter.$(SrcSuf) \
    795         external/ExRootAnalysis/ExRootTreeWriter.h \
    796         external/ExRootAnalysis/ExRootTreeBranch.h
    797 tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf): \
    798         external/ExRootAnalysis/ExRootProgressBar.$(SrcSuf) \
    799         external/ExRootAnalysis/ExRootProgressBar.h
    800 tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf): \
    801         external/ExRootAnalysis/ExRootConfReader.$(SrcSuf) \
    802         external/ExRootAnalysis/ExRootConfReader.h \
    803         external/tcl/tcl.h
    804 tmp/external/fastjet/Voronoi.$(ObjSuf): \
    805         external/fastjet/Voronoi.$(SrcSuf) \
    806         external/fastjet/internal/Voronoi.hh
    807 tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
    808         external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf) \
    809         external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
    810 tmp/external/fastjet/CompositeJetStructure.$(ObjSuf): \
    811         external/fastjet/CompositeJetStructure.$(SrcSuf)
    812 tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf): \
    813         external/fastjet/Dnn4piCylinder.$(SrcSuf) \
    814         external/fastjet/internal/Dnn4piCylinder.hh
    815 tmp/external/fastjet/LazyTiling25.$(ObjSuf): \
    816         external/fastjet/LazyTiling25.$(SrcSuf) \
    817         external/fastjet/internal/LazyTiling25.hh \
    818         external/fastjet/internal/TilingExtent.hh
    819 tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
    820         external/fastjet/AreaDefinition.$(SrcSuf) \
    821         external/fastjet/AreaDefinition.hh
    822 tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf): \
    823         external/fastjet/ClusterSequencePassiveArea.$(SrcSuf) \
    824         external/fastjet/ClusterSequencePassiveArea.hh \
    825         external/fastjet/ClusterSequenceVoronoiArea.hh
    826 tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf): \
    827         external/fastjet/ClusterSequence_N2.$(SrcSuf)
    828 tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf): \
    829         external/fastjet/Dnn3piCylinder.$(SrcSuf) \
    830         external/fastjet/internal/Dnn3piCylinder.hh
    831 tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf): \
    832         external/fastjet/ClusterSequence_Delaunay.$(SrcSuf) \
    833         external/fastjet/Error.hh \
    834         external/fastjet/PseudoJet.hh \
    835         external/fastjet/ClusterSequence.hh \
    836         external/fastjet/internal/DynamicNearestNeighbours.hh \
    837         external/fastjet/internal/Dnn4piCylinder.hh \
    838         external/fastjet/internal/Dnn3piCylinder.hh \
    839         external/fastjet/internal/Dnn2piCylinder.hh
    840 tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf): \
    841         external/fastjet/Dnn2piCylinder.$(SrcSuf) \
    842         external/fastjet/internal/Dnn2piCylinder.hh
    843 tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf): \
    844         external/fastjet/ClusterSequenceAreaBase.$(SrcSuf) \
    845         external/fastjet/ClusterSequenceAreaBase.hh
    846 tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf): \
    847         external/fastjet/ClusterSequence_DumbN3.$(SrcSuf) \
    848         external/fastjet/PseudoJet.hh \
    849         external/fastjet/ClusterSequence.hh
    850 tmp/external/fastjet/MinHeap.$(ObjSuf): \
    851         external/fastjet/MinHeap.$(SrcSuf) \
    852         external/fastjet/internal/MinHeap.hh
    853 tmp/external/fastjet/RectangularGrid.$(ObjSuf): \
    854         external/fastjet/RectangularGrid.$(SrcSuf) \
    855         external/fastjet/RectangularGrid.hh
    856 tmp/external/fastjet/PseudoJet.$(ObjSuf): \
    857         external/fastjet/PseudoJet.$(SrcSuf) \
    858         external/fastjet/Error.hh \
    859         external/fastjet/PseudoJet.hh \
    860         external/fastjet/ClusterSequence.hh \
    861         external/fastjet/ClusterSequenceAreaBase.hh \
    862         external/fastjet/CompositeJetStructure.hh
    863 tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf): \
    864         external/fastjet/ClusterSequenceVoronoiArea.$(SrcSuf) \
    865         external/fastjet/ClusterSequenceVoronoiArea.hh \
    866         external/fastjet/internal/Voronoi.hh
    867 tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf): \
    868         external/fastjet/ClusterSequenceArea.$(SrcSuf) \
    869         external/fastjet/ClusterSequenceArea.hh
    870 tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf): \
    871         external/fastjet/FunctionOfPseudoJet.$(SrcSuf)
    872 tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf): \
    873         external/fastjet/ClusterSequence_TiledN2.$(SrcSuf) \
    874         external/fastjet/PseudoJet.hh \
    875         external/fastjet/ClusterSequence.hh \
    876         external/fastjet/internal/MinHeap.hh \
    877         external/fastjet/internal/TilingExtent.hh
    878 tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf): \
    879         external/fastjet/ClusterSequenceStructure.$(SrcSuf) \
    880         external/fastjet/ClusterSequenceStructure.hh \
    881         external/fastjet/Error.hh \
    882         external/fastjet/PseudoJet.hh \
    883         external/fastjet/ClusterSequence.hh \
    884         external/fastjet/ClusterSequenceAreaBase.hh
    885 tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf): \
    886         external/fastjet/LazyTiling9Alt.$(SrcSuf) \
    887         external/fastjet/internal/LazyTiling9Alt.hh \
    888         external/fastjet/internal/TilingExtent.hh
    889 tmp/external/fastjet/DnnPlane.$(ObjSuf): \
    890         external/fastjet/DnnPlane.$(SrcSuf) \
    891         external/fastjet/internal/DnnPlane.hh
    892 tmp/external/fastjet/Error.$(ObjSuf): \
    893         external/fastjet/Error.$(SrcSuf) \
    894         external/fastjet/Error.hh \
    895         external/fastjet/config.h
    896 tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf): \
    897         external/fastjet/LazyTiling9SeparateGhosts.$(SrcSuf) \
    898         external/fastjet/internal/LazyTiling9SeparateGhosts.hh \
    899         external/fastjet/internal/TilingExtent.hh
    900 tmp/external/fastjet/LazyTiling9.$(ObjSuf): \
    901         external/fastjet/LazyTiling9.$(SrcSuf) \
    902         external/fastjet/internal/LazyTiling9.hh \
    903         external/fastjet/internal/TilingExtent.hh
    904 tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf): \
    905         external/fastjet/ClusterSequenceActiveArea.$(SrcSuf) \
    906         external/fastjet/PseudoJet.hh \
    907         external/fastjet/ClusterSequence.hh \
    908         external/fastjet/ClusterSequenceActiveArea.hh \
    909         external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
    910 tmp/external/fastjet/TilingExtent.$(ObjSuf): \
    911         external/fastjet/TilingExtent.$(SrcSuf) \
    912         external/fastjet/internal/TilingExtent.hh
    913 tmp/external/fastjet/LimitedWarning.$(ObjSuf): \
    914         external/fastjet/LimitedWarning.$(SrcSuf) \
    915         external/fastjet/LimitedWarning.hh
    916 tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf): \
    917         external/fastjet/GhostedAreaSpec.$(SrcSuf) \
    918         external/fastjet/GhostedAreaSpec.hh \
    919         external/fastjet/Error.hh
    920789tmp/external/fastjet/Selector.$(ObjSuf): \
    921790        external/fastjet/Selector.$(SrcSuf) \
     
    925794        external/fastjet/BasicRandom.$(SrcSuf) \
    926795        external/fastjet/internal/BasicRandom.hh
    927 tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf): \
    928         external/fastjet/ClusterSequence_CP2DChan.$(SrcSuf) \
    929         external/fastjet/ClusterSequence.hh \
     796tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf): \
     797        external/fastjet/Dnn2piCylinder.$(SrcSuf) \
     798        external/fastjet/internal/Dnn2piCylinder.hh
     799tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf): \
     800        external/fastjet/Dnn3piCylinder.$(SrcSuf) \
     801        external/fastjet/internal/Dnn3piCylinder.hh
     802tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
     803        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf) \
     804        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
     805tmp/external/fastjet/LazyTiling9.$(ObjSuf): \
     806        external/fastjet/LazyTiling9.$(SrcSuf) \
     807        external/fastjet/internal/LazyTiling9.hh \
     808        external/fastjet/internal/TilingExtent.hh
     809tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
     810        external/fastjet/AreaDefinition.$(SrcSuf) \
     811        external/fastjet/AreaDefinition.hh
     812tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf): \
     813        external/fastjet/ClusterSequence_DumbN3.$(SrcSuf) \
     814        external/fastjet/PseudoJet.hh \
     815        external/fastjet/ClusterSequence.hh
     816tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf): \
     817        external/fastjet/ClusterSequence_Delaunay.$(SrcSuf) \
     818        external/fastjet/Error.hh \
     819        external/fastjet/PseudoJet.hh \
     820        external/fastjet/ClusterSequence.hh \
     821        external/fastjet/internal/DynamicNearestNeighbours.hh \
     822        external/fastjet/internal/Dnn4piCylinder.hh \
     823        external/fastjet/internal/Dnn3piCylinder.hh \
     824        external/fastjet/internal/Dnn2piCylinder.hh
     825tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf): \
     826        external/fastjet/Dnn4piCylinder.$(SrcSuf) \
     827        external/fastjet/internal/Dnn4piCylinder.hh
     828tmp/external/fastjet/ClosestPair2D.$(ObjSuf): \
     829        external/fastjet/ClosestPair2D.$(SrcSuf) \
    930830        external/fastjet/internal/ClosestPair2D.hh
    931 tmp/external/fastjet/RangeDefinition.$(ObjSuf): \
    932         external/fastjet/RangeDefinition.$(SrcSuf) \
    933         external/fastjet/RangeDefinition.hh
     831tmp/external/fastjet/JetDefinition.$(ObjSuf): \
     832        external/fastjet/JetDefinition.$(SrcSuf) \
     833        external/fastjet/JetDefinition.hh \
     834        external/fastjet/Error.hh \
     835        external/fastjet/CompositeJetStructure.hh
     836tmp/external/fastjet/RectangularGrid.$(ObjSuf): \
     837        external/fastjet/RectangularGrid.$(SrcSuf) \
     838        external/fastjet/RectangularGrid.hh
     839tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf): \
     840        external/fastjet/ClusterSequenceAreaBase.$(SrcSuf) \
     841        external/fastjet/ClusterSequenceAreaBase.hh
     842tmp/external/fastjet/DnnPlane.$(ObjSuf): \
     843        external/fastjet/DnnPlane.$(SrcSuf) \
     844        external/fastjet/internal/DnnPlane.hh
     845tmp/external/fastjet/LazyTiling25.$(ObjSuf): \
     846        external/fastjet/LazyTiling25.$(SrcSuf) \
     847        external/fastjet/internal/LazyTiling25.hh \
     848        external/fastjet/internal/TilingExtent.hh
     849tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf): \
     850        external/fastjet/LazyTiling9SeparateGhosts.$(SrcSuf) \
     851        external/fastjet/internal/LazyTiling9SeparateGhosts.hh \
     852        external/fastjet/internal/TilingExtent.hh
     853tmp/external/fastjet/Error.$(ObjSuf): \
     854        external/fastjet/Error.$(SrcSuf) \
     855        external/fastjet/Error.hh \
     856        external/fastjet/config.h
     857tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf): \
     858        external/fastjet/ClusterSequenceActiveArea.$(SrcSuf) \
     859        external/fastjet/PseudoJet.hh \
     860        external/fastjet/ClusterSequence.hh \
     861        external/fastjet/ClusterSequenceActiveArea.hh \
     862        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
     863tmp/external/fastjet/CompositeJetStructure.$(ObjSuf): \
     864        external/fastjet/CompositeJetStructure.$(SrcSuf)
     865tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf): \
     866        external/fastjet/ClusterSequence_N2.$(SrcSuf)
     867tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf): \
     868        external/fastjet/ClusterSequence_TiledN2.$(SrcSuf) \
     869        external/fastjet/PseudoJet.hh \
     870        external/fastjet/ClusterSequence.hh \
     871        external/fastjet/internal/MinHeap.hh \
     872        external/fastjet/internal/TilingExtent.hh
     873tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf): \
     874        external/fastjet/ClusterSequenceStructure.$(SrcSuf) \
     875        external/fastjet/ClusterSequenceStructure.hh \
     876        external/fastjet/Error.hh \
     877        external/fastjet/PseudoJet.hh \
     878        external/fastjet/ClusterSequence.hh \
     879        external/fastjet/ClusterSequenceAreaBase.hh
     880tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf): \
     881        external/fastjet/ClusterSequencePassiveArea.$(SrcSuf) \
     882        external/fastjet/ClusterSequencePassiveArea.hh \
     883        external/fastjet/ClusterSequenceVoronoiArea.hh
    934884tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf): \
    935885        external/fastjet/PseudoJetStructureBase.$(SrcSuf) \
     
    939889        external/fastjet/ClusterSequence.hh \
    940890        external/fastjet/ClusterSequenceAreaBase.hh
     891tmp/external/fastjet/TilingExtent.$(ObjSuf): \
     892        external/fastjet/TilingExtent.$(SrcSuf) \
     893        external/fastjet/internal/TilingExtent.hh
     894tmp/external/fastjet/Voronoi.$(ObjSuf): \
     895        external/fastjet/Voronoi.$(SrcSuf) \
     896        external/fastjet/internal/Voronoi.hh
     897tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf): \
     898        external/fastjet/LazyTiling9Alt.$(SrcSuf) \
     899        external/fastjet/internal/LazyTiling9Alt.hh \
     900        external/fastjet/internal/TilingExtent.hh
     901tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf): \
     902        external/fastjet/ClusterSequenceArea.$(SrcSuf) \
     903        external/fastjet/ClusterSequenceArea.hh
     904tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
     905        external/fastjet/ClusterSequence1GhostPassiveArea.$(SrcSuf) \
     906        external/fastjet/ClusterSequence1GhostPassiveArea.hh
     907tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf): \
     908        external/fastjet/FunctionOfPseudoJet.$(SrcSuf)
     909tmp/external/fastjet/MinHeap.$(ObjSuf): \
     910        external/fastjet/MinHeap.$(SrcSuf) \
     911        external/fastjet/internal/MinHeap.hh
     912tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf): \
     913        external/fastjet/GhostedAreaSpec.$(SrcSuf) \
     914        external/fastjet/GhostedAreaSpec.hh \
     915        external/fastjet/Error.hh
     916tmp/external/fastjet/RangeDefinition.$(ObjSuf): \
     917        external/fastjet/RangeDefinition.$(SrcSuf) \
     918        external/fastjet/RangeDefinition.hh
     919tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf): \
     920        external/fastjet/ClusterSequence_CP2DChan.$(SrcSuf) \
     921        external/fastjet/ClusterSequence.hh \
     922        external/fastjet/internal/ClosestPair2D.hh
     923tmp/external/fastjet/PseudoJet.$(ObjSuf): \
     924        external/fastjet/PseudoJet.$(SrcSuf) \
     925        external/fastjet/Error.hh \
     926        external/fastjet/PseudoJet.hh \
     927        external/fastjet/ClusterSequence.hh \
     928        external/fastjet/ClusterSequenceAreaBase.hh \
     929        external/fastjet/CompositeJetStructure.hh
     930tmp/external/fastjet/LimitedWarning.$(ObjSuf): \
     931        external/fastjet/LimitedWarning.$(SrcSuf) \
     932        external/fastjet/LimitedWarning.hh
     933tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf): \
     934        external/fastjet/ClusterSequenceVoronoiArea.$(SrcSuf) \
     935        external/fastjet/ClusterSequenceVoronoiArea.hh \
     936        external/fastjet/internal/Voronoi.hh
    941937tmp/external/fastjet/ClusterSequence.$(ObjSuf): \
    942938        external/fastjet/ClusterSequence.$(SrcSuf) \
     
    950946        external/fastjet/internal/LazyTiling25.hh \
    951947        external/fastjet/internal/LazyTiling9SeparateGhosts.hh
    952 tmp/external/fastjet/JetDefinition.$(ObjSuf): \
    953         external/fastjet/JetDefinition.$(SrcSuf) \
    954         external/fastjet/JetDefinition.hh \
    955         external/fastjet/Error.hh \
    956         external/fastjet/CompositeJetStructure.hh
    957 tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
    958         external/fastjet/ClusterSequence1GhostPassiveArea.$(SrcSuf) \
    959         external/fastjet/ClusterSequence1GhostPassiveArea.hh
    960 tmp/external/fastjet/ClosestPair2D.$(ObjSuf): \
    961         external/fastjet/ClosestPair2D.$(SrcSuf) \
    962         external/fastjet/internal/ClosestPair2D.hh
    963 tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf): \
    964         external/fastjet/tools/TopTaggerBase.$(SrcSuf)
    965 tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf): \
    966         external/fastjet/tools/JHTopTagger.$(SrcSuf)
    967 tmp/external/fastjet/tools/Recluster.$(ObjSuf): \
    968         external/fastjet/tools/Recluster.$(SrcSuf) \
    969         external/fastjet/tools/Recluster.hh \
    970         external/fastjet/CompositeJetStructure.hh
     948tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf): \
     949        external/fastjet/tools/RestFrameNSubjettinessTagger.$(SrcSuf)
     950tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf): \
     951        external/fastjet/tools/MassDropTagger.$(SrcSuf)
    971952tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf): \
    972953        external/fastjet/tools/GridMedianBackgroundEstimator.$(SrcSuf) \
    973954        external/fastjet/tools/GridMedianBackgroundEstimator.hh
    974 tmp/external/fastjet/tools/Filter.$(ObjSuf): \
    975         external/fastjet/tools/Filter.$(SrcSuf) \
    976         external/fastjet/tools/Filter.hh \
    977         external/fastjet/tools/Recluster.hh
    978 tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf): \
    979         external/fastjet/tools/JetMedianBackgroundEstimator.$(SrcSuf) \
    980         external/fastjet/tools/JetMedianBackgroundEstimator.hh
    981 tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf): \
    982         external/fastjet/tools/MassDropTagger.$(SrcSuf)
    983 tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf): \
    984         external/fastjet/tools/BackgroundEstimatorBase.$(SrcSuf) \
    985         external/fastjet/tools/BackgroundEstimatorBase.hh
    986 tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf): \
    987         external/fastjet/tools/RestFrameNSubjettinessTagger.$(SrcSuf)
    988 tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf): \
    989         external/fastjet/tools/CASubJetTagger.$(SrcSuf)
    990955tmp/external/fastjet/tools/Pruner.$(ObjSuf): \
    991956        external/fastjet/tools/Pruner.$(SrcSuf) \
     
    993958        external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh \
    994959        external/fastjet/Selector.hh
     960tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf): \
     961        external/fastjet/tools/CASubJetTagger.$(SrcSuf)
     962tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf): \
     963        external/fastjet/tools/BackgroundEstimatorBase.$(SrcSuf) \
     964        external/fastjet/tools/BackgroundEstimatorBase.hh
    995965tmp/external/fastjet/tools/Subtractor.$(ObjSuf): \
    996966        external/fastjet/tools/Subtractor.$(SrcSuf) \
    997967        external/fastjet/tools/Subtractor.hh
    998 tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf): \
    999         external/fastjet/plugins/SISCone/area.$(SrcSuf)
    1000 tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf): \
    1001         external/fastjet/plugins/SISCone/protocones.$(SrcSuf)
     968tmp/external/fastjet/tools/Recluster.$(ObjSuf): \
     969        external/fastjet/tools/Recluster.$(SrcSuf) \
     970        external/fastjet/tools/Recluster.hh \
     971        external/fastjet/CompositeJetStructure.hh
     972tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf): \
     973        external/fastjet/tools/JetMedianBackgroundEstimator.$(SrcSuf) \
     974        external/fastjet/tools/JetMedianBackgroundEstimator.hh
     975tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf): \
     976        external/fastjet/tools/JHTopTagger.$(SrcSuf)
     977tmp/external/fastjet/tools/Filter.$(ObjSuf): \
     978        external/fastjet/tools/Filter.$(SrcSuf) \
     979        external/fastjet/tools/Filter.hh \
     980        external/fastjet/tools/Recluster.hh
     981tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf): \
     982        external/fastjet/tools/TopTaggerBase.$(SrcSuf)
     983tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf): \
     984        external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(SrcSuf) \
     985        external/fastjet/ClusterSequence.hh \
     986        external/fastjet/Error.hh
     987tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf): \
     988        external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(SrcSuf) \
     989        external/fastjet/ClusterSequence.hh \
     990        external/fastjet/Error.hh
     991tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf): \
     992        external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(SrcSuf)
     993tmp/external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf): \
     994        external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
     995        external/fastjet/ClusterSequence.hh
     996tmp/external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(ObjSuf): \
     997        external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(SrcSuf)
     998tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf): \
     999        external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(SrcSuf) \
     1000        external/fastjet/ClusterSequence.hh \
     1001        external/fastjet/Error.hh
     1002tmp/external/fastjet/plugins/GridJet/GridJetPlugin.$(ObjSuf): \
     1003        external/fastjet/plugins/GridJet/GridJetPlugin.$(SrcSuf) \
     1004        external/fastjet/ClusterSequence.hh
     1005tmp/external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(ObjSuf): \
     1006        external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(SrcSuf) \
     1007        external/fastjet/ClusterSequence.hh
     1008tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf): \
     1009        external/fastjet/plugins/SISCone/split_merge.$(SrcSuf)
     1010tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf): \
     1011        external/fastjet/plugins/SISCone/hash.$(SrcSuf)
    10021012tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf): \
    10031013        external/fastjet/plugins/SISCone/siscone_error.$(SrcSuf)
     1014tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf): \
     1015        external/fastjet/plugins/SISCone/ranlux.$(SrcSuf)
    10041016tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \
    10051017        external/fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \
    10061018        external/fastjet/ClusterSequence.hh
    1007 tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf): \
    1008         external/fastjet/plugins/SISCone/hash.$(SrcSuf)
    1009 tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf): \
    1010         external/fastjet/plugins/SISCone/momentum.$(SrcSuf)
     1019tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf): \
     1020        external/fastjet/plugins/SISCone/vicinity.$(SrcSuf)
     1021tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf): \
     1022        external/fastjet/plugins/SISCone/area.$(SrcSuf)
     1023tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf): \
     1024        external/fastjet/plugins/SISCone/reference.$(SrcSuf)
    10111025tmp/external/fastjet/plugins/SISCone/quadtree.$(ObjSuf): \
    10121026        external/fastjet/plugins/SISCone/quadtree.$(SrcSuf)
    10131027tmp/external/fastjet/plugins/SISCone/siscone.$(ObjSuf): \
    10141028        external/fastjet/plugins/SISCone/siscone.$(SrcSuf)
    1015 tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf): \
    1016         external/fastjet/plugins/SISCone/vicinity.$(SrcSuf)
    1017 tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf): \
    1018         external/fastjet/plugins/SISCone/split_merge.$(SrcSuf)
    1019 tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf): \
    1020         external/fastjet/plugins/SISCone/ranlux.$(SrcSuf)
     1029tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf): \
     1030        external/fastjet/plugins/SISCone/momentum.$(SrcSuf)
     1031tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf): \
     1032        external/fastjet/plugins/SISCone/protocones.$(SrcSuf)
    10211033tmp/external/fastjet/plugins/SISCone/geom_2d.$(ObjSuf): \
    10221034        external/fastjet/plugins/SISCone/geom_2d.$(SrcSuf)
    1023 tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf): \
    1024         external/fastjet/plugins/SISCone/reference.$(SrcSuf)
    1025 tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf): \
    1026         external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(SrcSuf) \
    1027         external/fastjet/ClusterSequence.hh \
    1028         external/fastjet/Error.hh
    1029 tmp/external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(ObjSuf): \
    1030         external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(SrcSuf)
    1031 tmp/external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf): \
    1032         external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
     1035tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf): \
     1036        external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(SrcSuf) \
    10331037        external/fastjet/ClusterSequence.hh
    1034 tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf): \
    1035         external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(SrcSuf)
    1036 tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf): \
    1037         external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(SrcSuf) \
    1038         external/fastjet/ClusterSequence.hh \
    1039         external/fastjet/Error.hh
    1040 tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf): \
    1041         external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(SrcSuf) \
    1042         external/fastjet/ClusterSequence.hh \
    1043         external/fastjet/Error.hh
     1038tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf): \
     1039        external/fastjet/plugins/ATLASCone/Jet.$(SrcSuf)
     1040tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf): \
     1041        external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(SrcSuf)
     1042tmp/external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(ObjSuf): \
     1043        external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(SrcSuf)
     1044tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf): \
     1045        external/fastjet/plugins/EECambridge/EECambridgePlugin.$(SrcSuf) \
     1046        external/fastjet/ClusterSequence.hh \
     1047        external/fastjet/NNH.hh
    10441048tmp/external/fastjet/plugins/TrackJet/TrackJetPlugin.$(ObjSuf): \
    10451049        external/fastjet/plugins/TrackJet/TrackJetPlugin.$(SrcSuf) \
    10461050        external/fastjet/ClusterSequence.hh
    1047 tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf): \
    1048         external/fastjet/plugins/ATLASCone/Jet.$(SrcSuf)
    1049 tmp/external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(ObjSuf): \
    1050         external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(SrcSuf)
    1051 tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf): \
    1052         external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(SrcSuf)
    1053 tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf): \
    1054         external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(SrcSuf) \
    1055         external/fastjet/ClusterSequence.hh
    1056 tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf): \
    1057         external/fastjet/plugins/EECambridge/EECambridgePlugin.$(SrcSuf) \
    1058         external/fastjet/ClusterSequence.hh \
    1059         external/fastjet/NNH.hh
    10601051tmp/external/fastjet/plugins/Jade/JadePlugin.$(ObjSuf): \
    10611052        external/fastjet/plugins/Jade/JadePlugin.$(SrcSuf) \
     
    10651056        external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(SrcSuf) \
    10661057        external/fastjet/ClusterSequence.hh
    1067 tmp/external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(ObjSuf): \
    1068         external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(SrcSuf) \
    1069         external/fastjet/ClusterSequence.hh
    1070 tmp/external/fastjet/plugins/GridJet/GridJetPlugin.$(ObjSuf): \
    1071         external/fastjet/plugins/GridJet/GridJetPlugin.$(SrcSuf) \
    1072         external/fastjet/ClusterSequence.hh
    10731058tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
    10741059        external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
    1075 tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf): \
    1076         external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(SrcSuf)
     1060tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf): \
     1061        external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(SrcSuf)
    10771062tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf): \
    10781063        external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(SrcSuf)
    1079 tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf): \
    1080         external/fastjet/contribs/Nsubjettiness/Njettiness.$(SrcSuf)
    1081 tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf): \
    1082         external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(SrcSuf)
    10831064tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf): \
    10841065        external/fastjet/contribs/Nsubjettiness/AxesFinder.$(SrcSuf)
    10851066tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf): \
    10861067        external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(SrcSuf)
    1087 tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf): \
    1088         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(SrcSuf)
     1068tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf): \
     1069        external/fastjet/contribs/Nsubjettiness/Njettiness.$(SrcSuf)
     1070tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf): \
     1071        external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(SrcSuf)
     1072tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf): \
     1073        external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(SrcSuf)
     1074tmp/external/Hector/H_OpticalElement.$(ObjSuf): \
     1075        external/Hector/H_OpticalElement.$(SrcSuf)
    10891076tmp/external/Hector/H_CircularAperture.$(ObjSuf): \
    10901077        external/Hector/H_CircularAperture.$(SrcSuf)
    1091 tmp/external/Hector/H_Quadrupole.$(ObjSuf): \
    1092         external/Hector/H_Quadrupole.$(SrcSuf)
     1078tmp/external/Hector/H_TransportMatrices.$(ObjSuf): \
     1079        external/Hector/H_TransportMatrices.$(SrcSuf)
     1080tmp/external/Hector/H_SectorDipole.$(ObjSuf): \
     1081        external/Hector/H_SectorDipole.$(SrcSuf)
    10931082tmp/external/Hector/H_Dipole.$(ObjSuf): \
    10941083        external/Hector/H_Dipole.$(SrcSuf)
    1095 tmp/external/Hector/H_OpticalElement.$(ObjSuf): \
    1096         external/Hector/H_OpticalElement.$(SrcSuf)
     1084tmp/external/Hector/H_AbstractBeamLine.$(ObjSuf): \
     1085        external/Hector/H_AbstractBeamLine.$(SrcSuf)
     1086tmp/external/Hector/H_BeamLine.$(ObjSuf): \
     1087        external/Hector/H_BeamLine.$(SrcSuf)
     1088tmp/external/Hector/H_RectEllipticAperture.$(ObjSuf): \
     1089        external/Hector/H_RectEllipticAperture.$(SrcSuf)
     1090tmp/external/Hector/H_HorizontalKicker.$(ObjSuf): \
     1091        external/Hector/H_HorizontalKicker.$(SrcSuf)
     1092tmp/external/Hector/H_Kicker.$(ObjSuf): \
     1093        external/Hector/H_Kicker.$(SrcSuf)
     1094tmp/external/Hector/H_BeamLineParser.$(ObjSuf): \
     1095        external/Hector/H_BeamLineParser.$(SrcSuf)
     1096tmp/external/Hector/H_BeamParticle.$(ObjSuf): \
     1097        external/Hector/H_BeamParticle.$(SrcSuf)
     1098tmp/external/Hector/H_RectangularDipole.$(ObjSuf): \
     1099        external/Hector/H_RectangularDipole.$(SrcSuf)
     1100tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
     1101        external/Hector/H_VerticalQuadrupole.$(SrcSuf)
     1102tmp/external/Hector/H_Marker.$(ObjSuf): \
     1103        external/Hector/H_Marker.$(SrcSuf)
     1104tmp/external/Hector/H_Beam.$(ObjSuf): \
     1105        external/Hector/H_Beam.$(SrcSuf)
     1106tmp/external/Hector/H_EllipticAperture.$(ObjSuf): \
     1107        external/Hector/H_EllipticAperture.$(SrcSuf)
     1108tmp/external/Hector/H_VerticalKicker.$(ObjSuf): \
     1109        external/Hector/H_VerticalKicker.$(SrcSuf)
    10971110tmp/external/Hector/H_HorizontalQuadrupole.$(ObjSuf): \
    10981111        external/Hector/H_HorizontalQuadrupole.$(SrcSuf)
    1099 tmp/external/Hector/H_Aperture.$(ObjSuf): \
    1100         external/Hector/H_Aperture.$(SrcSuf)
     1112tmp/external/Hector/H_Parameters.$(ObjSuf): \
     1113        external/Hector/H_Parameters.$(SrcSuf)
    11011114tmp/external/Hector/H_Drift.$(ObjSuf): \
    11021115        external/Hector/H_Drift.$(SrcSuf)
    11031116tmp/external/Hector/H_RomanPot.$(ObjSuf): \
    11041117        external/Hector/H_RomanPot.$(SrcSuf)
    1105 tmp/external/Hector/H_HorizontalKicker.$(ObjSuf): \
    1106         external/Hector/H_HorizontalKicker.$(SrcSuf)
    1107 tmp/external/Hector/H_Beam.$(ObjSuf): \
    1108         external/Hector/H_Beam.$(SrcSuf)
    11091118tmp/external/Hector/H_RecRPObject.$(ObjSuf): \
    11101119        external/Hector/H_RecRPObject.$(SrcSuf)
    1111 tmp/external/Hector/H_BeamLineParser.$(ObjSuf): \
    1112         external/Hector/H_BeamLineParser.$(SrcSuf)
    1113 tmp/external/Hector/H_Parameters.$(ObjSuf): \
    1114         external/Hector/H_Parameters.$(SrcSuf)
    11151120tmp/external/Hector/H_RectangularCollimator.$(ObjSuf): \
    11161121        external/Hector/H_RectangularCollimator.$(SrcSuf)
    1117 tmp/external/Hector/H_Kicker.$(ObjSuf): \
    1118         external/Hector/H_Kicker.$(SrcSuf)
    1119 tmp/external/Hector/H_AbstractBeamLine.$(ObjSuf): \
    1120         external/Hector/H_AbstractBeamLine.$(SrcSuf)
    1121 tmp/external/Hector/H_Marker.$(ObjSuf): \
    1122         external/Hector/H_Marker.$(SrcSuf)
    1123 tmp/external/Hector/H_TransportMatrices.$(ObjSuf): \
    1124         external/Hector/H_TransportMatrices.$(SrcSuf)
    1125 tmp/external/Hector/H_SectorDipole.$(ObjSuf): \
    1126         external/Hector/H_SectorDipole.$(SrcSuf)
    1127 tmp/external/Hector/H_EllipticAperture.$(ObjSuf): \
    1128         external/Hector/H_EllipticAperture.$(SrcSuf)
    1129 tmp/external/Hector/H_VerticalKicker.$(ObjSuf): \
    1130         external/Hector/H_VerticalKicker.$(SrcSuf)
    1131 tmp/external/Hector/H_RectEllipticAperture.$(ObjSuf): \
    1132         external/Hector/H_RectEllipticAperture.$(SrcSuf)
    1133 tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
    1134         external/Hector/H_VerticalQuadrupole.$(SrcSuf)
    1135 tmp/external/Hector/H_BeamLine.$(ObjSuf): \
    1136         external/Hector/H_BeamLine.$(SrcSuf)
    1137 tmp/external/Hector/H_BeamParticle.$(ObjSuf): \
    1138         external/Hector/H_BeamParticle.$(SrcSuf)
     1122tmp/external/Hector/H_Aperture.$(ObjSuf): \
     1123        external/Hector/H_Aperture.$(SrcSuf)
    11391124tmp/external/Hector/H_RectangularAperture.$(ObjSuf): \
    11401125        external/Hector/H_RectangularAperture.$(SrcSuf)
    1141 tmp/external/Hector/H_RectangularDipole.$(ObjSuf): \
    1142         external/Hector/H_RectangularDipole.$(SrcSuf)
     1126tmp/external/Hector/H_Quadrupole.$(ObjSuf): \
     1127        external/Hector/H_Quadrupole.$(SrcSuf)
    11431128DELPHES_OBJ +=  \
    1144         tmp/classes/DelphesPileUpWriter.$(ObjSuf) \
     1129        tmp/classes/DelphesPileUpReader.$(ObjSuf) \
     1130        tmp/classes/DelphesSTDHEPReader.$(ObjSuf) \
     1131        tmp/classes/DelphesTF2.$(ObjSuf) \
    11451132        tmp/classes/DelphesHepMCReader.$(ObjSuf) \
    1146         tmp/classes/DelphesSTDHEPReader.$(ObjSuf) \
    1147         tmp/classes/DelphesPileUpReader.$(ObjSuf) \
     1133        tmp/classes/DelphesLHEFReader.$(ObjSuf) \
     1134        tmp/classes/DelphesStream.$(ObjSuf) \
     1135        tmp/classes/DelphesModule.$(ObjSuf) \
     1136        tmp/classes/DelphesFactory.$(ObjSuf) \
    11481137        tmp/classes/DelphesClasses.$(ObjSuf) \
    11491138        tmp/classes/DelphesFormula.$(ObjSuf) \
    1150         tmp/classes/DelphesTF2.$(ObjSuf) \
    1151         tmp/classes/DelphesModule.$(ObjSuf) \
    1152         tmp/classes/DelphesStream.$(ObjSuf) \
    1153         tmp/classes/DelphesFactory.$(ObjSuf) \
    1154         tmp/classes/DelphesLHEFReader.$(ObjSuf) \
    1155         tmp/modules/EnergyScale.$(ObjSuf) \
    1156         tmp/modules/Cloner.$(ObjSuf) \
     1139        tmp/classes/DelphesPileUpWriter.$(ObjSuf) \
     1140        tmp/modules/StatusPidFilter.$(ObjSuf) \
     1141        tmp/modules/ParticlePropagator.$(ObjSuf) \
     1142        tmp/modules/Delphes.$(ObjSuf) \
    11571143        tmp/modules/UniqueObjectFinder.$(ObjSuf) \
    1158         tmp/modules/ParticlePropagator.$(ObjSuf) \
    1159         tmp/modules/FastJetFinder.$(ObjSuf) \
    1160         tmp/modules/Calorimeter.$(ObjSuf) \
    1161         tmp/modules/TreeWriter.$(ObjSuf) \
     1144        tmp/modules/ConstituentFilter.$(ObjSuf) \
     1145        tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
     1146        tmp/modules/Weighter.$(ObjSuf) \
    11621147        tmp/modules/Isolation.$(ObjSuf) \
    11631148        tmp/modules/PileUpMerger.$(ObjSuf) \
     1149        tmp/modules/ExampleModule.$(ObjSuf) \
     1150        tmp/modules/Hector.$(ObjSuf) \
     1151        tmp/modules/EnergySmearing.$(ObjSuf) \
     1152        tmp/modules/FastJetFinder.$(ObjSuf) \
     1153        tmp/modules/SimpleCalorimeter.$(ObjSuf) \
     1154        tmp/modules/LeptonDressing.$(ObjSuf) \
    11641155        tmp/modules/Efficiency.$(ObjSuf) \
     1156        tmp/modules/TimeSmearing.$(ObjSuf) \
     1157        tmp/modules/PileUpJetID.$(ObjSuf) \
     1158        tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
     1159        tmp/modules/TauTagging.$(ObjSuf) \
     1160        tmp/modules/BTagging.$(ObjSuf) \
     1161        tmp/modules/Merger.$(ObjSuf) \
     1162        tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
     1163        tmp/modules/Cloner.$(ObjSuf) \
     1164        tmp/modules/PdgCodeFilter.$(ObjSuf) \
     1165        tmp/modules/EnergyScale.$(ObjSuf) \
     1166        tmp/modules/TrackCountingBTagging.$(ObjSuf) \
     1167        tmp/modules/Calorimeter.$(ObjSuf) \
     1168        tmp/modules/MomentumSmearing.$(ObjSuf) \
    11651169        tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
    1166         tmp/modules/Weighter.$(ObjSuf) \
    1167         tmp/modules/TauTagging.$(ObjSuf) \
    1168         tmp/modules/PileUpJetID.$(ObjSuf) \
    1169         tmp/modules/ConstituentFilter.$(ObjSuf) \
    1170         tmp/modules/Merger.$(ObjSuf) \
    1171         tmp/modules/PdgCodeFilter.$(ObjSuf) \
    1172         tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
    1173         tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
    1174         tmp/modules/TimeSmearing.$(ObjSuf) \
    1175         tmp/modules/BTagging.$(ObjSuf) \
    1176         tmp/modules/Delphes.$(ObjSuf) \
    1177         tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
    1178         tmp/modules/StatusPidFilter.$(ObjSuf) \
    1179         tmp/modules/Hector.$(ObjSuf) \
    1180         tmp/modules/LeptonDressing.$(ObjSuf) \
    1181         tmp/modules/SimpleCalorimeter.$(ObjSuf) \
    1182         tmp/modules/EnergySmearing.$(ObjSuf) \
    1183         tmp/modules/TrackCountingBTagging.$(ObjSuf) \
    1184         tmp/modules/ExampleModule.$(ObjSuf) \
    1185         tmp/modules/MomentumSmearing.$(ObjSuf) \
     1170        tmp/modules/TreeWriter.$(ObjSuf) \
     1171        tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf) \
     1172        tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf) \
     1173        tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf) \
     1174        tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf) \
     1175        tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf) \
     1176        tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf) \
    11861177        tmp/external/ExRootAnalysis/ExRootTreeReader.$(ObjSuf) \
    11871178        tmp/external/ExRootAnalysis/ExRootTask.$(ObjSuf) \
    1188         tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf) \
    11891179        tmp/external/ExRootAnalysis/ExRootUtilities.$(ObjSuf) \
    1190         tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf) \
    1191         tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf) \
    1192         tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf) \
    1193         tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf) \
    1194         tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf) \
    1195         tmp/external/fastjet/Voronoi.$(ObjSuf) \
     1180        tmp/external/fastjet/Selector.$(ObjSuf) \
     1181        tmp/external/fastjet/BasicRandom.$(ObjSuf) \
     1182        tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf) \
     1183        tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf) \
    11961184        tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
     1185        tmp/external/fastjet/LazyTiling9.$(ObjSuf) \
     1186        tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
     1187        tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf) \
     1188        tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf) \
     1189        tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf) \
     1190        tmp/external/fastjet/ClosestPair2D.$(ObjSuf) \
     1191        tmp/external/fastjet/JetDefinition.$(ObjSuf) \
     1192        tmp/external/fastjet/RectangularGrid.$(ObjSuf) \
     1193        tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf) \
     1194        tmp/external/fastjet/DnnPlane.$(ObjSuf) \
     1195        tmp/external/fastjet/LazyTiling25.$(ObjSuf) \
     1196        tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf) \
     1197        tmp/external/fastjet/Error.$(ObjSuf) \
     1198        tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf) \
    11971199        tmp/external/fastjet/CompositeJetStructure.$(ObjSuf) \
    1198         tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf) \
    1199         tmp/external/fastjet/LazyTiling25.$(ObjSuf) \
    1200         tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
    1201         tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf) \
    12021200        tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf) \
    1203         tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf) \
    1204         tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf) \
    1205         tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf) \
    1206         tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf) \
    1207         tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf) \
    1208         tmp/external/fastjet/MinHeap.$(ObjSuf) \
    1209         tmp/external/fastjet/RectangularGrid.$(ObjSuf) \
    1210         tmp/external/fastjet/PseudoJet.$(ObjSuf) \
    1211         tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf) \
    1212         tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf) \
    1213         tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf) \
    12141201        tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf) \
    12151202        tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf) \
     1203        tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf) \
     1204        tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf) \
     1205        tmp/external/fastjet/TilingExtent.$(ObjSuf) \
     1206        tmp/external/fastjet/Voronoi.$(ObjSuf) \
    12161207        tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf) \
    1217         tmp/external/fastjet/DnnPlane.$(ObjSuf) \
    1218         tmp/external/fastjet/Error.$(ObjSuf) \
    1219         tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf) \
    1220         tmp/external/fastjet/LazyTiling9.$(ObjSuf) \
    1221         tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf) \
    1222         tmp/external/fastjet/TilingExtent.$(ObjSuf) \
     1208        tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf) \
     1209        tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
     1210        tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf) \
     1211        tmp/external/fastjet/MinHeap.$(ObjSuf) \
     1212        tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf) \
     1213        tmp/external/fastjet/RangeDefinition.$(ObjSuf) \
     1214        tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf) \
     1215        tmp/external/fastjet/PseudoJet.$(ObjSuf) \
    12231216        tmp/external/fastjet/LimitedWarning.$(ObjSuf) \
    1224         tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf) \
    1225         tmp/external/fastjet/Selector.$(ObjSuf) \
    1226         tmp/external/fastjet/BasicRandom.$(ObjSuf) \
    1227         tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf) \
    1228         tmp/external/fastjet/RangeDefinition.$(ObjSuf) \
    1229         tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf) \
     1217        tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf) \
    12301218        tmp/external/fastjet/ClusterSequence.$(ObjSuf) \
    1231         tmp/external/fastjet/JetDefinition.$(ObjSuf) \
    1232         tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
    1233         tmp/external/fastjet/ClosestPair2D.$(ObjSuf) \
     1219        tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf) \
     1220        tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf) \
     1221        tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf) \
     1222        tmp/external/fastjet/tools/Pruner.$(ObjSuf) \
     1223        tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf) \
     1224        tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf) \
     1225        tmp/external/fastjet/tools/Subtractor.$(ObjSuf) \
     1226        tmp/external/fastjet/tools/Recluster.$(ObjSuf) \
     1227        tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf) \
     1228        tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf) \
     1229        tmp/external/fastjet/tools/Filter.$(ObjSuf) \
    12341230        tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
    1235         tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf) \
    1236         tmp/external/fastjet/tools/Recluster.$(ObjSuf) \
    1237         tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf) \
    1238         tmp/external/fastjet/tools/Filter.$(ObjSuf) \
    1239         tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf) \
    1240         tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf) \
    1241         tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf) \
    1242         tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf) \
    1243         tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf) \
    1244         tmp/external/fastjet/tools/Pruner.$(ObjSuf) \
    1245         tmp/external/fastjet/tools/Subtractor.$(ObjSuf) \
     1231        tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf) \
     1232        tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
     1233        tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf) \
     1234        tmp/external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \
     1235        tmp/external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(ObjSuf) \
     1236        tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf) \
     1237        tmp/external/fastjet/plugins/GridJet/GridJetPlugin.$(ObjSuf) \
     1238        tmp/external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(ObjSuf) \
     1239        tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf) \
     1240        tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf) \
     1241        tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf) \
     1242        tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf) \
     1243        tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
     1244        tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf) \
    12461245        tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf) \
    1247         tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf) \
    1248         tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf) \
    1249         tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
    1250         tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf) \
    1251         tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf) \
     1246        tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf) \
    12521247        tmp/external/fastjet/plugins/SISCone/quadtree.$(ObjSuf) \
    12531248        tmp/external/fastjet/plugins/SISCone/siscone.$(ObjSuf) \
    1254         tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf) \
    1255         tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf) \
    1256         tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf) \
     1249        tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf) \
     1250        tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf) \
    12571251        tmp/external/fastjet/plugins/SISCone/geom_2d.$(ObjSuf) \
    1258         tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf) \
    1259         tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf) \
    1260         tmp/external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(ObjSuf) \
    1261         tmp/external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \
    1262         tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf) \
    1263         tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
    1264         tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf) \
     1252        tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
     1253        tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf) \
     1254        tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf) \
     1255        tmp/external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(ObjSuf) \
     1256        tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf) \
    12651257        tmp/external/fastjet/plugins/TrackJet/TrackJetPlugin.$(ObjSuf) \
    1266         tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf) \
    1267         tmp/external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(ObjSuf) \
    1268         tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf) \
    1269         tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
    1270         tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf) \
    12711258        tmp/external/fastjet/plugins/Jade/JadePlugin.$(ObjSuf) \
    12721259        tmp/external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(ObjSuf) \
    1273         tmp/external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(ObjSuf) \
    1274         tmp/external/fastjet/plugins/GridJet/GridJetPlugin.$(ObjSuf) \
    12751260        tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
    1276         tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf) \
     1261        tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
    12771262        tmp/external/fastjet/contribs/Nsubjettiness/WinnerTakeAllRecombiner.$(ObjSuf) \
    1278         tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf) \
    1279         tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf) \
    12801263        tmp/external/fastjet/contribs/Nsubjettiness/AxesFinder.$(ObjSuf) \
    12811264        tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf) \
    1282         tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
     1265        tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf) \
     1266        tmp/external/fastjet/contribs/Nsubjettiness/NjettinessDefinition.$(ObjSuf) \
     1267        tmp/external/fastjet/contribs/Nsubjettiness/MeasureFunction.$(ObjSuf) \
     1268        tmp/external/Hector/H_OpticalElement.$(ObjSuf) \
    12831269        tmp/external/Hector/H_CircularAperture.$(ObjSuf) \
    1284         tmp/external/Hector/H_Quadrupole.$(ObjSuf) \
     1270        tmp/external/Hector/H_TransportMatrices.$(ObjSuf) \
     1271        tmp/external/Hector/H_SectorDipole.$(ObjSuf) \
    12851272        tmp/external/Hector/H_Dipole.$(ObjSuf) \
    1286         tmp/external/Hector/H_OpticalElement.$(ObjSuf) \
     1273        tmp/external/Hector/H_AbstractBeamLine.$(ObjSuf) \
     1274        tmp/external/Hector/H_BeamLine.$(ObjSuf) \
     1275        tmp/external/Hector/H_RectEllipticAperture.$(ObjSuf) \
     1276        tmp/external/Hector/H_HorizontalKicker.$(ObjSuf) \
     1277        tmp/external/Hector/H_Kicker.$(ObjSuf) \
     1278        tmp/external/Hector/H_BeamLineParser.$(ObjSuf) \
     1279        tmp/external/Hector/H_BeamParticle.$(ObjSuf) \
     1280        tmp/external/Hector/H_RectangularDipole.$(ObjSuf) \
     1281        tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
     1282        tmp/external/Hector/H_Marker.$(ObjSuf) \
     1283        tmp/external/Hector/H_Beam.$(ObjSuf) \
     1284        tmp/external/Hector/H_EllipticAperture.$(ObjSuf) \
     1285        tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
    12871286        tmp/external/Hector/H_HorizontalQuadrupole.$(ObjSuf) \
    1288         tmp/external/Hector/H_Aperture.$(ObjSuf) \
     1287        tmp/external/Hector/H_Parameters.$(ObjSuf) \
    12891288        tmp/external/Hector/H_Drift.$(ObjSuf) \
    12901289        tmp/external/Hector/H_RomanPot.$(ObjSuf) \
    1291         tmp/external/Hector/H_HorizontalKicker.$(ObjSuf) \
    1292         tmp/external/Hector/H_Beam.$(ObjSuf) \
    12931290        tmp/external/Hector/H_RecRPObject.$(ObjSuf) \
    1294         tmp/external/Hector/H_BeamLineParser.$(ObjSuf) \
    1295         tmp/external/Hector/H_Parameters.$(ObjSuf) \
    12961291        tmp/external/Hector/H_RectangularCollimator.$(ObjSuf) \
    1297         tmp/external/Hector/H_Kicker.$(ObjSuf) \
    1298         tmp/external/Hector/H_AbstractBeamLine.$(ObjSuf) \
    1299         tmp/external/Hector/H_Marker.$(ObjSuf) \
    1300         tmp/external/Hector/H_TransportMatrices.$(ObjSuf) \
    1301         tmp/external/Hector/H_SectorDipole.$(ObjSuf) \
    1302         tmp/external/Hector/H_EllipticAperture.$(ObjSuf) \
    1303         tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
    1304         tmp/external/Hector/H_RectEllipticAperture.$(ObjSuf) \
    1305         tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
    1306         tmp/external/Hector/H_BeamLine.$(ObjSuf) \
    1307         tmp/external/Hector/H_BeamParticle.$(ObjSuf) \
     1292        tmp/external/Hector/H_Aperture.$(ObjSuf) \
    13081293        tmp/external/Hector/H_RectangularAperture.$(ObjSuf) \
    1309         tmp/external/Hector/H_RectangularDipole.$(ObjSuf)
     1294        tmp/external/Hector/H_Quadrupole.$(ObjSuf)
    13101295
    13111296ifeq ($(HAS_PYTHIA8),true)
     
    13201305        display/DelphesDisplay.$(SrcSuf) \
    13211306        display/DelphesDisplay.h
     1307tmp/display/DelphesPlotSummary.$(ObjSuf): \
     1308        display/DelphesPlotSummary.$(SrcSuf) \
     1309        display/DelphesPlotSummary.h
     1310tmp/display/DelphesBranchElement.$(ObjSuf): \
     1311        display/DelphesBranchElement.$(SrcSuf) \
     1312        display/DelphesBranchElement.h \
     1313        classes/DelphesClasses.h
     1314tmp/display/Delphes3DGeometry.$(ObjSuf): \
     1315        display/Delphes3DGeometry.$(SrcSuf) \
     1316        display/Delphes3DGeometry.h \
     1317        external/ExRootAnalysis/ExRootConfReader.h \
     1318        classes/DelphesClasses.h
     1319tmp/display/DelphesHtmlSummary.$(ObjSuf): \
     1320        display/DelphesHtmlSummary.$(SrcSuf) \
     1321        display/DelphesHtmlSummary.h
     1322tmp/display/DelphesEventDisplay.$(ObjSuf): \
     1323        display/DelphesEventDisplay.$(SrcSuf) \
     1324        external/ExRootAnalysis/ExRootConfReader.h \
     1325        external/ExRootAnalysis/ExRootTreeReader.h \
     1326        display/DelphesCaloData.h \
     1327        display/DelphesBranchElement.h \
     1328        display/Delphes3DGeometry.h \
     1329        display/DelphesEventDisplay.h \
     1330        classes/DelphesClasses.h
    13221331DISPLAY_OBJ +=  \
    13231332        tmp/display/DelphesCaloData.$(ObjSuf) \
    1324         tmp/display/DelphesDisplay.$(ObjSuf)
     1333        tmp/display/DelphesDisplay.$(ObjSuf) \
     1334        tmp/display/DelphesPlotSummary.$(ObjSuf) \
     1335        tmp/display/DelphesBranchElement.$(ObjSuf) \
     1336        tmp/display/Delphes3DGeometry.$(ObjSuf) \
     1337        tmp/display/DelphesHtmlSummary.$(ObjSuf) \
     1338        tmp/display/DelphesEventDisplay.$(ObjSuf)
    13251339
    13261340ifeq ($(HAS_PYTHIA8),true)
     
    13291343endif
    13301344
     1345tmp/external/tcl/tclListObj.$(ObjSuf): \
     1346        external/tcl/tclListObj.c
     1347tmp/external/tcl/tclHash.$(ObjSuf): \
     1348        external/tcl/tclHash.c
     1349tmp/external/tcl/tclResolve.$(ObjSuf): \
     1350        external/tcl/tclResolve.c
    13311351tmp/external/tcl/tclHistory.$(ObjSuf): \
    13321352        external/tcl/tclHistory.c
    1333 tmp/external/tcl/tclResolve.$(ObjSuf): \
    1334         external/tcl/tclResolve.c
    1335 tmp/external/tcl/tclListObj.$(ObjSuf): \
    1336         external/tcl/tclListObj.c
     1353tmp/external/tcl/tclCompExpr.$(ObjSuf): \
     1354        external/tcl/tclCompExpr.c
    13371355tmp/external/tcl/tclAsync.$(ObjSuf): \
    13381356        external/tcl/tclAsync.c
     1357tmp/external/tcl/tclNamesp.$(ObjSuf): \
     1358        external/tcl/tclNamesp.c
     1359tmp/external/tcl/tclVar.$(ObjSuf): \
     1360        external/tcl/tclVar.c
     1361tmp/external/tcl/tclPreserve.$(ObjSuf): \
     1362        external/tcl/tclPreserve.c
     1363tmp/external/tcl/tclGet.$(ObjSuf): \
     1364        external/tcl/tclGet.c
    13391365tmp/external/tcl/tclStringObj.$(ObjSuf): \
    13401366        external/tcl/tclStringObj.c
    1341 tmp/external/tcl/tclHash.$(ObjSuf): \
    1342         external/tcl/tclHash.c
    1343 tmp/external/tcl/tclCompExpr.$(ObjSuf): \
    1344         external/tcl/tclCompExpr.c
    1345 tmp/external/tcl/tclVar.$(ObjSuf): \
    1346         external/tcl/tclVar.c
    1347 tmp/external/tcl/tclGet.$(ObjSuf): \
    1348         external/tcl/tclGet.c
     1367tmp/external/tcl/tclBasic.$(ObjSuf): \
     1368        external/tcl/tclBasic.c
    13491369tmp/external/tcl/tclUtil.$(ObjSuf): \
    13501370        external/tcl/tclUtil.c
     1371tmp/external/tcl/tclObj.$(ObjSuf): \
     1372        external/tcl/tclObj.c
    13511373tmp/external/tcl/tclPosixStr.$(ObjSuf): \
    13521374        external/tcl/tclPosixStr.c
     1375tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
     1376        external/tcl/tclCmdMZ.c
     1377tmp/external/tcl/tclIndexObj.$(ObjSuf): \
     1378        external/tcl/tclIndexObj.c
     1379tmp/external/tcl/tclCmdIL.$(ObjSuf): \
     1380        external/tcl/tclCmdIL.c
     1381tmp/external/tcl/tclCmdAH.$(ObjSuf): \
     1382        external/tcl/tclCmdAH.c
     1383tmp/external/tcl/tclLink.$(ObjSuf): \
     1384        external/tcl/tclLink.c
     1385tmp/external/tcl/tclProc.$(ObjSuf): \
     1386        external/tcl/tclProc.c
     1387tmp/external/tcl/tclCkalloc.$(ObjSuf): \
     1388        external/tcl/tclCkalloc.c
     1389tmp/external/tcl/tclAlloc.$(ObjSuf): \
     1390        external/tcl/tclAlloc.c
     1391tmp/external/tcl/tclCompile.$(ObjSuf): \
     1392        external/tcl/tclCompile.c
    13531393tmp/external/tcl/panic.$(ObjSuf): \
    13541394        external/tcl/panic.c
    1355 tmp/external/tcl/tclPreserve.$(ObjSuf): \
    1356         external/tcl/tclPreserve.c
    1357 tmp/external/tcl/tclBasic.$(ObjSuf): \
    1358         external/tcl/tclBasic.c
    1359 tmp/external/tcl/tclObj.$(ObjSuf): \
    1360         external/tcl/tclObj.c
    1361 tmp/external/tcl/tclNamesp.$(ObjSuf): \
    1362         external/tcl/tclNamesp.c
    1363 tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
    1364         external/tcl/tclCmdMZ.c
    1365 tmp/external/tcl/tclCmdIL.$(ObjSuf): \
    1366         external/tcl/tclCmdIL.c
    1367 tmp/external/tcl/tclIndexObj.$(ObjSuf): \
    1368         external/tcl/tclIndexObj.c
    1369 tmp/external/tcl/tclCmdAH.$(ObjSuf): \
    1370         external/tcl/tclCmdAH.c
    1371 tmp/external/tcl/tclCkalloc.$(ObjSuf): \
    1372         external/tcl/tclCkalloc.c
    1373 tmp/external/tcl/tclLink.$(ObjSuf): \
    1374         external/tcl/tclLink.c
    1375 tmp/external/tcl/tclAlloc.$(ObjSuf): \
    1376         external/tcl/tclAlloc.c
    1377 tmp/external/tcl/tclProc.$(ObjSuf): \
    1378         external/tcl/tclProc.c
     1395tmp/external/tcl/tclParse.$(ObjSuf): \
     1396        external/tcl/tclParse.c
    13791397tmp/external/tcl/tclExecute.$(ObjSuf): \
    13801398        external/tcl/tclExecute.c
    1381 tmp/external/tcl/tclParse.$(ObjSuf): \
    1382         external/tcl/tclParse.c
    1383 tmp/external/tcl/tclCompile.$(ObjSuf): \
    1384         external/tcl/tclCompile.c
    13851399TCL_OBJ +=  \
     1400        tmp/external/tcl/tclListObj.$(ObjSuf) \
     1401        tmp/external/tcl/tclHash.$(ObjSuf) \
     1402        tmp/external/tcl/tclResolve.$(ObjSuf) \
    13861403        tmp/external/tcl/tclHistory.$(ObjSuf) \
    1387         tmp/external/tcl/tclResolve.$(ObjSuf) \
    1388         tmp/external/tcl/tclListObj.$(ObjSuf) \
     1404        tmp/external/tcl/tclCompExpr.$(ObjSuf) \
    13891405        tmp/external/tcl/tclAsync.$(ObjSuf) \
     1406        tmp/external/tcl/tclNamesp.$(ObjSuf) \
     1407        tmp/external/tcl/tclVar.$(ObjSuf) \
     1408        tmp/external/tcl/tclPreserve.$(ObjSuf) \
     1409        tmp/external/tcl/tclGet.$(ObjSuf) \
    13901410        tmp/external/tcl/tclStringObj.$(ObjSuf) \
    1391         tmp/external/tcl/tclHash.$(ObjSuf) \
    1392         tmp/external/tcl/tclCompExpr.$(ObjSuf) \
    1393         tmp/external/tcl/tclVar.$(ObjSuf) \
    1394         tmp/external/tcl/tclGet.$(ObjSuf) \
     1411        tmp/external/tcl/tclBasic.$(ObjSuf) \
    13951412        tmp/external/tcl/tclUtil.$(ObjSuf) \
     1413        tmp/external/tcl/tclObj.$(ObjSuf) \
    13961414        tmp/external/tcl/tclPosixStr.$(ObjSuf) \
     1415        tmp/external/tcl/tclCmdMZ.$(ObjSuf) \
     1416        tmp/external/tcl/tclIndexObj.$(ObjSuf) \
     1417        tmp/external/tcl/tclCmdIL.$(ObjSuf) \
     1418        tmp/external/tcl/tclCmdAH.$(ObjSuf) \
     1419        tmp/external/tcl/tclLink.$(ObjSuf) \
     1420        tmp/external/tcl/tclProc.$(ObjSuf) \
     1421        tmp/external/tcl/tclCkalloc.$(ObjSuf) \
     1422        tmp/external/tcl/tclAlloc.$(ObjSuf) \
     1423        tmp/external/tcl/tclCompile.$(ObjSuf) \
    13971424        tmp/external/tcl/panic.$(ObjSuf) \
    1398         tmp/external/tcl/tclPreserve.$(ObjSuf) \
    1399         tmp/external/tcl/tclBasic.$(ObjSuf) \
    1400         tmp/external/tcl/tclObj.$(ObjSuf) \
    1401         tmp/external/tcl/tclNamesp.$(ObjSuf) \
    1402         tmp/external/tcl/tclCmdMZ.$(ObjSuf) \
    1403         tmp/external/tcl/tclCmdIL.$(ObjSuf) \
    1404         tmp/external/tcl/tclIndexObj.$(ObjSuf) \
    1405         tmp/external/tcl/tclCmdAH.$(ObjSuf) \
    1406         tmp/external/tcl/tclCkalloc.$(ObjSuf) \
    1407         tmp/external/tcl/tclLink.$(ObjSuf) \
    1408         tmp/external/tcl/tclAlloc.$(ObjSuf) \
    1409         tmp/external/tcl/tclProc.$(ObjSuf) \
    1410         tmp/external/tcl/tclExecute.$(ObjSuf) \
    14111425        tmp/external/tcl/tclParse.$(ObjSuf) \
    1412         tmp/external/tcl/tclCompile.$(ObjSuf)
     1426        tmp/external/tcl/tclExecute.$(ObjSuf)
    14131427
    14141428external/fastjet/internal/ClosestPair2D.hh: \
     
    14731487        @touch $@
    14741488
     1489modules/Isolation.h: \
     1490        classes/DelphesModule.h
     1491        @touch $@
     1492
     1493modules/EnergyScale.h: \
     1494        classes/DelphesModule.h
     1495        @touch $@
     1496
     1497modules/Merger.h: \
     1498        classes/DelphesModule.h
     1499        @touch $@
     1500
    14751501modules/ExampleModule.h: \
    1476         classes/DelphesModule.h
    1477         @touch $@
    1478 
    1479 modules/Isolation.h: \
    1480         classes/DelphesModule.h
    1481         @touch $@
    1482 
    1483 modules/EnergyScale.h: \
    1484         classes/DelphesModule.h
    1485         @touch $@
    1486 
    1487 modules/Merger.h: \
    14881502        classes/DelphesModule.h
    14891503        @touch $@
     
    15041518        @touch $@
    15051519
     1520external/fastjet/internal/LazyTiling25.hh: \
     1521        external/fastjet/internal/MinHeap.hh \
     1522        external/fastjet/ClusterSequence.hh \
     1523        external/fastjet/internal/LazyTiling9Alt.hh \
     1524        external/fastjet/internal/LazyTiling9.hh
     1525        @touch $@
     1526
    15061527external/fastjet/Error.hh: \
    15071528        external/fastjet/internal/base.hh \
    15081529        external/fastjet/config.h \
    15091530        external/fastjet/LimitedWarning.hh
    1510         @touch $@
    1511 
    1512 external/fastjet/internal/LazyTiling25.hh: \
    1513         external/fastjet/internal/MinHeap.hh \
    1514         external/fastjet/ClusterSequence.hh \
    1515         external/fastjet/internal/LazyTiling9Alt.hh \
    1516         external/fastjet/internal/LazyTiling9.hh
    15171531        @touch $@
    15181532
     
    15731587        @touch $@
    15741588
     1589display/DelphesBranchElement.h: \
     1590        display/DelphesCaloData.h
     1591        @touch $@
     1592
    15751593external/fastjet/internal/DynamicNearestNeighbours.hh: \
    15761594        external/fastjet/internal/numconsts.hh \
     
    16191637        @touch $@
    16201638
     1639display/DelphesEventDisplay.h: \
     1640        external/ExRootAnalysis/ExRootTreeReader.h \
     1641        display/DelphesDisplay.h \
     1642        display/Delphes3DGeometry.h \
     1643        display/DelphesHtmlSummary.h \
     1644        display/DelphesPlotSummary.h
     1645        @touch $@
     1646
    16211647modules/TauTagging.h: \
    16221648        classes/DelphesModule.h
     
    17091735        @touch $@
    17101736
     1737display/DelphesPlotSummary.h: \
     1738        external/ExRootAnalysis/ExRootTreeReader.h
     1739        @touch $@
     1740
    17111741modules/Weighter.h: \
    17121742        classes/DelphesModule.h
     
    17421772        @touch $@
    17431773
     1774external/fastjet/AreaDefinition.hh: \
     1775        external/fastjet/GhostedAreaSpec.hh
     1776        @touch $@
     1777
    17441778external/fastjet/internal/Dnn3piCylinder.hh: \
    17451779        external/fastjet/internal/DynamicNearestNeighbours.hh \
    17461780        external/fastjet/internal/DnnPlane.hh \
    17471781        external/fastjet/internal/numconsts.hh
    1748         @touch $@
    1749 
    1750 external/fastjet/AreaDefinition.hh: \
    1751         external/fastjet/GhostedAreaSpec.hh
    17521782        @touch $@
    17531783
  • README

    r01f457a re7e90df  
    137137or
    138138
    139    root -l examples/Example1.C\(\"delphes_output.root\"\)
     139   root -l examples/Example1.C'("delphes_output.root")'
  • README.md

    r01f457a re7e90df  
    1 delphes
    2 =======
     1Quick start with Delphes
     2========================
    33
    4 A framework for fast simulation of a generic collider experiment
     4Commands to get the code:
     5
     6```
     7wget http://cp3.irmp.ucl.ac.be/downloads/Delphes-3.1.2.tar.gz
     8
     9tar -zxf Delphes-3.1.2.tar.gz
     10```
     11
     12Commands to compile the code:
     13
     14```
     15cd Delphes-3.1.2
     16
     17make
     18```
     19
     20Finally, we can run Delphes:
     21
     22```
     23./DelphesHepMC
     24```
     25
     26Command line parameters:
     27
     28```
     29./DelphesHepMC config_file output_file [input_file(s)]
     30  config_file - configuration file in Tcl format
     31  output_file - output file in ROOT format,
     32  input_file(s) - input file(s) in HepMC format,
     33  with no input_file, or when input_file is -, read standard input.
     34```
     35
     36Let's simulate some Z->ee events:
     37
     38```
     39wget http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz
     40gunzip z_ee.hep.gz
     41./DelphesSTDHEP examples/delphes_card_CMS.tcl delphes_output.root z_ee.hep
     42```
     43
     44or
     45
     46```
     47curl -s http://cp3.irmp.ucl.ac.be/downloads/z_ee.hep.gz | gunzip | ./DelphesSTDHEP examples/delphes_card_CMS.tcl delphes_output.root
     48```
     49
     50For more detailed documentation, please visit
     51
     52https://cp3.irmp.ucl.ac.be/projects/delphes/wiki/WorkBook
     53
     54
     55Simple analysis using TTree::Draw
     56=================================
     57
     58Now we can start ROOT and look at the data stored in the output ROOT file.
     59
     60Start ROOT and load Delphes shared library:
     61
     62```
     63root -l
     64gSystem->Load("libDelphes");
     65```
     66
     67Open ROOT file and do some basic analysis using Draw or TBrowser:
     68
     69```
     70TFile::Open("delphes_output.root");
     71Delphes->Draw("Electron.PT");
     72TBrowser browser;
     73```
     74
     75Note 1: Delphes - tree name, it can be learned e.g. from TBrowser
     76
     77Note 2: Electron - branch name; PT - variable (leaf) of this branch
     78
     79Complete description of all branches can be found in
     80
     81doc/RootTreeDescription.html
     82
     83This information is also available at
     84
     85https://cp3.irmp.ucl.ac.be/projects/delphes/wiki/WorkBook/RootTreeDescription
     86
     87
     88Macro-based analysis
     89====================
     90
     91Analysis macro consists of histogram booking, event loop (histogram filling),
     92histogram display.
     93
     94Start ROOT and load Delphes shared library:
     95
     96```
     97root -l
     98gSystem->Load("libDelphes");
     99```
     100
     101Basic analysis macro:
     102
     103```
     104{
     105  // Create chain of root trees
     106  TChain chain("Delphes");
     107  chain.Add("delphes_output.root");
     108 
     109  // Create object of class ExRootTreeReader
     110  ExRootTreeReader *treeReader = new ExRootTreeReader(&chain);
     111  Long64_t numberOfEntries = treeReader->GetEntries();
     112 
     113  // Get pointers to branches used in this analysis
     114  TClonesArray *branchElectron = treeReader->UseBranch("Electron");
     115
     116  // Book histograms
     117  TH1 *histElectronPT = new TH1F("electron pt", "electron P_{T}", 50, 0.0, 100.0);
     118
     119  // Loop over all events
     120  for(Int_t entry = 0; entry < numberOfEntries; ++entry)
     121  {
     122
     123    // Load selected branches with data from specified event
     124    treeReader->ReadEntry(entry);
     125 
     126    // If event contains at least 1 electron
     127    if(branchElectron->GetEntries() > 0)
     128    {
     129      // Take first electron
     130      Electron *electron = (Electron*) branchElectron->At(0);
     131     
     132      // Plot electron transverse momentum
     133      histElectronPT->Fill(electron->PT);
     134     
     135      // Print electron transverse momentum
     136      cout << electron->PT << endl;
     137    }
     138
     139  }
     140
     141  // Show resulting histograms
     142  histElectronPT->Draw();
     143}
     144```
     145
     146
     147More advanced macro-based analysis
     148==================================
     149
     150The 'examples' directory contains ROOT macros Example1.C, Example2.C and Example3.C.
     151
     152Here are the commands to run these ROOT macros:
     153
     154```
     155root -l
     156.X examples/Example1.C("delphes_output.root");
     157```
     158
     159or
     160
     161```
     162root -l examples/Example1.C'("delphes_output.root")'
     163```
  • classes/DelphesFactory.h

    r01f457a re7e90df  
    6767  ExRootTreeBranch *fObjArrays; //!
    6868
     69#if !defined(__CINT__) && !defined(__CLING__)
    6970  std::map< const TClass*, ExRootTreeBranch* > fBranches; //!
     71#endif
     72
    7073  std::set< TObject* > fPool; //!
    7174 
  • classes/DelphesSTDHEPReader.cc

    r01f457a re7e90df  
    404404  u_int number;
    405405
    406   // version
    407   xdr_string(fInputXDR, &fBuffer, 100);
    408 
    409406  // Extracting the event weight
    410407  xdr_double(fInputXDR, &fWeight);
  • classes/SortableObject.h

    r01f457a re7e90df  
    4343public:
    4444  virtual ~CompBase() { }
    45   virtual Bool_t IsSortable(const TObject *obj) const { return kTRUE; }
     45  virtual Bool_t IsSortable(const TObject *) const { return kTRUE; }
    4646  virtual Int_t Compare(const TObject *obj1, const TObject *obj2) const = 0;
    4747};
  • display/DisplayLinkDef.h

    r01f457a re7e90df  
    3232#include "display/DelphesDisplay.h"
    3333#include "display/DelphesCaloData.h"
     34#include "display/DelphesBranchElement.h"
     35#include "display/Delphes3DGeometry.h"
     36#include "display/DelphesEventDisplay.h"
     37#include "display/DelphesHtmlSummary.h"
     38#include "display/DelphesPlotSummary.h"
    3439
    3540#ifdef __CINT__
     
    4146#pragma link C++ class DelphesDisplay+;
    4247#pragma link C++ class DelphesCaloData+;
     48#pragma link C++ class DelphesBranchElement<DelphesCaloData>-!;
     49#pragma link C++ class DelphesBranchElement<TEveElementList>-!;
     50#pragma link C++ class DelphesBranchElement<TEveTrackList>-!;
     51#pragma link C++ class Delphes3DGeometry;
     52#pragma link C++ class DelphesEventDisplay;
     53#pragma link C++ class DelphesHtmlObjTable;
     54#pragma link C++ class DelphesHtmlSummary;
     55#pragma link C++ class DelphesPlotSummary;
    4356
    4457#endif
  • doc/genMakefile.tcl

    r01f457a re7e90df  
    208208CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    209209DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
    210 DISPLAY_LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
     210DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
    211211
    212212ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
    213213HAS_CMSSW = true
    214214CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
    215 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
     215OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
    216216ifneq ($(CMSSW_RELEASE_BASE),)
    217217CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
    218218endif
    219219ifneq ($(LD_LIBRARY_PATH),)
    220 DELPHES_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
    221 endif
    222 DELPHES_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
     220OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
     221endif
     222OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
    223223endif
    224224
    225225ifneq ($(PROMC),)
    226226HAS_PROMC = true
    227 CXXFLAGS += -I$(PROMC)/include
    228 DELPHES_LIBS += -L$(PROMC)/lib -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
     227CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
     228OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
    229229endif
    230230
     
    232232HAS_PYTHIA8 = true
    233233CXXFLAGS += -I$(PYTHIA8)/include
    234 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
     234OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -lLHAPDF -lgfortran -lz
    235235else
    236236ifneq ($(PYTHIA8DATA),)
    237237HAS_PYTHIA8 = true
    238238CXXFLAGS += -I$(PYTHIA8DATA)/../include
    239 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
    240 endif
    241 endif
     239OPT_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -lLHAPDF -lgfortran -lz
     240endif
     241endif
     242
     243DELPHES_LIBS += $(OPT_LIBS)
     244DISPLAY_LIBS += $(OPT_LIBS)
    242245
    243246###
     
    268271puts {ifeq ($(HAS_PROMC),true)}
    269272executableDeps {readers/DelphesProMC.cpp}
    270 sourceDeps {DELPHES} {external/ProMC/*.cc}
    271273puts {endif}
    272274puts {}
  • examples/EventDisplay.C

    r01f457a re7e90df  
    1 /*
    2 root -l examples/EventDisplay.C\(\"examples/delphes_card_CMS.tcl\",\"delphes_output.root\"\)
    3 ShowEvent(1);
    4 ShowEvent(2);
    5 */
     1/* Example:
     2 * root -l 'EventDisplay.C("delphes_card_CMS.tcl","../delphes_output.root")'
     3 * root -l 'EventDisplay.C("delphes_card_FCC_basic.tcl","../delphes_output.root","ParticlePropagator","ChargedHadronTrackingEfficiency","MuonTrackingEfficiency","Ecal,Hcal")'
     4 */
    65
    7 //------------------------------------------------------------------------------
     6void EventDisplay(const char* configfile = "delphes_card_CMS.tcl", const char* datafile = "delphes_output.root",
     7                  const char* ParticlePropagator="ParticlePropagator",
     8                  const char* TrackingEfficiency="ChargedHadronTrackingEfficiency",
     9                  const char* MuonEfficiency="MuonEfficiency",
     10                  const char* Calorimeters="Calorimeter",
     11                  bool displayGeometryOnly = false)
     12{
     13   // load the libraries
     14   gSystem->Load("libGeom");
     15   gSystem->Load("libGuiHtml");
     16   gSystem->Load("../libDelphesDisplay");
    817
    9 // radius of the barrel, in m
    10 Double_t gRadius = 1.29;
     18   if(displayGeometryOnly) {
     19     // create the detector representation without transparency
     20     Delphes3DGeometry det3D_geom(new TGeoManager("delphes", "Delphes geometry"), false);
     21     det3D_geom.readFile(configfile, ParticlePropagator, TrackingEfficiency, MuonEfficiency, Calorimeters);
    1122
    12 // half-length of the barrel, in m
    13 Double_t gHalfLength = 3.0;
     23     // display
     24     det3D_geom.getDetector()->Draw("ogl");
    1425
    15 // magnetic field
    16 Double_t gBz = 3.8;
     26   } else {
    1727
    18 TAxis *gEtaAxis = 0;
    19 TAxis *gPhiAxis = 0;
     28     // create the detector representation
     29     Delphes3DGeometry det3D(new TGeoManager("delphes", "Delphes geometry"), true);
     30     det3D.readFile(configfile, ParticlePropagator, TrackingEfficiency, MuonEfficiency, Calorimeters);
    2031
    21 //------------------------------------------------------------------------------
     32     // create the application
     33     DelphesEventDisplay* display = new DelphesEventDisplay(configfile, datafile, det3D);
    2234
    23 #include <set>
    24 #include <vector>
    25 
    26 using namespace std;
    27 
    28 class ExRootTreeReader;
    29 class DelphesCaloData;
    30 class DelphesDisplay;
    31 
    32 TChain gChain("Delphes");
    33 
    34 ExRootTreeReader *gTreeReader = 0;
    35 
    36 TClonesArray *gBranchTower = 0;
    37 TClonesArray *gBranchTrack = 0;
    38 TClonesArray *gBranchJet = 0;
    39 
    40 DelphesCaloData *gCaloData = 0;
    41 TEveElementList *gJetList = 0;
    42 TEveTrackList *gTrackList = 0;
    43 
    44 DelphesDisplay *gDelphesDisplay = 0;
    45 
    46 //------------------------------------------------------------------------------
    47 
    48 void EventDisplay(const char *configFile, const char *inputFile)
    49 {
    50   gSystem->Load("libDelphesDisplay");
    51 
    52   TEveManager::Create(kTRUE, "IV");
    53 
    54   ExRootConfParam param, paramEtaBins;
    55   Long_t i, j, size, sizeEtaBins;
    56   set< Double_t > etaSet;
    57   set< Double_t >::iterator itEtaSet;
    58 
    59   Double_t *etaBins;
    60 
    61   ExRootConfReader *confReader = new ExRootConfReader;
    62   confReader->ReadFile(configFile);
    63 
    64   gRadius = confReader->GetDouble("ParticlePropagator::Radius", 1.0);
    65   gHalfLength = confReader->GetDouble("ParticlePropagator::HalfLength", 3.0);
    66   gBz = confReader->GetDouble("ParticlePropagator::Bz", 0.0);
    67 
    68   // read eta and phi bins
    69   param = confReader->GetParam("Calorimeter::EtaPhiBins");
    70   size = param.GetSize();
    71   etaSet.clear();
    72   for(i = 0; i < size/2; ++i)
    73   {
    74     paramEtaBins = param[i*2];
    75     sizeEtaBins = paramEtaBins.GetSize();
    76 
    77     for(j = 0; j < sizeEtaBins; ++j)
    78     {
    79       etaSet.insert(paramEtaBins[j].GetDouble());
    80     }
    81   }
    82 
    83   delete confReader;
    84 
    85   etaBins = new Double_t[etaSet.size()];
    86   i = 0;
    87 
    88   for(itEtaSet = etaSet.begin(); itEtaSet != etaSet.end(); ++itEtaSet)
    89   {
    90     etaBins[i] = *itEtaSet;
    91     ++i;
    92   }
    93 
    94   gEtaAxis = new TAxis(etaSet.size() - 1, etaBins);
    95   gPhiAxis = new TAxis(72, -TMath::Pi(), TMath::Pi());
    96 
    97   // Create chain of root trees
    98   gChain.Add(inputFile);
    99 
    100   // Create object of class ExRootTreeReader
    101   gTreeReader = new ExRootTreeReader(&gChain);
    102 
    103   // Get pointers to branches
    104   gBranchTower = gTreeReader->UseBranch("Tower");
    105   gBranchTrack = gTreeReader->UseBranch("Track");
    106   gBranchJet = gTreeReader->UseBranch("Jet");
    107 
    108   // data
    109   gCaloData = new DelphesCaloData(2);
    110   gCaloData->RefSliceInfo(0).Setup("ECAL", 0.1, kRed);
    111   gCaloData->RefSliceInfo(1).Setup("HCAL", 0.1, kBlue);
    112   gCaloData->SetEtaBins(gEtaAxis);
    113   gCaloData->SetPhiBins(gPhiAxis);
    114   gCaloData->IncDenyDestroy();
    115 
    116   gJetList = new TEveElementList("Jets");
    117   gEve->AddElement(gJetList);
    118 
    119   gTrackList = new TEveTrackList("Tracks");
    120   gTrackList->SetMainColor(kBlue);
    121   gTrackList->SetMarkerColor(kRed);
    122   gTrackList->SetMarkerStyle(kCircle);
    123   gTrackList->SetMarkerSize(0.5);
    124   gEve->AddElement(gTrackList);
    125 
    126   TEveTrackPropagator *trkProp = gTrackList->GetPropagator();
    127   trkProp->SetMagField(0.0, 0.0, -gBz);
    128   trkProp->SetMaxR(gRadius*100.0);
    129   trkProp->SetMaxZ(gHalfLength*100.0);
    130 
    131   // viewers and scenes
    132 
    133   TEveElementList *geometry = new TEveElementList("Geometry");
    134 
    135   TEveGeoShape *barell = new TEveGeoShape("Barell");
    136   barell->SetShape(new TGeoTube(gRadius*100.0 - 1, gRadius*100.0, gHalfLength*100.0));
    137   barell->SetMainColor(kCyan);
    138   barell->SetMainTransparency(80);
    139   geometry->AddElement(barell);
    140 
    141   TEveCalo3D *calo = new TEveCalo3D(gCaloData);
    142   calo->SetBarrelRadius(gRadius*100.0);
    143   calo->SetEndCapPos(gHalfLength*100.0);
    144 
    145   gStyle->SetPalette(1, 0);
    146   TEveCaloLego *lego = new TEveCaloLego(gCaloData);
    147   lego->InitMainTrans();
    148   lego->RefMainTrans().SetScale(TMath::TwoPi(), TMath::TwoPi(), TMath::Pi());
    149   lego->SetAutoRebin(kFALSE);
    150   lego->Set2DMode(TEveCaloLego::kValSizeOutline);
    151 
    152   gDelphesDisplay = new DelphesDisplay;
    153 
    154   gEve->AddGlobalElement(geometry);
    155   gEve->AddGlobalElement(calo);
    156 
    157   gDelphesDisplay->ImportGeomRPhi(geometry);
    158   gDelphesDisplay->ImportCaloRPhi(calo);
    159 
    160   gDelphesDisplay->ImportGeomRhoZ(geometry);
    161   gDelphesDisplay->ImportCaloRhoZ(calo);
    162 
    163   gDelphesDisplay->ImportCaloLego(lego);
    164 
    165   gEve->Redraw3D(kTRUE);
     35   }
    16636}
    16737
    168 //------------------------------------------------------------------------------
    169 
    170 void ShowEvent(Long64_t event)
    171 {
    172   TIter itTower(gBranchTower);
    173   TIter itTrack(gBranchTrack);
    174   TIter itJet(gBranchJet);
    175 
    176   Tower *tower;
    177   Track *track;
    178   Jet *jet;
    179 
    180   TEveJetCone *eveJetCone;
    181   TEveTrack *eveTrack;
    182 
    183   Int_t counter;
    184 
    185   TEveElement *currentEvent = gEve->GetCurrentEvent();
    186 
    187   TEveTrackPropagator *trkProp = gTrackList->GetPropagator();
    188 
    189   if(event >= gTreeReader->GetEntries()) return;
    190 
    191   // Load selected branches with data from specified event
    192   gTreeReader->ReadEntry(event);
    193 
    194   gCaloData->ClearTowers();
    195   gJetList->DestroyElements();
    196   gTrackList->DestroyElements();
    197 
    198   // Loop over all towers
    199   itTower.Reset();
    200   while((tower = (Tower *) itTower.Next()))
    201   {
    202     gCaloData->AddTower(tower->Edges[0], tower->Edges[1], tower->Edges[2], tower->Edges[3]);
    203     gCaloData->FillSlice(0, tower->Eem);
    204     gCaloData->FillSlice(1, tower->Ehad);
    205   }
    206   gCaloData->DataChanged();
    207 
    208   // Loop over all tracks
    209   itTrack.Reset();
    210   counter = 0;
    211   while((track = (Track *) itTrack.Next()))
    212   {
    213     TParticle pb(track->PID, 1, 0, 0, 0, 0,
    214                  track->P4().Px(), track->P4().Py(),
    215                  track->P4().Pz(), track->P4().E(),
    216                  track->X, track->Y, track->Z, 0.0);
    217 
    218     eveTrack = new TEveTrack(&pb, counter, trkProp);
    219     eveTrack->SetName(Form("%s [%d]", pb.GetName(), counter++));
    220     eveTrack->SetStdTitle();
    221     eveTrack->SetAttLineAttMarker(gTrackList);
    222 
    223     switch(TMath::Abs(track->PID))
    224     {
    225       case 11:
    226         eveTrack->SetLineColor(kRed);
    227         break;
    228       case 13:
    229         eveTrack->SetLineColor(kGreen);
    230         break;
    231       default:
    232         eveTrack->SetLineColor(kBlue);
    233     }
    234     gTrackList->AddElement(eveTrack);
    235     eveTrack->MakeTrack();
    236   }
    237 
    238   // Loop over all jets
    239   itJet.Reset();
    240   counter = 0;
    241   while((jet = (Jet *) itJet.Next()))
    242   {
    243     eveJetCone = new TEveJetCone();
    244     eveJetCone->SetName(Form("jet [%d]", counter++));
    245     eveJetCone->SetMainTransparency(60);
    246     eveJetCone->SetLineColor(kYellow);
    247     eveJetCone->SetCylinder(gRadius*100.0 - 10, gHalfLength*100.0 - 10);
    248     eveJetCone->SetPickable(kTRUE);
    249     eveJetCone->AddEllipticCone(jet->Eta, jet->Phi, jet->DeltaEta, jet->DeltaPhi);
    250     gJetList->AddElement(eveJetCone);
    251   }
    252 
    253   gDelphesDisplay->DestroyEventRPhi();
    254   gDelphesDisplay->ImportEventRPhi(currentEvent);
    255 
    256   gDelphesDisplay->DestroyEventRhoZ();
    257   gDelphesDisplay->ImportEventRhoZ(currentEvent);
    258 
    259   gEve->Redraw3D(kTRUE);
    260 }
  • examples/Example1.C

    r01f457a re7e90df  
    11/*
    2 
    32Simple macro showing how to access branches from the delphes output root file,
    43loop over events, and plot simple quantities such as the jet pt and the di-electron invariant
    54mass.
    65
    7 root -l examples/Example1.C\(\"delphes_output.root\"\)
     6root -l examples/Example1.C'("delphes_output.root")'
    87*/
    98
     
    6766  histMass->Draw();
    6867}
     68
  • examples/Example2.C

    r01f457a re7e90df  
    11/*
    2 
    32Simple macro showing how to access branches from the delphes output root file,
    43loop over events, store histograms in a root file and print them as image files. 
    54
    6 root -l examples/Example2.C\(\"delphes_output.root\"\)
     5root -l examples/Example2.C'("delphes_output.root")'
    76*/
    87
  • examples/Example3.C

    r01f457a re7e90df  
    11/*
    2 
    32This macro shows how to access the particle-level reference for reconstructed objects.
    43It is also shown how to loop over the jet constituents.
    54
    6 root -l examples/Example3.C\(\"delphes_output.root\"\)
     5root -l examples/Example3.C'("delphes_output.root")'
    76*/
    87
  • examples/MemoryUsage.C

    r01f457a re7e90df  
    11/*
    2 root -l examples/MemoryUsage.C\(\"ps_output.txt\"\)
     2root -l examples/MemoryUsage.C'("ps_output.txt")'
    33*/
    44
  • examples/ProcessingTime.C

    r01f457a re7e90df  
    11/*
    2 root -l examples/ProcessingTime.C\(\"delphes_output.root\"\)
     2root -l examples/ProcessingTime.C'("delphes_output.root")'
    33*/
    44
  • modules/ParticlePropagator.cc

    r01f457a re7e90df  
    158158    if(TMath::Abs(q) < 1.0E-9 || TMath::Abs(fBz) < 1.0E-9)
    159159    {
    160       // solve pt2*t^2 + 2*(px*x + py*y)*t + (fRadius2 - x*x - y*y) = 0
     160      // solve pt2*t^2 + 2*(px*x + py*y)*t - (fRadius2 - x*x - y*y) = 0
    161161      tmp = px*y - py*x;
    162162      discr2 = pt2*fRadius2 - tmp*tmp;
  • modules/PileUpMergerPythia8.cc

    r01f457a re7e90df  
    132132    dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
    133133
    134     for(i = 0; i < fPythia->event.size(); ++i)
     134    for(i = 1; i < fPythia->event.size(); ++i)
    135135    {
    136136      Pythia8::Particle &particle = fPythia->event[i];
  • readers/DelphesProMC.cpp

    r01f457a re7e90df  
    4747#include "ExRootAnalysis/ExRootProgressBar.h"
    4848
    49 #include "ProMC/ProMC.pb.h"
    50 #include "ProMC/ProMCBook.h"
    51 #include "ProMC/ProMCHeader.pb.h"
     49#include "ProMC.pb.h"
     50#include "ProMCBook.h"
     51#include "ProMCHeader.pb.h"
    5252
    5353using namespace std;
     
    5555//---------------------------------------------------------------------------
    5656
    57 void ConvertInput(ProMCEvent &event, ExRootTreeBranch *branch, DelphesFactory *factory,
    58   TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray,
    59   TStopwatch *readStopWatch, TStopwatch *procStopWatch)
     57void ConvertInput(ProMCEvent &event, double momentumUnit, double positionUnit,
     58  ExRootTreeBranch *branch, DelphesFactory *factory,
     59  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
     60  TObjArray *partonOutputArray, TStopwatch *readStopWatch, TStopwatch *procStopWatch)
    6061{
    6162  Int_t i;
     
    107108    pid = mutableParticles->pdg_id(i);
    108109    status = mutableParticles->status(i);
    109     px = mutableParticles->px(i); py = mutableParticles->py(i); pz = mutableParticles->pz(i); mass = mutableParticles->mass(i);
    110     x = mutableParticles->x(i); y = mutableParticles->y(i); z = mutableParticles->z(i); t = mutableParticles->t(i);
     110
     111    px = mutableParticles->px(i)/momentumUnit;
     112    py = mutableParticles->py(i)/momentumUnit;
     113    pz = mutableParticles->pz(i)/momentumUnit;
     114    mass = mutableParticles->mass(i)/momentumUnit;
     115    x = mutableParticles->x(i)/positionUnit;
     116    y = mutableParticles->y(i)/positionUnit;
     117    z = mutableParticles->z(i)/positionUnit;
     118    t = mutableParticles->t(i)/positionUnit;
    111119
    112120    candidate = factory->NewCandidate();
     
    172180  Int_t i;
    173181  Long64_t eventCounter, numberOfEvents;
     182  double momentumUnit = 1.0, positionUnit = 1.0;
    174183
    175184  if(argc < 4)
     
    224233      inputFile = new ProMCBook(argv[i], "r");
    225234
     235      ProMCHeader header = inputFile->getHeader();
     236
     237      momentumUnit = static_cast<double>(header.momentumunit());
     238      positionUnit = static_cast<double>(header.lengthunit());
     239
     240
     241
    226242      if(inputFile == NULL)
    227243      {
     
    248264
    249265        procStopWatch.Start();
    250         ConvertInput(event, branchEvent, factory,
    251           allParticleOutputArray, stableParticleOutputArray, partonOutputArray,
    252           &readStopWatch, &procStopWatch);
     266        ConvertInput(event, momentumUnit, positionUnit,
     267          branchEvent, factory,
     268          allParticleOutputArray, stableParticleOutputArray,
     269          partonOutputArray, &readStopWatch, &procStopWatch);
    253270        modularDelphes->ProcessTask();
    254271        procStopWatch.Stop();
  • readers/DelphesProMC.py

    r01f457a re7e90df  
    134134################################################################################
    135135
    136 if len(sys.argv) < 2:
     136if len(sys.argv) < 4:
    137137  print " Usage: DelphesProMC.py config_file output_file input_file(s)"
    138138  sys.exit(1)
  • readers/DelphesPythia8.cpp

    r01f457a re7e90df  
    8989  pdg = TDatabasePDG::Instance();
    9090
    91   for(i = 0; i < pythia->event.size(); ++i)
     91  for(i = 1; i < pythia->event.size(); ++i)
    9292  {
    9393    Pythia8::Particle &particle = pythia->event[i];
Note: See TracChangeset for help on using the changeset viewer.