Index: Makefile
===================================================================
--- Makefile	(revision 4564cba9fa0180ca6c293da8cea545291a6d0116)
+++ Makefile	(revision d7d2da362406b9e37fdf238970417c94779b54b0)
@@ -10,84 +10,19 @@
 include doc/Makefile.arch
 
-ROOT_MAJOR := $(shell $(RC) --version | cut -d'.' -f1)
+ifeq ($(ARCH),macosx64)
+UNDEFOPT = dynamic_lookup
+endif
 
 SrcSuf = cc
-PcmSuf = _rdict.pcm
 
 CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
-DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
-DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml $(SYSLIBS)
-
-ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
-HAS_CMSSW = true
-CXXFLAGS += -std=c++0x -I$(subst :, -I,$(CMSSW_FWLITE_INCLUDE_PATH))
-OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(CMSSW_FWLITE_INCLUDE_PATH)))
-ifneq ($(CMSSW_RELEASE_BASE),)
-CXXFLAGS += -I$(CMSSW_RELEASE_BASE)/src
-endif
-ifneq ($(LD_LIBRARY_PATH),)
-OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
-endif
-OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsCommon -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
-endif
-
-# check consistency
-ifneq ($(PROMC),)
-ifneq ($(PROIO),)
-$(error Attention:  PROMC and PROIO env. variables are set simultaneously. You cannot compile ProMC and ProIO readers in one compilation process due to an inconsistency in protocol buffers libraries. The suggestion is to compile these two readers in two steps. First unset PROIO variable and then \"configure; make\". After this, unset PROMC, set PROIO,  and run \"configure; make\". During runs, make sure shared libraries are set correctly.)
-endif
-endif
-
-ifneq ($(PROMC),)
-HAS_PROMC = true
-$(info ProMC event reader is requested)
-CXXFLAGS += -I$(PROMC)/include -I$(PROMC)/src
-OPT_LIBS += -L$(PROMC)/lib -lpromc -lprotoc -lprotobuf -lprotobuf-lite -lcbook -lz
-endif
-
-ifneq ($(PROIO),)
-HAS_PROIO = true
-$(info ProIO reader is requested)
-ifeq ($(PROTOBUF),)
-$(error but PROTOBUF variable is not set.)
-endif
-PROTOBUF_FILE=$(PROTOBUF)/lib/libprotobuf.a
-ifeq ("$(wildcard $(PROTOBUF_FILE))","")
-$(error PROTOBUF variable is set, but it does not point to valid $(PROTOBUF_FILE))
-endif
-ifeq ($(LZ4),)
-$(error but LZ4 variable is not set.)
-endif
-LZ4_FILE=$(LZ4)/lib/liblz4.so
-ifeq ("$(wildcard $(LZ4_FILE))","")
-$(error LZ4 variable is set,  but it does not point to valid $(LZ4_FILE))
-endif
-CXXFLAGS += -I$(PROIO)/include -I$(PROTOBUF)/include -I$(LZ4)/include -I$(PROIO)/src
-OPT_LIBS += -L$(PROTOBUF)/lib -lprotobuf -L$(PROIO)/lib -lproio -lproio.pb -lz -L$(LZ4)/lib -llz4
-endif
-
-ifeq ($(HAS_PYTHIA8),true)
-ifneq ($(PYTHIA8),)
-CXXFLAGS += -I$(PYTHIA8)/include
-CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
-OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl -lz
-endif
-endif
-
-DELPHES_LIBS += $(OPT_LIBS)
-DISPLAY_LIBS += $(OPT_LIBS)
+LIBS = $(shell $(RC) --evelibs) $(SYSLIBS)
 
 ###
 
-NOFASTJET = libDelphesNoFastJet.$(DllSuf)
-NOFASTJETLIB = libDelphesNoFastJet.lib
-
-DELPHES = libDelphes.$(DllSuf)
-DELPHESLIB = libDelphes.lib
-
-DISPLAY = libDelphesDisplay.$(DllSuf)
-DISPLAYLIB = libDelphesDisplay.lib
-
-VERSION = x.y.z
+SHARED = libDelphes.$(DllSuf)
+SHAREDLIB = libDelphes.lib
+
+VERSION = $(shell cat VERSION)
 DISTDIR = Delphes-$(VERSION)
 DISTTAR = $(DISTDIR).tar.gz
@@ -96,4 +31,81 @@
 
 
+DelphesLHEF$(ExeSuf): \
+	tmp/readers/DelphesLHEF.$(ObjSuf)
+
+tmp/readers/DelphesLHEF.$(ObjSuf): \
+	readers/DelphesLHEF.cpp \
+	modules/Delphes.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesLHEFReader.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
+DelphesHepMC$(ExeSuf): \
+	tmp/readers/DelphesHepMC.$(ObjSuf)
+
+tmp/readers/DelphesHepMC.$(ObjSuf): \
+	readers/DelphesHepMC.cpp \
+	modules/Delphes.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesHepMCReader.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
+DelphesSTDHEP$(ExeSuf): \
+	tmp/readers/DelphesSTDHEP.$(ObjSuf)
+
+tmp/readers/DelphesSTDHEP.$(ObjSuf): \
+	readers/DelphesSTDHEP.cpp \
+	modules/Delphes.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesSTDHEPReader.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
+lhco2root$(ExeSuf): \
+	tmp/converters/lhco2root.$(ObjSuf)
+
+tmp/converters/lhco2root.$(ObjSuf): \
+	converters/lhco2root.cpp \
+	modules/Delphes.h \
+	classes/DelphesStream.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
+root2pileup$(ExeSuf): \
+	tmp/converters/root2pileup.$(ObjSuf)
+
+tmp/converters/root2pileup.$(ObjSuf): \
+	converters/root2pileup.cpp \
+	classes/DelphesClasses.h \
+	classes/DelphesPileUpWriter.h \
+	external/ExRootAnalysis/ExRootTreeReader.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
+root2lhco$(ExeSuf): \
+	tmp/converters/root2lhco.$(ObjSuf)
+
+tmp/converters/root2lhco.$(ObjSuf): \
+	converters/root2lhco.cpp \
+	classes/DelphesClasses.h \
+	external/ExRootAnalysis/ExRootTreeReader.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
+stdhep2pileup$(ExeSuf): \
+	tmp/converters/stdhep2pileup.$(ObjSuf)
+
+tmp/converters/stdhep2pileup.$(ObjSuf): \
+	converters/stdhep2pileup.cpp \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesSTDHEPReader.h \
+	classes/DelphesPileUpWriter.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootProgressBar.h
 hepmc2pileup$(ExeSuf): \
 	tmp/converters/hepmc2pileup.$(ObjSuf)
@@ -103,21 +115,9 @@
 	classes/DelphesClasses.h \
 	classes/DelphesFactory.h \
-	classes/DelphesHepMC2Reader.h \
+	classes/DelphesHepMCReader.h \
 	classes/DelphesPileUpWriter.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
 	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-lhco2root$(ExeSuf): \
-	tmp/converters/lhco2root.$(ObjSuf)
-
-tmp/converters/lhco2root.$(ObjSuf): \
-	converters/lhco2root.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesStream.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
+	external/ExRootAnalysis/ExRootProgressBar.h
 pileup2root$(ExeSuf): \
 	tmp/converters/pileup2root.$(ObjSuf)
@@ -125,263 +125,32 @@
 tmp/converters/pileup2root.$(ObjSuf): \
 	converters/pileup2root.cpp \
+	classes/DelphesStream.h \
 	classes/DelphesClasses.h \
 	classes/DelphesFactory.h \
 	classes/DelphesPileUpReader.h \
-	classes/DelphesStream.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
 	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-root2lhco$(ExeSuf): \
-	tmp/converters/root2lhco.$(ObjSuf)
-
-tmp/converters/root2lhco.$(ObjSuf): \
-	converters/root2lhco.cpp \
-	classes/DelphesClasses.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeReader.h
-root2pileup$(ExeSuf): \
-	tmp/converters/root2pileup.$(ObjSuf)
-
-tmp/converters/root2pileup.$(ObjSuf): \
-	converters/root2pileup.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesPileUpWriter.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeReader.h
-stdhep2pileup$(ExeSuf): \
-	tmp/converters/stdhep2pileup.$(ObjSuf)
-
-tmp/converters/stdhep2pileup.$(ObjSuf): \
-	converters/stdhep2pileup.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesPileUpWriter.h \
-	classes/DelphesSTDHEPReader.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-CaloGrid$(ExeSuf): \
-	tmp/examples/CaloGrid.$(ObjSuf)
-
-tmp/examples/CaloGrid.$(ObjSuf): \
-	examples/CaloGrid.cpp \
-	external/ExRootAnalysis/ExRootConfReader.h \
-	classes/DelphesClasses.h \
-	display/Delphes3DGeometry.h
-Example1$(ExeSuf): \
-	tmp/examples/Example1.$(ObjSuf)
-
-tmp/examples/Example1.$(ObjSuf): \
-	examples/Example1.cpp \
-	classes/DelphesClasses.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeReader.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h \
-	external/ExRootAnalysis/ExRootUtilities.h
-DelphesValidation$(ExeSuf): \
-	tmp/validation/DelphesValidation.$(ObjSuf)
-
-tmp/validation/DelphesValidation.$(ObjSuf): \
-	validation/DelphesValidation.cpp \
-	classes/DelphesClasses.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeReader.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h \
-	external/ExRootAnalysis/ExRootUtilities.h
-EXECUTABLE +=  \
+	external/ExRootAnalysis/ExRootProgressBar.h
+EXECUTABLE =  \
+	DelphesLHEF$(ExeSuf) \
+	DelphesHepMC$(ExeSuf) \
+	DelphesSTDHEP$(ExeSuf) \
+	lhco2root$(ExeSuf) \
+	root2pileup$(ExeSuf) \
+	root2lhco$(ExeSuf) \
+	stdhep2pileup$(ExeSuf) \
 	hepmc2pileup$(ExeSuf) \
-	lhco2root$(ExeSuf) \
-	pileup2root$(ExeSuf) \
-	root2lhco$(ExeSuf) \
-	root2pileup$(ExeSuf) \
-	stdhep2pileup$(ExeSuf) \
-	CaloGrid$(ExeSuf) \
-	Example1$(ExeSuf) \
-	DelphesValidation$(ExeSuf)
-
-EXECUTABLE_OBJ +=  \
+	pileup2root$(ExeSuf)
+
+EXECUTABLE_OBJ =  \
+	tmp/readers/DelphesLHEF.$(ObjSuf) \
+	tmp/readers/DelphesHepMC.$(ObjSuf) \
+	tmp/readers/DelphesSTDHEP.$(ObjSuf) \
+	tmp/converters/lhco2root.$(ObjSuf) \
+	tmp/converters/root2pileup.$(ObjSuf) \
+	tmp/converters/root2lhco.$(ObjSuf) \
+	tmp/converters/stdhep2pileup.$(ObjSuf) \
 	tmp/converters/hepmc2pileup.$(ObjSuf) \
-	tmp/converters/lhco2root.$(ObjSuf) \
-	tmp/converters/pileup2root.$(ObjSuf) \
-	tmp/converters/root2lhco.$(ObjSuf) \
-	tmp/converters/root2pileup.$(ObjSuf) \
-	tmp/converters/stdhep2pileup.$(ObjSuf) \
-	tmp/examples/CaloGrid.$(ObjSuf) \
-	tmp/examples/Example1.$(ObjSuf) \
-	tmp/validation/DelphesValidation.$(ObjSuf)
-
-DelphesHepMC2$(ExeSuf): \
-	tmp/readers/DelphesHepMC2.$(ObjSuf)
-
-tmp/readers/DelphesHepMC2.$(ObjSuf): \
-	readers/DelphesHepMC2.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesHepMC2Reader.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-DelphesHepMC3$(ExeSuf): \
-	tmp/readers/DelphesHepMC3.$(ObjSuf)
-
-tmp/readers/DelphesHepMC3.$(ObjSuf): \
-	readers/DelphesHepMC3.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesHepMC3Reader.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-DelphesLHEF$(ExeSuf): \
-	tmp/readers/DelphesLHEF.$(ObjSuf)
-
-tmp/readers/DelphesLHEF.$(ObjSuf): \
-	readers/DelphesLHEF.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesLHEFReader.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-DelphesROOT$(ExeSuf): \
-	tmp/readers/DelphesROOT.$(ObjSuf)
-
-tmp/readers/DelphesROOT.$(ObjSuf): \
-	readers/DelphesROOT.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesStream.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeReader.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-DelphesSTDHEP$(ExeSuf): \
-	tmp/readers/DelphesSTDHEP.$(ObjSuf)
-
-tmp/readers/DelphesSTDHEP.$(ObjSuf): \
-	readers/DelphesSTDHEP.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesSTDHEPReader.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-EXECUTABLE +=  \
-	DelphesHepMC2$(ExeSuf) \
-	DelphesHepMC3$(ExeSuf) \
-	DelphesLHEF$(ExeSuf) \
-	DelphesROOT$(ExeSuf) \
-	DelphesSTDHEP$(ExeSuf)
-
-EXECUTABLE_OBJ +=  \
-	tmp/readers/DelphesHepMC2.$(ObjSuf) \
-	tmp/readers/DelphesHepMC3.$(ObjSuf) \
-	tmp/readers/DelphesLHEF.$(ObjSuf) \
-	tmp/readers/DelphesROOT.$(ObjSuf) \
-	tmp/readers/DelphesSTDHEP.$(ObjSuf)
-
-ifeq ($(HAS_CMSSW),true)
-DelphesCMSFWLite$(ExeSuf): \
-	tmp/readers/DelphesCMSFWLite.$(ObjSuf)
-
-tmp/readers/DelphesCMSFWLite.$(ObjSuf): \
-	readers/DelphesCMSFWLite.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesStream.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-EXECUTABLE +=  \
-	DelphesCMSFWLite$(ExeSuf)
-
-EXECUTABLE_OBJ +=  \
-	tmp/readers/DelphesCMSFWLite.$(ObjSuf)
-
-endif
-
-ifeq ($(HAS_PROMC),true)
-DelphesProMC$(ExeSuf): \
-	tmp/readers/DelphesProMC.$(ObjSuf)
-
-tmp/readers/DelphesProMC.$(ObjSuf): \
-	readers/DelphesProMC.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesStream.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-EXECUTABLE +=  \
-	DelphesProMC$(ExeSuf)
-
-EXECUTABLE_OBJ +=  \
-	tmp/readers/DelphesProMC.$(ObjSuf)
-
-endif
-
-ifeq ($(HAS_PROIO),true)
-DelphesProIO$(ExeSuf): \
-	tmp/readers/DelphesProIO.$(ObjSuf)
-
-tmp/readers/DelphesProIO.$(ObjSuf): \
-	readers/DelphesProIO.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesStream.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-EXECUTABLE +=  \
-	DelphesProIO$(ExeSuf)
-
-EXECUTABLE_OBJ +=  \
-	tmp/readers/DelphesProIO.$(ObjSuf)
-
-endif
-
-ifeq ($(HAS_PYTHIA8),true)
-DelphesPythia8$(ExeSuf): \
-	tmp/readers/DelphesPythia8.$(ObjSuf)
-
-tmp/readers/DelphesPythia8.$(ObjSuf): \
-	readers/DelphesPythia8.cpp \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesLHEFReader.h \
-	modules/Delphes.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-EXECUTABLE +=  \
-	DelphesPythia8$(ExeSuf)
-
-EXECUTABLE_OBJ +=  \
-	tmp/readers/DelphesPythia8.$(ObjSuf)
-
-tmp/modules/Pythia8Dict.$(SrcSuf): \
-	modules/Pythia8LinkDef.h \
-	modules/PileUpMergerPythia8.h
-tmp/modules/Pythia8Dict$(PcmSuf): \
-	tmp/modules/Pythia8Dict.$(SrcSuf)
-Pythia8Dict$(PcmSuf): \
-	tmp/modules/Pythia8Dict$(PcmSuf)
-DELPHES_DICT_OBJ +=  \
-	tmp/modules/Pythia8Dict.$(ObjSuf)
-
-DELPHES_DICT_PCM +=  \
-	Pythia8Dict$(PcmSuf)
-
-endif
+	tmp/converters/pileup2root.$(ObjSuf)
 
 tmp/classes/ClassesDict.$(SrcSuf): \
@@ -389,54 +158,21 @@
 	classes/DelphesModule.h \
 	classes/DelphesFactory.h \
+	classes/DelphesDisplay.h \
+	classes/DelphesCaloData.h \
 	classes/SortableObject.h \
 	classes/DelphesClasses.h
-tmp/classes/ClassesDict$(PcmSuf): \
-	tmp/classes/ClassesDict.$(SrcSuf)
-ClassesDict$(PcmSuf): \
-	tmp/classes/ClassesDict$(PcmSuf)
-tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
-	external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
-	external/ExRootAnalysis/ExRootTreeReader.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootUtilities.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootProgressBar.h \
-	external/ExRootAnalysis/ExRootConfReader.h \
-	external/ExRootAnalysis/ExRootTask.h
-tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf): \
-	tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
-ExRootAnalysisDict$(PcmSuf): \
-	tmp/external/ExRootAnalysis/ExRootAnalysisDict$(PcmSuf)
 tmp/modules/ModulesDict.$(SrcSuf): \
 	modules/ModulesLinkDef.h \
 	modules/Delphes.h \
-	modules/AngularSmearing.h \
-	modules/PhotonConversions.h \
+	modules/FastJetFinder.h \
 	modules/ParticlePropagator.h \
 	modules/Efficiency.h \
-	modules/IdentificationMap.h \
 	modules/EnergySmearing.h \
 	modules/MomentumSmearing.h \
-	modules/TrackSmearing.h \
-	modules/TrackCovariance.h \
-	modules/ClusterCounting.h \
-	modules/ImpactParameterSmearing.h \
-	modules/TimeSmearing.h \
-	modules/TimeOfFlight.h \
-	modules/SimpleCalorimeter.h \
-	modules/DenseTrackFilter.h \
 	modules/Calorimeter.h \
-	modules/DualReadoutCalorimeter.h \
-	modules/OldCalorimeter.h \
 	modules/Isolation.h \
-	modules/EnergyScale.h \
 	modules/UniqueObjectFinder.h \
-	modules/TrackCountingBTagging.h \
 	modules/BTagging.h \
 	modules/TauTagging.h \
-	modules/TrackCountingTauTagging.h \
 	modules/TreeWriter.h \
 	modules/Merger.h \
@@ -445,106 +181,35 @@
 	modules/JetPileUpSubtractor.h \
 	modules/TrackPileUpSubtractor.h \
-	modules/TaggingParticlesSkimmer.h \
-	modules/PileUpJetID.h \
-	modules/PhotonID.h \
 	modules/ConstituentFilter.h \
 	modules/StatusPidFilter.h \
-	modules/PdgCodeFilter.h \
-	modules/BeamSpotFilter.h \
-	modules/RecoPuFilter.h \
-	modules/Cloner.h \
-	modules/Weighter.h \
-	modules/Hector.h \
-	modules/JetFlavorAssociation.h \
-	modules/JetFakeParticle.h \
-	modules/VertexSorter.h \
-	modules/VertexFinder.h \
-	modules/VertexFinderDA4D.h \
-	modules/DecayFilter.h \
-	modules/ParticleDensity.h \
-	modules/TruthVertexFinder.h \
-	modules/ExampleModule.h \
-	modules/LLPFilter.h \
-	modules/CscClusterEfficiency.h \
-	modules/CscClusterId.h
-tmp/modules/ModulesDict$(PcmSuf): \
-	tmp/modules/ModulesDict.$(SrcSuf)
-ModulesDict$(PcmSuf): \
-	tmp/modules/ModulesDict$(PcmSuf)
-DELPHES_DICT_OBJ +=  \
+	modules/ExampleModule.h
+tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf): \
+	external/ExRootAnalysis/ExRootAnalysisLinkDef.h \
+	external/ExRootAnalysis/ExRootTreeReader.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootUtilities.h \
+	external/ExRootAnalysis/ExRootClassifier.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootProgressBar.h \
+	external/ExRootAnalysis/ExRootConfReader.h \
+	external/ExRootAnalysis/ExRootTask.h
+DICT =  \
+	tmp/classes/ClassesDict.$(SrcSuf) \
+	tmp/modules/ModulesDict.$(SrcSuf) \
+	tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(SrcSuf)
+
+DICT_OBJ =  \
 	tmp/classes/ClassesDict.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(ObjSuf) \
-	tmp/modules/ModulesDict.$(ObjSuf)
-
-DELPHES_DICT_PCM +=  \
-	ClassesDict$(PcmSuf) \
-	ExRootAnalysisDict$(PcmSuf) \
-	ModulesDict$(PcmSuf)
-
-tmp/modules/FastJetDict.$(SrcSuf): \
-	modules/FastJetLinkDef.h \
-	modules/FastJetFinder.h \
-	modules/FastJetGridMedianEstimator.h \
-	modules/RunPUPPI.h
-tmp/modules/FastJetDict$(PcmSuf): \
-	tmp/modules/FastJetDict.$(SrcSuf)
-FastJetDict$(PcmSuf): \
-	tmp/modules/FastJetDict$(PcmSuf)
-FASTJET_DICT_OBJ +=  \
-	tmp/modules/FastJetDict.$(ObjSuf)
-
-FASTJET_DICT_PCM +=  \
-	FastJetDict$(PcmSuf)
-
-tmp/display/DisplayDict.$(SrcSuf): \
-	display/DisplayLinkDef.h \
-	display/DelphesDisplay.h \
-	display/DelphesCaloData.h \
-	display/DelphesBranchElement.h \
-	display/Delphes3DGeometry.h \
-	display/DelphesEventDisplay.h \
-	display/DelphesHtmlSummary.h \
-	display/DelphesPlotSummary.h
-tmp/display/DisplayDict$(PcmSuf): \
-	tmp/display/DisplayDict.$(SrcSuf)
-DisplayDict$(PcmSuf): \
-	tmp/display/DisplayDict$(PcmSuf)
-DISPLAY_DICT_OBJ +=  \
-	tmp/display/DisplayDict.$(ObjSuf)
-
-DISPLAY_DICT_PCM +=  \
-	DisplayDict$(PcmSuf)
-
-tmp/classes/DelphesClasses.$(ObjSuf): \
-	classes/DelphesClasses.$(SrcSuf) \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/SortableObject.h
-tmp/classes/DelphesCscClusterFormula.$(ObjSuf): \
-	classes/DelphesCscClusterFormula.$(SrcSuf) \
-	classes/DelphesCscClusterFormula.h \
-	classes/DelphesClasses.h
-tmp/classes/DelphesCylindricalFormula.$(ObjSuf): \
-	classes/DelphesCylindricalFormula.$(SrcSuf) \
-	classes/DelphesCylindricalFormula.h
-tmp/classes/DelphesFactory.$(ObjSuf): \
-	classes/DelphesFactory.$(SrcSuf) \
-	classes/DelphesFactory.h \
-	classes/DelphesClasses.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h
-tmp/classes/DelphesFormula.$(ObjSuf): \
-	classes/DelphesFormula.$(SrcSuf) \
-	classes/DelphesFormula.h \
-	classes/DelphesClasses.h
-tmp/classes/DelphesHepMC2Reader.$(ObjSuf): \
-	classes/DelphesHepMC2Reader.$(SrcSuf) \
-	classes/DelphesHepMC2Reader.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesStream.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h
-tmp/classes/DelphesHepMC3Reader.$(ObjSuf): \
-	classes/DelphesHepMC3Reader.$(SrcSuf) \
-	classes/DelphesHepMC3Reader.h \
+	tmp/modules/ModulesDict.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootAnalysisDict.$(ObjSuf)
+
+tmp/classes/DelphesDisplay.$(ObjSuf): \
+	classes/DelphesDisplay.$(SrcSuf) \
+	classes/DelphesDisplay.h
+tmp/classes/DelphesHepMCReader.$(ObjSuf): \
+	classes/DelphesHepMCReader.$(SrcSuf) \
+	classes/DelphesHepMCReader.h \
 	classes/DelphesClasses.h \
 	classes/DelphesFactory.h \
@@ -558,20 +223,12 @@
 	classes/DelphesStream.h \
 	external/ExRootAnalysis/ExRootTreeBranch.h
-tmp/classes/DelphesModule.$(ObjSuf): \
-	classes/DelphesModule.$(SrcSuf) \
-	classes/DelphesModule.h \
-	classes/DelphesFactory.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h \
-	external/ExRootAnalysis/ExRootTreeReader.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-tmp/classes/DelphesPileUpReader.$(ObjSuf): \
-	classes/DelphesPileUpReader.$(SrcSuf) \
-	classes/DelphesPileUpReader.h \
-	classes/DelphesXDRReader.h
-tmp/classes/DelphesPileUpWriter.$(ObjSuf): \
-	classes/DelphesPileUpWriter.$(SrcSuf) \
-	classes/DelphesPileUpWriter.h \
-	classes/DelphesXDRWriter.h
+tmp/classes/DelphesFactory.$(ObjSuf): \
+	classes/DelphesFactory.$(SrcSuf) \
+	classes/DelphesFactory.h \
+	classes/DelphesClasses.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h
+tmp/classes/DelphesFormula.$(ObjSuf): \
+	classes/DelphesFormula.$(SrcSuf) \
+	classes/DelphesFormula.h
 tmp/classes/DelphesSTDHEPReader.$(ObjSuf): \
 	classes/DelphesSTDHEPReader.$(SrcSuf) \
@@ -579,37 +236,239 @@
 	classes/DelphesClasses.h \
 	classes/DelphesFactory.h \
-	classes/DelphesXDRReader.h \
 	external/ExRootAnalysis/ExRootTreeBranch.h
 tmp/classes/DelphesStream.$(ObjSuf): \
 	classes/DelphesStream.$(SrcSuf) \
 	classes/DelphesStream.h
-tmp/classes/DelphesTF2.$(ObjSuf): \
-	classes/DelphesTF2.$(SrcSuf) \
-	classes/DelphesTF2.h
-tmp/classes/DelphesXDRReader.$(ObjSuf): \
-	classes/DelphesXDRReader.$(SrcSuf) \
-	classes/DelphesXDRReader.h
-tmp/classes/DelphesXDRWriter.$(ObjSuf): \
-	classes/DelphesXDRWriter.$(SrcSuf) \
-	classes/DelphesXDRWriter.h
+tmp/classes/DelphesPileUpWriter.$(ObjSuf): \
+	classes/DelphesPileUpWriter.$(SrcSuf) \
+	classes/DelphesPileUpWriter.h
+tmp/classes/DelphesModule.$(ObjSuf): \
+	classes/DelphesModule.$(SrcSuf) \
+	classes/DelphesModule.h \
+	classes/DelphesFactory.h \
+	external/ExRootAnalysis/ExRootTreeReader.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootResult.h
+tmp/classes/DelphesCaloData.$(ObjSuf): \
+	classes/DelphesCaloData.$(SrcSuf) \
+	classes/DelphesCaloData.h
+tmp/classes/DelphesClasses.$(ObjSuf): \
+	classes/DelphesClasses.$(SrcSuf) \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/SortableObject.h
+tmp/classes/DelphesPileUpReader.$(ObjSuf): \
+	classes/DelphesPileUpReader.$(SrcSuf) \
+	classes/DelphesPileUpReader.h
+tmp/modules/LeptonDressing.$(ObjSuf): \
+	modules/LeptonDressing.$(SrcSuf) \
+	modules/LeptonDressing.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/Efficiency.$(ObjSuf): \
+	modules/Efficiency.$(SrcSuf) \
+	modules/Efficiency.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/UniqueObjectFinder.$(ObjSuf): \
+	modules/UniqueObjectFinder.$(SrcSuf) \
+	modules/UniqueObjectFinder.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/ExampleModule.$(ObjSuf): \
+	modules/ExampleModule.$(SrcSuf) \
+	modules/ExampleModule.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/ParticlePropagator.$(ObjSuf): \
+	modules/ParticlePropagator.$(SrcSuf) \
+	modules/ParticlePropagator.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/EnergySmearing.$(ObjSuf): \
+	modules/EnergySmearing.$(SrcSuf) \
+	modules/EnergySmearing.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/FastJetFinder.$(ObjSuf): \
+	modules/FastJetFinder.$(SrcSuf) \
+	modules/FastJetFinder.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/JetDefinition.hh \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/Selector.hh \
+	external/fastjet/ClusterSequenceArea.hh \
+	external/fastjet/tools/JetMedianBackgroundEstimator.hh \
+	external/fastjet/plugins/SISCone/fastjet/SISConePlugin.hh \
+	external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
+	external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh
+tmp/modules/StatusPidFilter.$(ObjSuf): \
+	modules/StatusPidFilter.$(SrcSuf) \
+	modules/StatusPidFilter.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/ConstituentFilter.$(ObjSuf): \
+	modules/ConstituentFilter.$(SrcSuf) \
+	modules/ConstituentFilter.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/TauTagging.$(ObjSuf): \
+	modules/TauTagging.$(SrcSuf) \
+	modules/TauTagging.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/Merger.$(ObjSuf): \
+	modules/Merger.$(SrcSuf) \
+	modules/Merger.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/BTagging.$(ObjSuf): \
+	modules/BTagging.$(SrcSuf) \
+	modules/BTagging.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/TreeWriter.$(ObjSuf): \
+	modules/TreeWriter.$(SrcSuf) \
+	modules/TreeWriter.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h
+tmp/modules/Delphes.$(ObjSuf): \
+	modules/Delphes.$(SrcSuf) \
+	modules/Delphes.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h \
+	external/ExRootAnalysis/ExRootConfReader.h \
+	external/ExRootAnalysis/ExRootTreeWriter.h
+tmp/modules/Calorimeter.$(ObjSuf): \
+	modules/Calorimeter.$(SrcSuf) \
+	modules/Calorimeter.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/Isolation.$(ObjSuf): \
+	modules/Isolation.$(SrcSuf) \
+	modules/Isolation.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/PileUpMerger.$(ObjSuf): \
+	modules/PileUpMerger.$(SrcSuf) \
+	modules/PileUpMerger.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	classes/DelphesPileUpReader.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
+	modules/TrackPileUpSubtractor.$(SrcSuf) \
+	modules/TrackPileUpSubtractor.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
+	modules/JetPileUpSubtractor.$(SrcSuf) \
+	modules/JetPileUpSubtractor.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/modules/MomentumSmearing.$(ObjSuf): \
+	modules/MomentumSmearing.$(SrcSuf) \
+	modules/MomentumSmearing.h \
+	classes/DelphesClasses.h \
+	classes/DelphesFactory.h \
+	classes/DelphesFormula.h \
+	external/ExRootAnalysis/ExRootResult.h \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
+tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf): \
+	external/ExRootAnalysis/ExRootFilter.$(SrcSuf) \
+	external/ExRootAnalysis/ExRootFilter.h \
+	external/ExRootAnalysis/ExRootClassifier.h
 tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf): \
 	external/ExRootAnalysis/ExRootConfReader.$(SrcSuf) \
 	external/ExRootAnalysis/ExRootConfReader.h \
 	external/tcl/tcl.h
-tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf): \
-	external/ExRootAnalysis/ExRootFilter.$(SrcSuf) \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootClassifier.h
-tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf): \
-	external/ExRootAnalysis/ExRootProgressBar.$(SrcSuf) \
-	external/ExRootAnalysis/ExRootProgressBar.h
+tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf): \
+	external/ExRootAnalysis/ExRootTreeWriter.$(SrcSuf) \
+	external/ExRootAnalysis/ExRootTreeWriter.h \
+	external/ExRootAnalysis/ExRootTreeBranch.h
 tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf): \
 	external/ExRootAnalysis/ExRootResult.$(SrcSuf) \
 	external/ExRootAnalysis/ExRootResult.h \
 	external/ExRootAnalysis/ExRootUtilities.h
-tmp/external/ExRootAnalysis/ExRootTask.$(ObjSuf): \
-	external/ExRootAnalysis/ExRootTask.$(SrcSuf) \
-	external/ExRootAnalysis/ExRootTask.h \
-	external/ExRootAnalysis/ExRootConfReader.h
 tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf): \
 	external/ExRootAnalysis/ExRootTreeBranch.$(SrcSuf) \
@@ -618,733 +477,21 @@
 	external/ExRootAnalysis/ExRootTreeReader.$(SrcSuf) \
 	external/ExRootAnalysis/ExRootTreeReader.h
-tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf): \
-	external/ExRootAnalysis/ExRootTreeWriter.$(SrcSuf) \
-	external/ExRootAnalysis/ExRootTreeWriter.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h
+tmp/external/ExRootAnalysis/ExRootTask.$(ObjSuf): \
+	external/ExRootAnalysis/ExRootTask.$(SrcSuf) \
+	external/ExRootAnalysis/ExRootTask.h \
+	external/ExRootAnalysis/ExRootConfReader.h
+tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf): \
+	external/ExRootAnalysis/ExRootProgressBar.$(SrcSuf) \
+	external/ExRootAnalysis/ExRootProgressBar.h
 tmp/external/ExRootAnalysis/ExRootUtilities.$(ObjSuf): \
 	external/ExRootAnalysis/ExRootUtilities.$(SrcSuf) \
 	external/ExRootAnalysis/ExRootUtilities.h
-tmp/external/Hector/H_AbstractBeamLine.$(ObjSuf): \
-	external/Hector/H_AbstractBeamLine.$(SrcSuf)
-tmp/external/Hector/H_Aperture.$(ObjSuf): \
-	external/Hector/H_Aperture.$(SrcSuf)
-tmp/external/Hector/H_Beam.$(ObjSuf): \
-	external/Hector/H_Beam.$(SrcSuf)
-tmp/external/Hector/H_BeamLine.$(ObjSuf): \
-	external/Hector/H_BeamLine.$(SrcSuf)
-tmp/external/Hector/H_BeamLineParser.$(ObjSuf): \
-	external/Hector/H_BeamLineParser.$(SrcSuf)
-tmp/external/Hector/H_BeamParticle.$(ObjSuf): \
-	external/Hector/H_BeamParticle.$(SrcSuf)
-tmp/external/Hector/H_CircularAperture.$(ObjSuf): \
-	external/Hector/H_CircularAperture.$(SrcSuf)
-tmp/external/Hector/H_Dipole.$(ObjSuf): \
-	external/Hector/H_Dipole.$(SrcSuf)
-tmp/external/Hector/H_Drift.$(ObjSuf): \
-	external/Hector/H_Drift.$(SrcSuf)
-tmp/external/Hector/H_EllipticAperture.$(ObjSuf): \
-	external/Hector/H_EllipticAperture.$(SrcSuf)
-tmp/external/Hector/H_HorizontalKicker.$(ObjSuf): \
-	external/Hector/H_HorizontalKicker.$(SrcSuf)
-tmp/external/Hector/H_HorizontalQuadrupole.$(ObjSuf): \
-	external/Hector/H_HorizontalQuadrupole.$(SrcSuf)
-tmp/external/Hector/H_Kicker.$(ObjSuf): \
-	external/Hector/H_Kicker.$(SrcSuf)
-tmp/external/Hector/H_Marker.$(ObjSuf): \
-	external/Hector/H_Marker.$(SrcSuf)
-tmp/external/Hector/H_OpticalElement.$(ObjSuf): \
-	external/Hector/H_OpticalElement.$(SrcSuf)
-tmp/external/Hector/H_Parameters.$(ObjSuf): \
-	external/Hector/H_Parameters.$(SrcSuf)
-tmp/external/Hector/H_Quadrupole.$(ObjSuf): \
-	external/Hector/H_Quadrupole.$(SrcSuf)
-tmp/external/Hector/H_RecRPObject.$(ObjSuf): \
-	external/Hector/H_RecRPObject.$(SrcSuf)
-tmp/external/Hector/H_RectEllipticAperture.$(ObjSuf): \
-	external/Hector/H_RectEllipticAperture.$(SrcSuf)
-tmp/external/Hector/H_RectangularAperture.$(ObjSuf): \
-	external/Hector/H_RectangularAperture.$(SrcSuf)
-tmp/external/Hector/H_RectangularCollimator.$(ObjSuf): \
-	external/Hector/H_RectangularCollimator.$(SrcSuf)
-tmp/external/Hector/H_RectangularDipole.$(ObjSuf): \
-	external/Hector/H_RectangularDipole.$(SrcSuf)
-tmp/external/Hector/H_RomanPot.$(ObjSuf): \
-	external/Hector/H_RomanPot.$(SrcSuf)
-tmp/external/Hector/H_SectorDipole.$(ObjSuf): \
-	external/Hector/H_SectorDipole.$(SrcSuf)
-tmp/external/Hector/H_TransportMatrices.$(ObjSuf): \
-	external/Hector/H_TransportMatrices.$(SrcSuf)
-tmp/external/Hector/H_VerticalKicker.$(ObjSuf): \
-	external/Hector/H_VerticalKicker.$(SrcSuf)
-tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf): \
-	external/Hector/H_VerticalQuadrupole.$(SrcSuf)
-tmp/external/TrackCovariance/AcceptanceClx.$(ObjSuf): \
-	external/TrackCovariance/AcceptanceClx.$(SrcSuf)
-tmp/external/TrackCovariance/ObsTrk.$(ObjSuf): \
-	external/TrackCovariance/ObsTrk.$(SrcSuf)
-tmp/external/TrackCovariance/SolGeom.$(ObjSuf): \
-	external/TrackCovariance/SolGeom.$(SrcSuf)
-tmp/external/TrackCovariance/SolGridCov.$(ObjSuf): \
-	external/TrackCovariance/SolGridCov.$(SrcSuf)
-tmp/external/TrackCovariance/SolTrack.$(ObjSuf): \
-	external/TrackCovariance/SolTrack.$(SrcSuf)
-tmp/external/TrackCovariance/TrkUtil.$(ObjSuf): \
-	external/TrackCovariance/TrkUtil.$(SrcSuf)
-tmp/external/TrackCovariance/VertexFit.$(ObjSuf): \
-	external/TrackCovariance/VertexFit.$(SrcSuf)
-tmp/modules/AngularSmearing.$(ObjSuf): \
-	modules/AngularSmearing.$(SrcSuf) \
-	modules/AngularSmearing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/BTagging.$(ObjSuf): \
-	modules/BTagging.$(SrcSuf) \
-	modules/BTagging.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h
-tmp/modules/BeamSpotFilter.$(ObjSuf): \
-	modules/BeamSpotFilter.$(SrcSuf) \
-	modules/BeamSpotFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Calorimeter.$(ObjSuf): \
-	modules/Calorimeter.$(SrcSuf) \
-	modules/Calorimeter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Cloner.$(ObjSuf): \
-	modules/Cloner.$(SrcSuf) \
-	modules/Cloner.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/ClusterCounting.$(ObjSuf): \
-	modules/ClusterCounting.$(SrcSuf) \
-	modules/ClusterCounting.h \
-	classes/DelphesClasses.h \
-	external/TrackCovariance/TrkUtil.h
-tmp/modules/ConstituentFilter.$(ObjSuf): \
-	modules/ConstituentFilter.$(SrcSuf) \
-	modules/ConstituentFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/CscClusterEfficiency.$(ObjSuf): \
-	modules/CscClusterEfficiency.$(SrcSuf) \
-	modules/CscClusterEfficiency.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesCscClusterFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/CscClusterId.$(ObjSuf): \
-	modules/CscClusterId.$(SrcSuf) \
-	modules/CscClusterId.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesCscClusterFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/DecayFilter.$(ObjSuf): \
-	modules/DecayFilter.$(SrcSuf) \
-	modules/DecayFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Delphes.$(ObjSuf): \
-	modules/Delphes.$(SrcSuf) \
-	modules/Delphes.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootConfReader.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootTreeWriter.h
-tmp/modules/DenseTrackFilter.$(ObjSuf): \
-	modules/DenseTrackFilter.$(SrcSuf) \
-	modules/DenseTrackFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/DualReadoutCalorimeter.$(ObjSuf): \
-	modules/DualReadoutCalorimeter.$(SrcSuf) \
-	modules/DualReadoutCalorimeter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/Efficiency.$(ObjSuf): \
-	modules/Efficiency.$(SrcSuf) \
-	modules/Efficiency.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/EnergyScale.$(ObjSuf): \
-	modules/EnergyScale.$(SrcSuf) \
-	modules/EnergyScale.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/EnergySmearing.$(ObjSuf): \
-	modules/EnergySmearing.$(SrcSuf) \
-	modules/EnergySmearing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/ExampleModule.$(ObjSuf): \
-	modules/ExampleModule.$(SrcSuf) \
-	modules/ExampleModule.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Hector.$(ObjSuf): \
-	modules/Hector.$(SrcSuf) \
-	modules/Hector.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/Hector/H_BeamLine.h \
-	external/Hector/H_BeamParticle.h \
-	external/Hector/H_RecRPObject.h
-tmp/modules/IdentificationMap.$(ObjSuf): \
-	modules/IdentificationMap.$(SrcSuf) \
-	modules/IdentificationMap.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/ImpactParameterSmearing.$(ObjSuf): \
-	modules/ImpactParameterSmearing.$(SrcSuf) \
-	modules/ImpactParameterSmearing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Isolation.$(ObjSuf): \
-	modules/Isolation.$(SrcSuf) \
-	modules/Isolation.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/JetFakeParticle.$(ObjSuf): \
-	modules/JetFakeParticle.$(SrcSuf) \
-	modules/JetFakeParticle.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/JetFlavorAssociation.$(ObjSuf): \
-	modules/JetFlavorAssociation.$(SrcSuf) \
-	modules/JetFlavorAssociation.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/JetPileUpSubtractor.$(ObjSuf): \
-	modules/JetPileUpSubtractor.$(SrcSuf) \
-	modules/JetPileUpSubtractor.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/LLPFilter.$(ObjSuf): \
-	modules/LLPFilter.$(SrcSuf) \
-	modules/LLPFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/LeptonDressing.$(ObjSuf): \
-	modules/LeptonDressing.$(SrcSuf) \
-	modules/LeptonDressing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Merger.$(ObjSuf): \
-	modules/Merger.$(SrcSuf) \
-	modules/Merger.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/MomentumSmearing.$(ObjSuf): \
-	modules/MomentumSmearing.$(SrcSuf) \
-	modules/MomentumSmearing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/OldCalorimeter.$(ObjSuf): \
-	modules/OldCalorimeter.$(SrcSuf) \
-	modules/OldCalorimeter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/ParticleDensity.$(ObjSuf): \
-	modules/ParticleDensity.$(SrcSuf) \
-	modules/ParticleDensity.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/ParticlePropagator.$(ObjSuf): \
-	modules/ParticlePropagator.$(SrcSuf) \
-	modules/ParticlePropagator.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/PdgCodeFilter.$(ObjSuf): \
-	modules/PdgCodeFilter.$(SrcSuf) \
-	modules/PdgCodeFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/PhotonConversions.$(ObjSuf): \
-	modules/PhotonConversions.$(SrcSuf) \
-	modules/PhotonConversions.h \
-	classes/DelphesClasses.h \
-	classes/DelphesCylindricalFormula.h \
-	classes/DelphesFactory.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/PhotonID.$(ObjSuf): \
-	modules/PhotonID.$(SrcSuf) \
-	modules/PhotonID.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/PileUpJetID.$(ObjSuf): \
-	modules/PileUpJetID.$(SrcSuf) \
-	modules/PileUpJetID.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/PileUpMerger.$(ObjSuf): \
-	modules/PileUpMerger.$(SrcSuf) \
-	modules/PileUpMerger.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesPileUpReader.h \
-	classes/DelphesTF2.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/PileUpMergerPythia8.$(ObjSuf): \
-	modules/PileUpMergerPythia8.$(SrcSuf) \
-	modules/PileUpMergerPythia8.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesPileUpReader.h \
-	classes/DelphesTF2.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/RecoPuFilter.$(ObjSuf): \
-	modules/RecoPuFilter.$(SrcSuf) \
-	modules/RecoPuFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/SimpleCalorimeter.$(ObjSuf): \
-	modules/SimpleCalorimeter.$(SrcSuf) \
-	modules/SimpleCalorimeter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/StatusPidFilter.$(ObjSuf): \
-	modules/StatusPidFilter.$(SrcSuf) \
-	modules/StatusPidFilter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TaggingParticlesSkimmer.$(ObjSuf): \
-	modules/TaggingParticlesSkimmer.$(SrcSuf) \
-	modules/TaggingParticlesSkimmer.h \
-	modules/TauTagging.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TauTagging.$(ObjSuf): \
-	modules/TauTagging.$(SrcSuf) \
-	modules/TauTagging.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h
-tmp/modules/TimeOfFlight.$(ObjSuf): \
-	modules/TimeOfFlight.$(SrcSuf) \
-	modules/TimeOfFlight.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TimeSmearing.$(ObjSuf): \
-	modules/TimeSmearing.$(SrcSuf) \
-	modules/TimeSmearing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TrackCountingBTagging.$(ObjSuf): \
-	modules/TrackCountingBTagging.$(SrcSuf) \
-	modules/TrackCountingBTagging.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h
-tmp/modules/TrackCountingTauTagging.$(ObjSuf): \
-	modules/TrackCountingTauTagging.$(SrcSuf) \
-	modules/TrackCountingTauTagging.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TrackCovariance.$(ObjSuf): \
-	modules/TrackCovariance.$(SrcSuf) \
-	modules/TrackCovariance.h \
-	classes/DelphesClasses.h \
-	external/TrackCovariance/SolGeom.h \
-	external/TrackCovariance/SolGridCov.h \
-	external/TrackCovariance/ObsTrk.h
-tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \
-	modules/TrackPileUpSubtractor.$(SrcSuf) \
-	modules/TrackPileUpSubtractor.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TrackSmearing.$(ObjSuf): \
-	modules/TrackSmearing.$(SrcSuf) \
-	modules/TrackSmearing.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/TreeWriter.$(ObjSuf): \
-	modules/TreeWriter.$(SrcSuf) \
-	modules/TreeWriter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/ExRootAnalysis/ExRootTreeBranch.h
-tmp/modules/TruthVertexFinder.$(ObjSuf): \
-	modules/TruthVertexFinder.$(SrcSuf) \
-	modules/TruthVertexFinder.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesPileUpReader.h \
-	classes/DelphesTF2.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/UniqueObjectFinder.$(ObjSuf): \
-	modules/UniqueObjectFinder.$(SrcSuf) \
-	modules/UniqueObjectFinder.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/VertexFinder.$(ObjSuf): \
-	modules/VertexFinder.$(SrcSuf) \
-	modules/VertexFinder.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	classes/DelphesPileUpReader.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/VertexFinderDA4D.$(ObjSuf): \
-	modules/VertexFinderDA4D.$(SrcSuf) \
-	modules/VertexFinderDA4D.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	classes/DelphesPileUpReader.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/VertexSorter.$(ObjSuf): \
-	modules/VertexSorter.$(SrcSuf) \
-	modules/VertexSorter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	classes/DelphesPileUpReader.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-tmp/modules/Weighter.$(ObjSuf): \
-	modules/Weighter.$(SrcSuf) \
-	modules/Weighter.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h
-DELPHES_OBJ +=  \
-	tmp/classes/DelphesClasses.$(ObjSuf) \
-	tmp/classes/DelphesCscClusterFormula.$(ObjSuf) \
-	tmp/classes/DelphesCylindricalFormula.$(ObjSuf) \
-	tmp/classes/DelphesFactory.$(ObjSuf) \
-	tmp/classes/DelphesFormula.$(ObjSuf) \
-	tmp/classes/DelphesHepMC2Reader.$(ObjSuf) \
-	tmp/classes/DelphesHepMC3Reader.$(ObjSuf) \
-	tmp/classes/DelphesLHEFReader.$(ObjSuf) \
-	tmp/classes/DelphesModule.$(ObjSuf) \
-	tmp/classes/DelphesPileUpReader.$(ObjSuf) \
-	tmp/classes/DelphesPileUpWriter.$(ObjSuf) \
-	tmp/classes/DelphesSTDHEPReader.$(ObjSuf) \
-	tmp/classes/DelphesStream.$(ObjSuf) \
-	tmp/classes/DelphesTF2.$(ObjSuf) \
-	tmp/classes/DelphesXDRReader.$(ObjSuf) \
-	tmp/classes/DelphesXDRWriter.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootTask.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootTreeReader.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf) \
-	tmp/external/ExRootAnalysis/ExRootUtilities.$(ObjSuf) \
-	tmp/external/Hector/H_AbstractBeamLine.$(ObjSuf) \
-	tmp/external/Hector/H_Aperture.$(ObjSuf) \
-	tmp/external/Hector/H_Beam.$(ObjSuf) \
-	tmp/external/Hector/H_BeamLine.$(ObjSuf) \
-	tmp/external/Hector/H_BeamLineParser.$(ObjSuf) \
-	tmp/external/Hector/H_BeamParticle.$(ObjSuf) \
-	tmp/external/Hector/H_CircularAperture.$(ObjSuf) \
-	tmp/external/Hector/H_Dipole.$(ObjSuf) \
-	tmp/external/Hector/H_Drift.$(ObjSuf) \
-	tmp/external/Hector/H_EllipticAperture.$(ObjSuf) \
-	tmp/external/Hector/H_HorizontalKicker.$(ObjSuf) \
-	tmp/external/Hector/H_HorizontalQuadrupole.$(ObjSuf) \
-	tmp/external/Hector/H_Kicker.$(ObjSuf) \
-	tmp/external/Hector/H_Marker.$(ObjSuf) \
-	tmp/external/Hector/H_OpticalElement.$(ObjSuf) \
-	tmp/external/Hector/H_Parameters.$(ObjSuf) \
-	tmp/external/Hector/H_Quadrupole.$(ObjSuf) \
-	tmp/external/Hector/H_RecRPObject.$(ObjSuf) \
-	tmp/external/Hector/H_RectEllipticAperture.$(ObjSuf) \
-	tmp/external/Hector/H_RectangularAperture.$(ObjSuf) \
-	tmp/external/Hector/H_RectangularCollimator.$(ObjSuf) \
-	tmp/external/Hector/H_RectangularDipole.$(ObjSuf) \
-	tmp/external/Hector/H_RomanPot.$(ObjSuf) \
-	tmp/external/Hector/H_SectorDipole.$(ObjSuf) \
-	tmp/external/Hector/H_TransportMatrices.$(ObjSuf) \
-	tmp/external/Hector/H_VerticalKicker.$(ObjSuf) \
-	tmp/external/Hector/H_VerticalQuadrupole.$(ObjSuf) \
-	tmp/external/TrackCovariance/AcceptanceClx.$(ObjSuf) \
-	tmp/external/TrackCovariance/ObsTrk.$(ObjSuf) \
-	tmp/external/TrackCovariance/SolGeom.$(ObjSuf) \
-	tmp/external/TrackCovariance/SolGridCov.$(ObjSuf) \
-	tmp/external/TrackCovariance/SolTrack.$(ObjSuf) \
-	tmp/external/TrackCovariance/TrkUtil.$(ObjSuf) \
-	tmp/external/TrackCovariance/VertexFit.$(ObjSuf) \
-	tmp/modules/AngularSmearing.$(ObjSuf) \
-	tmp/modules/BTagging.$(ObjSuf) \
-	tmp/modules/BeamSpotFilter.$(ObjSuf) \
-	tmp/modules/Calorimeter.$(ObjSuf) \
-	tmp/modules/Cloner.$(ObjSuf) \
-	tmp/modules/ClusterCounting.$(ObjSuf) \
-	tmp/modules/ConstituentFilter.$(ObjSuf) \
-	tmp/modules/CscClusterEfficiency.$(ObjSuf) \
-	tmp/modules/CscClusterId.$(ObjSuf) \
-	tmp/modules/DecayFilter.$(ObjSuf) \
-	tmp/modules/Delphes.$(ObjSuf) \
-	tmp/modules/DenseTrackFilter.$(ObjSuf) \
-	tmp/modules/DualReadoutCalorimeter.$(ObjSuf) \
-	tmp/modules/Efficiency.$(ObjSuf) \
-	tmp/modules/EnergyScale.$(ObjSuf) \
-	tmp/modules/EnergySmearing.$(ObjSuf) \
-	tmp/modules/ExampleModule.$(ObjSuf) \
-	tmp/modules/Hector.$(ObjSuf) \
-	tmp/modules/IdentificationMap.$(ObjSuf) \
-	tmp/modules/ImpactParameterSmearing.$(ObjSuf) \
-	tmp/modules/Isolation.$(ObjSuf) \
-	tmp/modules/JetFakeParticle.$(ObjSuf) \
-	tmp/modules/JetFlavorAssociation.$(ObjSuf) \
-	tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
-	tmp/modules/LLPFilter.$(ObjSuf) \
-	tmp/modules/LeptonDressing.$(ObjSuf) \
-	tmp/modules/Merger.$(ObjSuf) \
-	tmp/modules/MomentumSmearing.$(ObjSuf) \
-	tmp/modules/OldCalorimeter.$(ObjSuf) \
-	tmp/modules/ParticleDensity.$(ObjSuf) \
-	tmp/modules/ParticlePropagator.$(ObjSuf) \
-	tmp/modules/PdgCodeFilter.$(ObjSuf) \
-	tmp/modules/PhotonConversions.$(ObjSuf) \
-	tmp/modules/PhotonID.$(ObjSuf) \
-	tmp/modules/PileUpJetID.$(ObjSuf) \
-	tmp/modules/PileUpMerger.$(ObjSuf) \
-	tmp/modules/RecoPuFilter.$(ObjSuf) \
-	tmp/modules/SimpleCalorimeter.$(ObjSuf) \
-	tmp/modules/StatusPidFilter.$(ObjSuf) \
-	tmp/modules/TaggingParticlesSkimmer.$(ObjSuf) \
-	tmp/modules/TauTagging.$(ObjSuf) \
-	tmp/modules/TimeOfFlight.$(ObjSuf) \
-	tmp/modules/TimeSmearing.$(ObjSuf) \
-	tmp/modules/TrackCountingBTagging.$(ObjSuf) \
-	tmp/modules/TrackCountingTauTagging.$(ObjSuf) \
-	tmp/modules/TrackCovariance.$(ObjSuf) \
-	tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
-	tmp/modules/TrackSmearing.$(ObjSuf) \
-	tmp/modules/TreeWriter.$(ObjSuf) \
-	tmp/modules/TruthVertexFinder.$(ObjSuf) \
-	tmp/modules/UniqueObjectFinder.$(ObjSuf) \
-	tmp/modules/VertexFinder.$(ObjSuf) \
-	tmp/modules/VertexFinderDA4D.$(ObjSuf) \
-	tmp/modules/VertexSorter.$(ObjSuf) \
-	tmp/modules/Weighter.$(ObjSuf)
-
-ifeq ($(HAS_PYTHIA8),true)
-DELPHES_OBJ +=  \
-	tmp/modules/PileUpMergerPythia8.$(ObjSuf)
-endif
-
-tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
-	external/PUPPI/PuppiAlgo.$(SrcSuf)
-tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
-	external/PUPPI/PuppiContainer.$(SrcSuf) \
-	external/fastjet/Selector.hh
-tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
-	external/PUPPI/puppiCleanContainer.$(SrcSuf) \
-	external/fastjet/Selector.hh
-tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
-	external/fastjet/AreaDefinition.$(SrcSuf) \
-	external/fastjet/AreaDefinition.hh
-tmp/external/fastjet/BasicRandom.$(ObjSuf): \
-	external/fastjet/BasicRandom.$(SrcSuf) \
-	external/fastjet/internal/BasicRandom.hh
-tmp/external/fastjet/ClosestPair2D.$(ObjSuf): \
-	external/fastjet/ClosestPair2D.$(SrcSuf) \
-	external/fastjet/internal/ClosestPair2D.hh
-tmp/external/fastjet/ClusterSequence.$(ObjSuf): \
-	external/fastjet/ClusterSequence.$(SrcSuf) \
-	external/fastjet/Error.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/ClusterSequenceStructure.hh \
-	external/fastjet/version.hh \
-	external/fastjet/internal/LazyTiling9Alt.hh \
-	external/fastjet/internal/LazyTiling9.hh \
-	external/fastjet/internal/LazyTiling25.hh \
-	external/fastjet/internal/LazyTiling9SeparateGhosts.hh
-tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
-	external/fastjet/ClusterSequence1GhostPassiveArea.$(SrcSuf) \
-	external/fastjet/ClusterSequence1GhostPassiveArea.hh
+tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf): \
+	external/fastjet/Dnn2piCylinder.$(SrcSuf) \
+	external/fastjet/internal/Dnn2piCylinder.hh
+tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf): \
+	external/fastjet/GhostedAreaSpec.$(SrcSuf) \
+	external/fastjet/GhostedAreaSpec.hh \
+	external/fastjet/Error.hh
 tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf): \
 	external/fastjet/ClusterSequenceActiveArea.$(SrcSuf) \
@@ -1353,77 +500,66 @@
 	external/fastjet/ClusterSequenceActiveArea.hh \
 	external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
+tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf): \
+	external/fastjet/ClusterSequence_Delaunay.$(SrcSuf) \
+	external/fastjet/Error.hh \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/internal/Dnn4piCylinder.hh \
+	external/fastjet/internal/Dnn3piCylinder.hh \
+	external/fastjet/internal/Dnn2piCylinder.hh
+tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf): \
+	external/fastjet/ClusterSequenceArea.$(SrcSuf) \
+	external/fastjet/ClusterSequenceArea.hh
+tmp/external/fastjet/Voronoi.$(ObjSuf): \
+	external/fastjet/Voronoi.$(SrcSuf) \
+	external/fastjet/internal/Voronoi.hh
+tmp/external/fastjet/Selector.$(ObjSuf): \
+	external/fastjet/Selector.$(SrcSuf) \
+	external/fastjet/Selector.hh \
+	external/fastjet/GhostedAreaSpec.hh
+tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf): \
+	external/fastjet/ClusterSequence_TiledN2.$(SrcSuf) \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/internal/MinHeap.hh
 tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf): \
 	external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(SrcSuf) \
 	external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh
-tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf): \
-	external/fastjet/ClusterSequenceArea.$(SrcSuf) \
-	external/fastjet/ClusterSequenceArea.hh
-tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf): \
-	external/fastjet/ClusterSequenceAreaBase.$(SrcSuf) \
-	external/fastjet/ClusterSequenceAreaBase.hh
+tmp/external/fastjet/LimitedWarning.$(ObjSuf): \
+	external/fastjet/LimitedWarning.$(SrcSuf) \
+	external/fastjet/LimitedWarning.hh
+tmp/external/fastjet/CompositeJetStructure.$(ObjSuf): \
+	external/fastjet/CompositeJetStructure.$(SrcSuf)
+tmp/external/fastjet/DnnPlane.$(ObjSuf): \
+	external/fastjet/DnnPlane.$(SrcSuf) \
+	external/fastjet/internal/DnnPlane.hh
+tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf): \
+	external/fastjet/ClusterSequence_DumbN3.$(SrcSuf) \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/ClusterSequence.hh
 tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf): \
 	external/fastjet/ClusterSequencePassiveArea.$(SrcSuf) \
 	external/fastjet/ClusterSequencePassiveArea.hh \
 	external/fastjet/ClusterSequenceVoronoiArea.hh
-tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf): \
-	external/fastjet/ClusterSequenceStructure.$(SrcSuf) \
+tmp/external/fastjet/BasicRandom.$(ObjSuf): \
+	external/fastjet/BasicRandom.$(SrcSuf) \
+	external/fastjet/internal/BasicRandom.hh
+tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf): \
+	external/fastjet/ClusterSequenceAreaBase.$(SrcSuf) \
+	external/fastjet/ClusterSequenceAreaBase.hh
+tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf): \
+	external/fastjet/PseudoJetStructureBase.$(SrcSuf) \
+	external/fastjet/PseudoJetStructureBase.hh \
+	external/fastjet/Error.hh \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/ClusterSequenceAreaBase.hh
+tmp/external/fastjet/ClusterSequence.$(ObjSuf): \
+	external/fastjet/ClusterSequence.$(SrcSuf) \
+	external/fastjet/Error.hh \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/ClusterSequence.hh \
 	external/fastjet/ClusterSequenceStructure.hh \
-	external/fastjet/Error.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/ClusterSequenceAreaBase.hh
-tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf): \
-	external/fastjet/ClusterSequenceVoronoiArea.$(SrcSuf) \
-	external/fastjet/ClusterSequenceVoronoiArea.hh \
-	external/fastjet/internal/Voronoi.hh
-tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf): \
-	external/fastjet/ClusterSequence_CP2DChan.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/internal/ClosestPair2D.hh
-tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf): \
-	external/fastjet/ClusterSequence_Delaunay.$(SrcSuf) \
-	external/fastjet/Error.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/internal/DynamicNearestNeighbours.hh \
-	external/fastjet/internal/Dnn4piCylinder.hh \
-	external/fastjet/internal/Dnn3piCylinder.hh \
-	external/fastjet/internal/Dnn2piCylinder.hh
-tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf): \
-	external/fastjet/ClusterSequence_DumbN3.$(SrcSuf) \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf): \
-	external/fastjet/ClusterSequence_N2.$(SrcSuf)
-tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf): \
-	external/fastjet/ClusterSequence_TiledN2.$(SrcSuf) \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/internal/MinHeap.hh \
-	external/fastjet/internal/TilingExtent.hh
-tmp/external/fastjet/CompositeJetStructure.$(ObjSuf): \
-	external/fastjet/CompositeJetStructure.$(SrcSuf)
-tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf): \
-	external/fastjet/Dnn2piCylinder.$(SrcSuf) \
-	external/fastjet/internal/Dnn2piCylinder.hh
-tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf): \
-	external/fastjet/Dnn3piCylinder.$(SrcSuf) \
-	external/fastjet/internal/Dnn3piCylinder.hh
-tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf): \
-	external/fastjet/Dnn4piCylinder.$(SrcSuf) \
-	external/fastjet/internal/Dnn4piCylinder.hh
-tmp/external/fastjet/DnnPlane.$(ObjSuf): \
-	external/fastjet/DnnPlane.$(SrcSuf) \
-	external/fastjet/internal/DnnPlane.hh
-tmp/external/fastjet/Error.$(ObjSuf): \
-	external/fastjet/Error.$(SrcSuf) \
-	external/fastjet/Error.hh \
-	external/fastjet/config.h
-tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf): \
-	external/fastjet/FunctionOfPseudoJet.$(SrcSuf)
-tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf): \
-	external/fastjet/GhostedAreaSpec.$(SrcSuf) \
-	external/fastjet/GhostedAreaSpec.hh \
-	external/fastjet/Error.hh
+	external/fastjet/version.hh
 tmp/external/fastjet/JetDefinition.$(ObjSuf): \
 	external/fastjet/JetDefinition.$(SrcSuf) \
@@ -1431,23 +567,26 @@
 	external/fastjet/Error.hh \
 	external/fastjet/CompositeJetStructure.hh
-tmp/external/fastjet/LazyTiling25.$(ObjSuf): \
-	external/fastjet/LazyTiling25.$(SrcSuf) \
-	external/fastjet/internal/LazyTiling25.hh \
-	external/fastjet/internal/TilingExtent.hh
-tmp/external/fastjet/LazyTiling9.$(ObjSuf): \
-	external/fastjet/LazyTiling9.$(SrcSuf) \
-	external/fastjet/internal/LazyTiling9.hh \
-	external/fastjet/internal/TilingExtent.hh
-tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf): \
-	external/fastjet/LazyTiling9Alt.$(SrcSuf) \
-	external/fastjet/internal/LazyTiling9Alt.hh \
-	external/fastjet/internal/TilingExtent.hh
-tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf): \
-	external/fastjet/LazyTiling9SeparateGhosts.$(SrcSuf) \
-	external/fastjet/internal/LazyTiling9SeparateGhosts.hh \
-	external/fastjet/internal/TilingExtent.hh
-tmp/external/fastjet/LimitedWarning.$(ObjSuf): \
-	external/fastjet/LimitedWarning.$(SrcSuf) \
-	external/fastjet/LimitedWarning.hh
+tmp/external/fastjet/Error.$(ObjSuf): \
+	external/fastjet/Error.$(SrcSuf) \
+	external/fastjet/Error.hh \
+	external/fastjet/config.h
+tmp/external/fastjet/RangeDefinition.$(ObjSuf): \
+	external/fastjet/RangeDefinition.$(SrcSuf) \
+	external/fastjet/RangeDefinition.hh
+tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf): \
+	external/fastjet/ClusterSequence_N2.$(SrcSuf)
+tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf): \
+	external/fastjet/ClusterSequenceStructure.$(SrcSuf) \
+	external/fastjet/ClusterSequenceStructure.hh \
+	external/fastjet/Error.hh \
+	external/fastjet/PseudoJet.hh \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/ClusterSequenceAreaBase.hh
+tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf): \
+	external/fastjet/Dnn4piCylinder.$(SrcSuf) \
+	external/fastjet/internal/Dnn4piCylinder.hh
+tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf): \
+	external/fastjet/ClusterSequence1GhostPassiveArea.$(SrcSuf) \
+	external/fastjet/ClusterSequence1GhostPassiveArea.hh
 tmp/external/fastjet/MinHeap.$(ObjSuf): \
 	external/fastjet/MinHeap.$(SrcSuf) \
@@ -1460,105 +599,117 @@
 	external/fastjet/ClusterSequenceAreaBase.hh \
 	external/fastjet/CompositeJetStructure.hh
-tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf): \
-	external/fastjet/PseudoJetStructureBase.$(SrcSuf) \
-	external/fastjet/PseudoJetStructureBase.hh \
-	external/fastjet/Error.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/ClusterSequenceAreaBase.hh
-tmp/external/fastjet/RangeDefinition.$(ObjSuf): \
-	external/fastjet/RangeDefinition.$(SrcSuf) \
-	external/fastjet/RangeDefinition.hh
-tmp/external/fastjet/RectangularGrid.$(ObjSuf): \
-	external/fastjet/RectangularGrid.$(SrcSuf) \
-	external/fastjet/RectangularGrid.hh
-tmp/external/fastjet/Selector.$(ObjSuf): \
-	external/fastjet/Selector.$(SrcSuf) \
-	external/fastjet/Selector.hh \
-	external/fastjet/GhostedAreaSpec.hh
-tmp/external/fastjet/TilingExtent.$(ObjSuf): \
-	external/fastjet/TilingExtent.$(SrcSuf) \
-	external/fastjet/internal/TilingExtent.hh
-tmp/external/fastjet/Voronoi.$(ObjSuf): \
-	external/fastjet/Voronoi.$(SrcSuf) \
+tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf): \
+	external/fastjet/Dnn3piCylinder.$(SrcSuf) \
+	external/fastjet/internal/Dnn3piCylinder.hh
+tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf): \
+	external/fastjet/ClusterSequence_CP2DChan.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/internal/ClosestPair2D.hh
+tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf): \
+	external/fastjet/ClusterSequenceVoronoiArea.$(SrcSuf) \
+	external/fastjet/ClusterSequenceVoronoiArea.hh \
 	external/fastjet/internal/Voronoi.hh
-tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/Njettiness.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/TauComponents.$(SrcSuf)
-tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf): \
-	external/fastjet/contribs/Nsubjettiness/XConePlugin.$(SrcSuf)
-tmp/external/fastjet/contribs/RecursiveTools/BottomUpSoftDrop.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/BottomUpSoftDrop.$(SrcSuf) \
+tmp/external/fastjet/ClosestPair2D.$(ObjSuf): \
+	external/fastjet/ClosestPair2D.$(SrcSuf) \
+	external/fastjet/internal/ClosestPair2D.hh
+tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf): \
+	external/fastjet/FunctionOfPseudoJet.$(SrcSuf)
+tmp/external/fastjet/AreaDefinition.$(ObjSuf): \
+	external/fastjet/AreaDefinition.$(SrcSuf) \
+	external/fastjet/AreaDefinition.hh
+tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf): \
+	external/fastjet/tools/CASubJetTagger.$(SrcSuf)
+tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf): \
+	external/fastjet/tools/TopTaggerBase.$(SrcSuf)
+tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf): \
+	external/fastjet/tools/BackgroundEstimatorBase.$(SrcSuf) \
+	external/fastjet/tools/BackgroundEstimatorBase.hh
+tmp/external/fastjet/tools/Subtractor.$(ObjSuf): \
+	external/fastjet/tools/Subtractor.$(SrcSuf) \
+	external/fastjet/tools/Subtractor.hh
+tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf): \
+	external/fastjet/tools/RestFrameNSubjettinessTagger.$(SrcSuf)
+tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf): \
+	external/fastjet/tools/JetMedianBackgroundEstimator.$(SrcSuf) \
+	external/fastjet/tools/JetMedianBackgroundEstimator.hh
+tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf): \
+	external/fastjet/tools/MassDropTagger.$(SrcSuf)
+tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf): \
+	external/fastjet/tools/JHTopTagger.$(SrcSuf)
+tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf): \
+	external/fastjet/tools/GridMedianBackgroundEstimator.$(SrcSuf) \
+	external/fastjet/tools/GridMedianBackgroundEstimator.hh
+tmp/external/fastjet/tools/Filter.$(ObjSuf): \
+	external/fastjet/tools/Filter.$(SrcSuf) \
+	external/fastjet/tools/Filter.hh
+tmp/external/fastjet/tools/Pruner.$(ObjSuf): \
+	external/fastjet/tools/Pruner.$(SrcSuf) \
+	external/fastjet/tools/Pruner.hh \
 	external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh \
-	external/fastjet/Selector.hh \
-	external/fastjet/config.h
-tmp/external/fastjet/contribs/RecursiveTools/IteratedSoftDrop.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/IteratedSoftDrop.$(SrcSuf)
-tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(SrcSuf) \
-	external/fastjet/JetDefinition.hh \
-	external/fastjet/ClusterSequenceAreaBase.hh
-tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/Recluster.$(SrcSuf)
-tmp/external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(SrcSuf) \
-	external/fastjet/JetDefinition.hh \
-	external/fastjet/ClusterSequenceAreaBase.hh
-tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf): \
-	external/fastjet/contribs/RecursiveTools/SoftDrop.$(SrcSuf)
-tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf): \
-	external/fastjet/contribs/SoftKiller/SoftKiller.$(SrcSuf)
-tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf): \
-	external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(SrcSuf) \
-	external/fastjet/NNH.hh
+	external/fastjet/Selector.hh
 tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf): \
 	external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(SrcSuf) \
 	external/fastjet/ClusterSequence.hh
+tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf): \
+	external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(SrcSuf)
 tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf): \
 	external/fastjet/plugins/ATLASCone/Jet.$(SrcSuf)
-tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf): \
-	external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(SrcSuf)
 tmp/external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(ObjSuf): \
 	external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(SrcSuf)
+tmp/external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(ObjSuf): \
+	external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh
+tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf): \
+	external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/Error.hh
+tmp/external/fastjet/plugins/TrackJet/TrackJetPlugin.$(ObjSuf): \
+	external/fastjet/plugins/TrackJet/TrackJetPlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh
+tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf): \
+	external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/Error.hh
+tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf): \
+	external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(SrcSuf)
 tmp/external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf): \
 	external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(SrcSuf) \
 	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf): \
-	external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/Error.hh
 tmp/external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(ObjSuf): \
 	external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(SrcSuf)
-tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf): \
-	external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(SrcSuf)
+tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf): \
+	external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/Error.hh
+tmp/external/fastjet/plugins/SISCone/geom_2d.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/geom_2d.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh
+tmp/external/fastjet/plugins/SISCone/siscone.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/siscone.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/hash.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/quadtree.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/quadtree.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/area.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/momentum.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/reference.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/ranlux.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/protocones.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/split_merge.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/vicinity.$(SrcSuf)
+tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf): \
+	external/fastjet/plugins/SISCone/siscone_error.$(SrcSuf)
 tmp/external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(ObjSuf): \
 	external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(SrcSuf) \
 	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf): \
-	external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/Error.hh
-tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf): \
-	external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/Error.hh
-tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf): \
-	external/fastjet/plugins/EECambridge/EECambridgePlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/NNH.hh
 tmp/external/fastjet/plugins/GridJet/GridJetPlugin.$(ObjSuf): \
 	external/fastjet/plugins/GridJet/GridJetPlugin.$(SrcSuf) \
@@ -1567,382 +718,216 @@
 	external/fastjet/plugins/Jade/JadePlugin.$(SrcSuf) \
 	external/fastjet/ClusterSequence.hh \
-	external/fastjet/NNH.hh \
-	external/fastjet/NNFJN2Plain.hh
-tmp/external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(ObjSuf): \
-	external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/SISConePlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/area.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/geom_2d.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/geom_2d.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/hash.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/momentum.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/protocones.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/quadtree.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/quadtree.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/ranlux.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/reference.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/siscone.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/siscone.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/siscone_error.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/split_merge.$(SrcSuf)
-tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf): \
-	external/fastjet/plugins/SISCone/vicinity.$(SrcSuf)
-tmp/external/fastjet/plugins/TrackJet/TrackJetPlugin.$(ObjSuf): \
-	external/fastjet/plugins/TrackJet/TrackJetPlugin.$(SrcSuf) \
-	external/fastjet/ClusterSequence.hh
-tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf): \
-	external/fastjet/tools/BackgroundEstimatorBase.$(SrcSuf) \
-	external/fastjet/tools/BackgroundEstimatorBase.hh
-tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf): \
-	external/fastjet/tools/CASubJetTagger.$(SrcSuf)
-tmp/external/fastjet/tools/Filter.$(ObjSuf): \
-	external/fastjet/tools/Filter.$(SrcSuf) \
-	external/fastjet/tools/Filter.hh \
-	external/fastjet/tools/Recluster.hh \
-	external/fastjet/tools/Subtractor.hh
-tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf): \
-	external/fastjet/tools/GridMedianBackgroundEstimator.$(SrcSuf) \
-	external/fastjet/tools/GridMedianBackgroundEstimator.hh
-tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf): \
-	external/fastjet/tools/JHTopTagger.$(SrcSuf)
-tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf): \
-	external/fastjet/tools/JetMedianBackgroundEstimator.$(SrcSuf) \
-	external/fastjet/tools/JetMedianBackgroundEstimator.hh
-tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf): \
-	external/fastjet/tools/MassDropTagger.$(SrcSuf)
-tmp/external/fastjet/tools/Pruner.$(ObjSuf): \
-	external/fastjet/tools/Pruner.$(SrcSuf) \
-	external/fastjet/tools/Pruner.hh \
-	external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.hh \
-	external/fastjet/Selector.hh
-tmp/external/fastjet/tools/Recluster.$(ObjSuf): \
-	external/fastjet/tools/Recluster.$(SrcSuf) \
-	external/fastjet/tools/Recluster.hh \
-	external/fastjet/CompositeJetStructure.hh
-tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf): \
-	external/fastjet/tools/RestFrameNSubjettinessTagger.$(SrcSuf)
-tmp/external/fastjet/tools/Subtractor.$(ObjSuf): \
-	external/fastjet/tools/Subtractor.$(SrcSuf) \
-	external/fastjet/tools/Subtractor.hh
-tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf): \
-	external/fastjet/tools/TopTaggerBase.$(SrcSuf)
-tmp/modules/FastJetFinder.$(ObjSuf): \
-	modules/FastJetFinder.$(SrcSuf) \
-	modules/FastJetFinder.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/ClusterSequenceArea.hh \
-	external/fastjet/JetDefinition.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/Selector.hh \
-	external/fastjet/tools/JetMedianBackgroundEstimator.hh \
-	external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
-	external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
-	external/fastjet/plugins/SISCone/fastjet/SISConePlugin.hh \
-	external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh \
-	external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
-	external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
-	external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
-	external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
-	external/fastjet/contribs/RecursiveTools/SoftDrop.hh \
-	external/fastjet/tools/Filter.hh \
-	external/fastjet/tools/Pruner.hh
-tmp/modules/FastJetGridMedianEstimator.$(ObjSuf): \
-	modules/FastJetGridMedianEstimator.$(SrcSuf) \
-	modules/FastJetGridMedianEstimator.h \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/ClusterSequenceArea.hh \
-	external/fastjet/JetDefinition.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/RectangularGrid.hh \
-	external/fastjet/Selector.hh \
-	external/fastjet/tools/JetMedianBackgroundEstimator.hh \
-	external/fastjet/tools/GridMedianBackgroundEstimator.hh \
-	external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
-	external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
-	external/fastjet/plugins/SISCone/fastjet/SISConePlugin.hh \
-	external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh \
-	external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
-	external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh \
-	external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh
-tmp/modules/RunPUPPI.$(ObjSuf): \
-	modules/RunPUPPI.$(SrcSuf) \
-	modules/RunPUPPI.h \
-	external/PUPPI/AlgoObj.hh \
-	external/PUPPI/PuppiContainer.hh \
-	external/PUPPI/RecoObj2.hh \
-	external/fastjet/PseudoJet.hh \
-	classes/DelphesClasses.h \
-	classes/DelphesFactory.h \
-	classes/DelphesFormula.h
-FASTJET_OBJ +=  \
-	tmp/external/PUPPI/PuppiAlgo.$(ObjSuf) \
-	tmp/external/PUPPI/PuppiContainer.$(ObjSuf) \
-	tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf) \
-	tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
+	external/fastjet/NNH.hh
+tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf): \
+	external/fastjet/plugins/EECambridge/EECambridgePlugin.$(SrcSuf) \
+	external/fastjet/ClusterSequence.hh \
+	external/fastjet/NNH.hh
+SOURCE_OBJ =  \
+	tmp/classes/DelphesDisplay.$(ObjSuf) \
+	tmp/classes/DelphesHepMCReader.$(ObjSuf) \
+	tmp/classes/DelphesLHEFReader.$(ObjSuf) \
+	tmp/classes/DelphesFactory.$(ObjSuf) \
+	tmp/classes/DelphesFormula.$(ObjSuf) \
+	tmp/classes/DelphesSTDHEPReader.$(ObjSuf) \
+	tmp/classes/DelphesStream.$(ObjSuf) \
+	tmp/classes/DelphesPileUpWriter.$(ObjSuf) \
+	tmp/classes/DelphesModule.$(ObjSuf) \
+	tmp/classes/DelphesCaloData.$(ObjSuf) \
+	tmp/classes/DelphesClasses.$(ObjSuf) \
+	tmp/classes/DelphesPileUpReader.$(ObjSuf) \
+	tmp/modules/LeptonDressing.$(ObjSuf) \
+	tmp/modules/Efficiency.$(ObjSuf) \
+	tmp/modules/UniqueObjectFinder.$(ObjSuf) \
+	tmp/modules/ExampleModule.$(ObjSuf) \
+	tmp/modules/ParticlePropagator.$(ObjSuf) \
+	tmp/modules/EnergySmearing.$(ObjSuf) \
+	tmp/modules/FastJetFinder.$(ObjSuf) \
+	tmp/modules/StatusPidFilter.$(ObjSuf) \
+	tmp/modules/ConstituentFilter.$(ObjSuf) \
+	tmp/modules/TauTagging.$(ObjSuf) \
+	tmp/modules/Merger.$(ObjSuf) \
+	tmp/modules/BTagging.$(ObjSuf) \
+	tmp/modules/TreeWriter.$(ObjSuf) \
+	tmp/modules/Delphes.$(ObjSuf) \
+	tmp/modules/Calorimeter.$(ObjSuf) \
+	tmp/modules/Isolation.$(ObjSuf) \
+	tmp/modules/PileUpMerger.$(ObjSuf) \
+	tmp/modules/TrackPileUpSubtractor.$(ObjSuf) \
+	tmp/modules/JetPileUpSubtractor.$(ObjSuf) \
+	tmp/modules/MomentumSmearing.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootFilter.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootConfReader.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootTreeWriter.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootResult.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootTreeBranch.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootTreeReader.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootTask.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootProgressBar.$(ObjSuf) \
+	tmp/external/ExRootAnalysis/ExRootUtilities.$(ObjSuf) \
+	tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf) \
+	tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf) \
+	tmp/external/fastjet/Voronoi.$(ObjSuf) \
+	tmp/external/fastjet/Selector.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
+	tmp/external/fastjet/LimitedWarning.$(ObjSuf) \
+	tmp/external/fastjet/CompositeJetStructure.$(ObjSuf) \
+	tmp/external/fastjet/DnnPlane.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf) \
 	tmp/external/fastjet/BasicRandom.$(ObjSuf) \
-	tmp/external/fastjet/ClosestPair2D.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf) \
+	tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf) \
 	tmp/external/fastjet/ClusterSequence.$(ObjSuf) \
+	tmp/external/fastjet/JetDefinition.$(ObjSuf) \
+	tmp/external/fastjet/Error.$(ObjSuf) \
+	tmp/external/fastjet/RangeDefinition.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf) \
+	tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf) \
 	tmp/external/fastjet/ClusterSequence1GhostPassiveArea.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequenceActiveArea.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequenceActiveAreaExplicitGhosts.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequenceArea.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequenceAreaBase.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequencePassiveArea.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequenceStructure.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequence_Delaunay.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequence_DumbN3.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequence_N2.$(ObjSuf) \
-	tmp/external/fastjet/ClusterSequence_TiledN2.$(ObjSuf) \
-	tmp/external/fastjet/CompositeJetStructure.$(ObjSuf) \
-	tmp/external/fastjet/Dnn2piCylinder.$(ObjSuf) \
-	tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf) \
-	tmp/external/fastjet/Dnn4piCylinder.$(ObjSuf) \
-	tmp/external/fastjet/DnnPlane.$(ObjSuf) \
-	tmp/external/fastjet/Error.$(ObjSuf) \
-	tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf) \
-	tmp/external/fastjet/GhostedAreaSpec.$(ObjSuf) \
-	tmp/external/fastjet/JetDefinition.$(ObjSuf) \
-	tmp/external/fastjet/LazyTiling25.$(ObjSuf) \
-	tmp/external/fastjet/LazyTiling9.$(ObjSuf) \
-	tmp/external/fastjet/LazyTiling9Alt.$(ObjSuf) \
-	tmp/external/fastjet/LazyTiling9SeparateGhosts.$(ObjSuf) \
-	tmp/external/fastjet/LimitedWarning.$(ObjSuf) \
 	tmp/external/fastjet/MinHeap.$(ObjSuf) \
 	tmp/external/fastjet/PseudoJet.$(ObjSuf) \
-	tmp/external/fastjet/PseudoJetStructureBase.$(ObjSuf) \
-	tmp/external/fastjet/RangeDefinition.$(ObjSuf) \
-	tmp/external/fastjet/RectangularGrid.$(ObjSuf) \
-	tmp/external/fastjet/Selector.$(ObjSuf) \
-	tmp/external/fastjet/TilingExtent.$(ObjSuf) \
-	tmp/external/fastjet/Voronoi.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/MeasureDefinition.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/Njettiness.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/Nsubjettiness.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/TauComponents.$(ObjSuf) \
-	tmp/external/fastjet/contribs/Nsubjettiness/XConePlugin.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/BottomUpSoftDrop.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/IteratedSoftDrop.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/ModifiedMassDropTagger.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/Recluster.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/RecursiveSoftDrop.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/RecursiveSymmetryCutBase.$(ObjSuf) \
-	tmp/external/fastjet/contribs/RecursiveTools/SoftDrop.$(ObjSuf) \
-	tmp/external/fastjet/contribs/SoftKiller/SoftKiller.$(ObjSuf) \
-	tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf) \
+	tmp/external/fastjet/Dnn3piCylinder.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequence_CP2DChan.$(ObjSuf) \
+	tmp/external/fastjet/ClusterSequenceVoronoiArea.$(ObjSuf) \
+	tmp/external/fastjet/ClosestPair2D.$(ObjSuf) \
+	tmp/external/fastjet/FunctionOfPseudoJet.$(ObjSuf) \
+	tmp/external/fastjet/AreaDefinition.$(ObjSuf) \
+	tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf) \
+	tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
+	tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf) \
+	tmp/external/fastjet/tools/Subtractor.$(ObjSuf) \
+	tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf) \
+	tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf) \
+	tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf) \
+	tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf) \
+	tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf) \
+	tmp/external/fastjet/tools/Filter.$(ObjSuf) \
+	tmp/external/fastjet/tools/Pruner.$(ObjSuf) \
 	tmp/external/fastjet/plugins/ATLASCone/ATLASConePlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf) \
 	tmp/external/fastjet/plugins/ATLASCone/Jet.$(ObjSuf) \
-	tmp/external/fastjet/plugins/ATLASCone/JetConeFinderTool.$(ObjSuf) \
 	tmp/external/fastjet/plugins/ATLASCone/JetSplitMergeTool.$(ObjSuf) \
+	tmp/external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/TrackJet/TrackJetPlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf) \
 	tmp/external/fastjet/plugins/CDFCones/CDFJetCluPlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/CDFCones/CDFMidPointPlugin.$(ObjSuf) \
 	tmp/external/fastjet/plugins/CDFCones/JetCluAlgorithm.$(ObjSuf) \
-	tmp/external/fastjet/plugins/CDFCones/MidPointAlgorithm.$(ObjSuf) \
+	tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/geom_2d.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/siscone.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/quadtree.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf) \
+	tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf) \
 	tmp/external/fastjet/plugins/CMSIterativeCone/CMSIterativeConePlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/D0RunICone/D0RunIBaseConePlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/D0RunIICone/D0RunIIConePlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf) \
 	tmp/external/fastjet/plugins/GridJet/GridJetPlugin.$(ObjSuf) \
 	tmp/external/fastjet/plugins/Jade/JadePlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/NestedDefs/NestedDefsPlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/SISConePlugin.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/area.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/geom_2d.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/hash.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/momentum.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/protocones.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/quadtree.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/ranlux.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/reference.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/siscone.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/siscone_error.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/split_merge.$(ObjSuf) \
-	tmp/external/fastjet/plugins/SISCone/vicinity.$(ObjSuf) \
-	tmp/external/fastjet/plugins/TrackJet/TrackJetPlugin.$(ObjSuf) \
-	tmp/external/fastjet/tools/BackgroundEstimatorBase.$(ObjSuf) \
-	tmp/external/fastjet/tools/CASubJetTagger.$(ObjSuf) \
-	tmp/external/fastjet/tools/Filter.$(ObjSuf) \
-	tmp/external/fastjet/tools/GridMedianBackgroundEstimator.$(ObjSuf) \
-	tmp/external/fastjet/tools/JHTopTagger.$(ObjSuf) \
-	tmp/external/fastjet/tools/JetMedianBackgroundEstimator.$(ObjSuf) \
-	tmp/external/fastjet/tools/MassDropTagger.$(ObjSuf) \
-	tmp/external/fastjet/tools/Pruner.$(ObjSuf) \
-	tmp/external/fastjet/tools/Recluster.$(ObjSuf) \
-	tmp/external/fastjet/tools/RestFrameNSubjettinessTagger.$(ObjSuf) \
-	tmp/external/fastjet/tools/Subtractor.$(ObjSuf) \
-	tmp/external/fastjet/tools/TopTaggerBase.$(ObjSuf) \
-	tmp/modules/FastJetFinder.$(ObjSuf) \
-	tmp/modules/FastJetGridMedianEstimator.$(ObjSuf) \
-	tmp/modules/RunPUPPI.$(ObjSuf)
-
-ifeq ($(HAS_PYTHIA8),true)
-FASTJET_OBJ +=  \
-	
-endif
-
-tmp/display/Delphes3DGeometry.$(ObjSuf): \
-	display/Delphes3DGeometry.$(SrcSuf) \
-	display/Delphes3DGeometry.h \
-	classes/DelphesClasses.h \
-	external/ExRootAnalysis/ExRootConfReader.h
-tmp/display/DelphesBranchElement.$(ObjSuf): \
-	display/DelphesBranchElement.$(SrcSuf) \
-	display/DelphesBranchElement.h \
-	classes/DelphesClasses.h
-tmp/display/DelphesCaloData.$(ObjSuf): \
-	display/DelphesCaloData.$(SrcSuf) \
-	display/DelphesCaloData.h
-tmp/display/DelphesDisplay.$(ObjSuf): \
-	display/DelphesDisplay.$(SrcSuf) \
-	display/DelphesDisplay.h
-tmp/display/DelphesEventDisplay.$(ObjSuf): \
-	display/DelphesEventDisplay.$(SrcSuf) \
-	display/Delphes3DGeometry.h \
-	display/DelphesBranchElement.h \
-	display/DelphesCaloData.h \
-	display/DelphesDisplay.h \
-	display/DelphesEventDisplay.h \
-	display/DelphesHtmlSummary.h \
-	display/DelphesPlotSummary.h \
-	classes/DelphesClasses.h \
-	external/ExRootAnalysis/ExRootConfReader.h \
-	external/ExRootAnalysis/ExRootTreeReader.h
-tmp/display/DelphesHtmlSummary.$(ObjSuf): \
-	display/DelphesHtmlSummary.$(SrcSuf) \
-	display/DelphesHtmlSummary.h
-tmp/display/DelphesPlotSummary.$(ObjSuf): \
-	display/DelphesPlotSummary.$(SrcSuf) \
-	display/DelphesPlotSummary.h
-DISPLAY_OBJ +=  \
-	tmp/display/Delphes3DGeometry.$(ObjSuf) \
-	tmp/display/DelphesBranchElement.$(ObjSuf) \
-	tmp/display/DelphesCaloData.$(ObjSuf) \
-	tmp/display/DelphesDisplay.$(ObjSuf) \
-	tmp/display/DelphesEventDisplay.$(ObjSuf) \
-	tmp/display/DelphesHtmlSummary.$(ObjSuf) \
-	tmp/display/DelphesPlotSummary.$(ObjSuf)
-
-ifeq ($(HAS_PYTHIA8),true)
-DISPLAY_OBJ +=  \
-	
-endif
-
+	tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf)
+
+tmp/external/tcl/tclObj.$(ObjSuf): \
+	external/tcl/tclObj.c
+tmp/external/tcl/tclUtil.$(ObjSuf): \
+	external/tcl/tclUtil.c
+tmp/external/tcl/tclAsync.$(ObjSuf): \
+	external/tcl/tclAsync.c
+tmp/external/tcl/tclPosixStr.$(ObjSuf): \
+	external/tcl/tclPosixStr.c
+tmp/external/tcl/tclCompile.$(ObjSuf): \
+	external/tcl/tclCompile.c
+tmp/external/tcl/tclHistory.$(ObjSuf): \
+	external/tcl/tclHistory.c
+tmp/external/tcl/tclResolve.$(ObjSuf): \
+	external/tcl/tclResolve.c
+tmp/external/tcl/tclParse.$(ObjSuf): \
+	external/tcl/tclParse.c
+tmp/external/tcl/tclVar.$(ObjSuf): \
+	external/tcl/tclVar.c
+tmp/external/tcl/tclIndexObj.$(ObjSuf): \
+	external/tcl/tclIndexObj.c
+tmp/external/tcl/tclCkalloc.$(ObjSuf): \
+	external/tcl/tclCkalloc.c
+tmp/external/tcl/tclListObj.$(ObjSuf): \
+	external/tcl/tclListObj.c
+tmp/external/tcl/tclHash.$(ObjSuf): \
+	external/tcl/tclHash.c
+tmp/external/tcl/tclCmdIL.$(ObjSuf): \
+	external/tcl/tclCmdIL.c
+tmp/external/tcl/tclStringObj.$(ObjSuf): \
+	external/tcl/tclStringObj.c
+tmp/external/tcl/tclAlloc.$(ObjSuf): \
+	external/tcl/tclAlloc.c
+tmp/external/tcl/tclCompExpr.$(ObjSuf): \
+	external/tcl/tclCompExpr.c
+tmp/external/tcl/tclLink.$(ObjSuf): \
+	external/tcl/tclLink.c
+tmp/external/tcl/tclCmdAH.$(ObjSuf): \
+	external/tcl/tclCmdAH.c
 tmp/external/tcl/panic.$(ObjSuf): \
 	external/tcl/panic.c
-tmp/external/tcl/tclAlloc.$(ObjSuf): \
-	external/tcl/tclAlloc.c
-tmp/external/tcl/tclAsync.$(ObjSuf): \
-	external/tcl/tclAsync.c
 tmp/external/tcl/tclBasic.$(ObjSuf): \
 	external/tcl/tclBasic.c
-tmp/external/tcl/tclCkalloc.$(ObjSuf): \
-	external/tcl/tclCkalloc.c
-tmp/external/tcl/tclCmdAH.$(ObjSuf): \
-	external/tcl/tclCmdAH.c
-tmp/external/tcl/tclCmdIL.$(ObjSuf): \
-	external/tcl/tclCmdIL.c
+tmp/external/tcl/tclPreserve.$(ObjSuf): \
+	external/tcl/tclPreserve.c
+tmp/external/tcl/tclGet.$(ObjSuf): \
+	external/tcl/tclGet.c
+tmp/external/tcl/tclNamesp.$(ObjSuf): \
+	external/tcl/tclNamesp.c
+tmp/external/tcl/tclProc.$(ObjSuf): \
+	external/tcl/tclProc.c
+tmp/external/tcl/tclExecute.$(ObjSuf): \
+	external/tcl/tclExecute.c
 tmp/external/tcl/tclCmdMZ.$(ObjSuf): \
 	external/tcl/tclCmdMZ.c
-tmp/external/tcl/tclCompExpr.$(ObjSuf): \
-	external/tcl/tclCompExpr.c
-tmp/external/tcl/tclCompile.$(ObjSuf): \
-	external/tcl/tclCompile.c
-tmp/external/tcl/tclExecute.$(ObjSuf): \
-	external/tcl/tclExecute.c
-tmp/external/tcl/tclGet.$(ObjSuf): \
-	external/tcl/tclGet.c
-tmp/external/tcl/tclHash.$(ObjSuf): \
-	external/tcl/tclHash.c
-tmp/external/tcl/tclIndexObj.$(ObjSuf): \
-	external/tcl/tclIndexObj.c
-tmp/external/tcl/tclLink.$(ObjSuf): \
-	external/tcl/tclLink.c
-tmp/external/tcl/tclListObj.$(ObjSuf): \
-	external/tcl/tclListObj.c
-tmp/external/tcl/tclNamesp.$(ObjSuf): \
-	external/tcl/tclNamesp.c
-tmp/external/tcl/tclObj.$(ObjSuf): \
-	external/tcl/tclObj.c
-tmp/external/tcl/tclParse.$(ObjSuf): \
-	external/tcl/tclParse.c
-tmp/external/tcl/tclPreserve.$(ObjSuf): \
-	external/tcl/tclPreserve.c
-tmp/external/tcl/tclProc.$(ObjSuf): \
-	external/tcl/tclProc.c
-tmp/external/tcl/tclResolve.$(ObjSuf): \
-	external/tcl/tclResolve.c
-tmp/external/tcl/tclStringObj.$(ObjSuf): \
-	external/tcl/tclStringObj.c
-tmp/external/tcl/tclUtil.$(ObjSuf): \
-	external/tcl/tclUtil.c
-tmp/external/tcl/tclVar.$(ObjSuf): \
-	external/tcl/tclVar.c
-TCL_OBJ +=  \
+TCL_OBJ =  \
+	tmp/external/tcl/tclObj.$(ObjSuf) \
+	tmp/external/tcl/tclUtil.$(ObjSuf) \
+	tmp/external/tcl/tclAsync.$(ObjSuf) \
+	tmp/external/tcl/tclPosixStr.$(ObjSuf) \
+	tmp/external/tcl/tclCompile.$(ObjSuf) \
+	tmp/external/tcl/tclHistory.$(ObjSuf) \
+	tmp/external/tcl/tclResolve.$(ObjSuf) \
+	tmp/external/tcl/tclParse.$(ObjSuf) \
+	tmp/external/tcl/tclVar.$(ObjSuf) \
+	tmp/external/tcl/tclIndexObj.$(ObjSuf) \
+	tmp/external/tcl/tclCkalloc.$(ObjSuf) \
+	tmp/external/tcl/tclListObj.$(ObjSuf) \
+	tmp/external/tcl/tclHash.$(ObjSuf) \
+	tmp/external/tcl/tclCmdIL.$(ObjSuf) \
+	tmp/external/tcl/tclStringObj.$(ObjSuf) \
+	tmp/external/tcl/tclAlloc.$(ObjSuf) \
+	tmp/external/tcl/tclCompExpr.$(ObjSuf) \
+	tmp/external/tcl/tclLink.$(ObjSuf) \
+	tmp/external/tcl/tclCmdAH.$(ObjSuf) \
 	tmp/external/tcl/panic.$(ObjSuf) \
-	tmp/external/tcl/tclAlloc.$(ObjSuf) \
-	tmp/external/tcl/tclAsync.$(ObjSuf) \
 	tmp/external/tcl/tclBasic.$(ObjSuf) \
-	tmp/external/tcl/tclCkalloc.$(ObjSuf) \
-	tmp/external/tcl/tclCmdAH.$(ObjSuf) \
-	tmp/external/tcl/tclCmdIL.$(ObjSuf) \
-	tmp/external/tcl/tclCmdMZ.$(ObjSuf) \
-	tmp/external/tcl/tclCompExpr.$(ObjSuf) \
-	tmp/external/tcl/tclCompile.$(ObjSuf) \
+	tmp/external/tcl/tclPreserve.$(ObjSuf) \
+	tmp/external/tcl/tclGet.$(ObjSuf) \
+	tmp/external/tcl/tclNamesp.$(ObjSuf) \
+	tmp/external/tcl/tclProc.$(ObjSuf) \
 	tmp/external/tcl/tclExecute.$(ObjSuf) \
-	tmp/external/tcl/tclGet.$(ObjSuf) \
-	tmp/external/tcl/tclHash.$(ObjSuf) \
-	tmp/external/tcl/tclIndexObj.$(ObjSuf) \
-	tmp/external/tcl/tclLink.$(ObjSuf) \
-	tmp/external/tcl/tclListObj.$(ObjSuf) \
-	tmp/external/tcl/tclNamesp.$(ObjSuf) \
-	tmp/external/tcl/tclObj.$(ObjSuf) \
-	tmp/external/tcl/tclParse.$(ObjSuf) \
-	tmp/external/tcl/tclPreserve.$(ObjSuf) \
-	tmp/external/tcl/tclProc.$(ObjSuf) \
-	tmp/external/tcl/tclResolve.$(ObjSuf) \
-	tmp/external/tcl/tclStringObj.$(ObjSuf) \
-	tmp/external/tcl/tclUtil.$(ObjSuf) \
-	tmp/external/tcl/tclVar.$(ObjSuf)
-
-modules/DenseTrackFilter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/VertexFinderDA4D.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/TrackSmearing.h: \
-	classes/DelphesModule.h
+	tmp/external/tcl/tclCmdMZ.$(ObjSuf)
+
+external/fastjet/internal/ClosestPair2D.hh: \
+	external/fastjet/internal/ClosestPair2DBase.hh \
+	external/fastjet/internal/SearchTree.hh \
+	external/fastjet/internal/MinHeap.hh
 	@touch $@
 
 external/fastjet/ClusterSequence.hh: \
+	external/fastjet/internal/DynamicNearestNeighbours.hh \
 	external/fastjet/PseudoJet.hh \
 	external/fastjet/Error.hh \
@@ -1951,21 +936,5 @@
 	external/fastjet/LimitedWarning.hh \
 	external/fastjet/FunctionOfPseudoJet.hh \
-	external/fastjet/ClusterSequenceStructure.hh \
-	external/fastjet/internal/deprecated.hh
-	@touch $@
-
-external/fastjet/internal/ClosestPair2D.hh: \
-	external/fastjet/internal/ClosestPair2DBase.hh \
-	external/fastjet/internal/SearchTree.hh \
-	external/fastjet/internal/MinHeap.hh \
-	external/fastjet/SharedPtr.hh
-	@touch $@
-
-modules/FastJetGridMedianEstimator.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/LLPFilter.h: \
-	classes/DelphesModule.h
+	external/fastjet/ClusterSequenceStructure.hh
 	@touch $@
 
@@ -1993,13 +962,11 @@
 	@touch $@
 
+modules/ConstituentFilter.h: \
+	classes/DelphesModule.h
+	@touch $@
+
 external/fastjet/JetDefinition.hh: \
 	external/fastjet/internal/numconsts.hh \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/internal/deprecated.hh \
-	external/fastjet/ClusterSequence.hh
-	@touch $@
-
-modules/ConstituentFilter.h: \
-	classes/DelphesModule.h
+	external/fastjet/PseudoJet.hh
 	@touch $@
 
@@ -2012,29 +979,13 @@
 	@touch $@
 
-modules/AngularSmearing.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/IdentificationMap.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/TrackCovariance.h: \
+modules/Isolation.h: \
+	classes/DelphesModule.h
+	@touch $@
+
+modules/Merger.h: \
 	classes/DelphesModule.h
 	@touch $@
 
 modules/ExampleModule.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/Merger.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/Isolation.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/EnergyScale.h: \
 	classes/DelphesModule.h
 	@touch $@
@@ -2046,4 +997,8 @@
 	@touch $@
 
+modules/JetPileUpSubtractor.h: \
+	classes/DelphesModule.h
+	@touch $@
+
 external/fastjet/Selector.hh: \
 	external/fastjet/PseudoJet.hh \
@@ -2051,32 +1006,10 @@
 	@touch $@
 
-modules/JetPileUpSubtractor.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-external/fastjet/contribs/Nsubjettiness/Njettiness.hh: \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/SharedPtr.hh
-	@touch $@
-
-external/fastjet/internal/LazyTiling25.hh: \
-	external/fastjet/internal/MinHeap.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/internal/LazyTiling9Alt.hh \
-	external/fastjet/internal/LazyTiling9.hh
-	@touch $@
-
 external/fastjet/Error.hh: \
-	external/fastjet/internal/base.hh \
-	external/fastjet/config.h \
-	external/fastjet/LimitedWarning.hh
-	@touch $@
-
-modules/DecayFilter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-external/fastjet/internal/TilingExtent.hh: \
-	external/fastjet/ClusterSequence.hh
+	external/fastjet/internal/base.hh
+	@touch $@
+
+modules/Efficiency.h: \
+	classes/DelphesModule.h
 	@touch $@
 
@@ -2085,11 +1018,6 @@
 	@touch $@
 
-modules/Efficiency.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 external/fastjet/tools/GridMedianBackgroundEstimator.hh: \
-	external/fastjet/tools/BackgroundEstimatorBase.hh \
-	external/fastjet/RectangularGrid.hh
+	external/fastjet/tools/BackgroundEstimatorBase.hh
 	@touch $@
 
@@ -2108,12 +1036,4 @@
 	@touch $@
 
-modules/JetFakeParticle.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/OldCalorimeter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 external/fastjet/ClusterSequence1GhostPassiveArea.hh: \
 	external/fastjet/PseudoJet.hh \
@@ -2122,55 +1042,5 @@
 	@touch $@
 
-external/fastjet/internal/LazyTiling9Alt.hh: \
-	external/fastjet/internal/MinHeap.hh \
-	external/fastjet/ClusterSequence.hh
-	@touch $@
-
-modules/TrackCountingTauTagging.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
-	external/fastjet/JetDefinition.hh \
-	external/fastjet/ClusterSequence.hh
-	@touch $@
-
-external/fastjet/RectangularGrid.hh: \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/Selector.hh
-	@touch $@
-
 modules/PileUpMerger.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh: \
-	external/fastjet/PseudoJet.hh \
-	external/fastjet/JetDefinition.hh
-	@touch $@
-
-display/DelphesBranchElement.h: \
-	display/DelphesCaloData.h
-	@touch $@
-
-modules/TimeOfFlight.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/JetDefinition.hh
-	@touch $@
-
-external/fastjet/internal/DynamicNearestNeighbours.hh: \
-	external/fastjet/internal/numconsts.hh \
-	external/fastjet/Error.hh
-	@touch $@
-
-modules/RunPUPPI.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/Cloner.h: \
 	classes/DelphesModule.h
 	@touch $@
@@ -2184,8 +1054,4 @@
 	@touch $@
 
-modules/PhotonID.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 external/fastjet/tools/Pruner.hh: \
 	external/fastjet/ClusterSequence.hh \
@@ -2194,14 +1060,4 @@
 	@touch $@
 
-external/fastjet/internal/LazyTiling9.hh: \
-	external/fastjet/internal/MinHeap.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/internal/LazyTiling9Alt.hh
-	@touch $@
-
-modules/PileUpJetID.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 external/fastjet/version.hh: \
 	external/fastjet/config.h
@@ -2213,7 +1069,4 @@
 
 modules/TauTagging.h: \
-	external/ExRootAnalysis/ExRootClassifier.h \
-	external/ExRootAnalysis/ExRootFilter.h \
-	external/ExRootAnalysis/ExRootResult.h \
 	classes/DelphesModule.h
 	@touch $@
@@ -2223,6 +1076,5 @@
 	external/fastjet/internal/BasicRandom.hh \
 	external/fastjet/Selector.hh \
-	external/fastjet/LimitedWarning.hh \
-	external/fastjet/internal/deprecated.hh
+	external/fastjet/LimitedWarning.hh
 	@touch $@
 
@@ -2233,25 +1085,9 @@
 	@touch $@
 
-modules/VertexSorter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 modules/Delphes.h: \
 	classes/DelphesModule.h
 	@touch $@
 
-modules/VertexFinder.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 modules/UniqueObjectFinder.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/TrackCountingBTagging.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/PileUpMergerPythia8.h: \
 	classes/DelphesModule.h
 	@touch $@
@@ -2263,23 +1099,6 @@
 	@touch $@
 
-modules/JetFlavorAssociation.h: \
-	classes/DelphesClasses.h \
-	classes/DelphesModule.h
-	@touch $@
-
 modules/ParticlePropagator.h: \
 	classes/DelphesModule.h
-	@touch $@
-
-modules/PdgCodeFilter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/TruthVertexFinder.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-classes/DelphesSTDHEPReader.h: \
-	classes/DelphesXDRReader.h
 	@touch $@
 
@@ -2288,17 +1107,8 @@
 	@touch $@
 
-external/PUPPI/PuppiContainer.hh: \
-	external/fastjet/PseudoJet.hh
-	@touch $@
-
 external/fastjet/RangeDefinition.hh: \
 	external/fastjet/PseudoJet.hh \
 	external/fastjet/Error.hh \
-	external/fastjet/LimitedWarning.hh \
-	external/fastjet/internal/deprecated.hh
-	@touch $@
-
-modules/CscClusterEfficiency.h: \
-	classes/DelphesModule.h
+	external/fastjet/LimitedWarning.hh
 	@touch $@
 
@@ -2310,10 +1120,5 @@
 	external/fastjet/ClusterSequence.hh \
 	external/fastjet/LimitedWarning.hh \
-	external/fastjet/Selector.hh \
-	external/fastjet/internal/deprecated.hh
-	@touch $@
-
-modules/PhotonConversions.h: \
-	classes/DelphesModule.h
+	external/fastjet/Selector.hh
 	@touch $@
 
@@ -2328,38 +1133,6 @@
 	@touch $@
 
-modules/RecoPuFilter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/Hector.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/ImpactParameterSmearing.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-display/DelphesPlotSummary.h: \
-	external/ExRootAnalysis/ExRootTreeReader.h
-	@touch $@
-
-modules/Weighter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/TaggingParticlesSkimmer.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 external/fastjet/internal/BasicRandom.hh: \
 	external/fastjet/internal/base.hh
-	@touch $@
-
-modules/ClusterCounting.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/SimpleCalorimeter.h: \
-	classes/DelphesModule.h
 	@touch $@
 
@@ -2374,13 +1147,10 @@
 
 external/fastjet/tools/Subtractor.hh: \
-	external/fastjet/internal/base.hh \
 	external/fastjet/tools/Transformer.hh \
 	external/fastjet/tools/BackgroundEstimatorBase.hh
 	@touch $@
 
-external/fastjet/internal/LazyTiling9SeparateGhosts.hh: \
-	external/fastjet/internal/MinHeap.hh \
-	external/fastjet/ClusterSequence.hh \
-	external/fastjet/internal/LazyTiling9Alt.hh
+external/fastjet/AreaDefinition.hh: \
+	external/fastjet/GhostedAreaSpec.hh
 	@touch $@
 
@@ -2391,22 +1161,6 @@
 	@touch $@
 
-external/fastjet/AreaDefinition.hh: \
-	external/fastjet/GhostedAreaSpec.hh
-	@touch $@
-
-modules/ParticleDensity.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 modules/TreeWriter.h: \
 	classes/DelphesModule.h
-	@touch $@
-
-modules/TimeSmearing.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh: \
-	external/fastjet/FunctionOfPseudoJet.hh
 	@touch $@
 
@@ -2421,16 +1175,12 @@
 	@touch $@
 
+external/fastjet/config.h: \
+	external/fastjet/config_win.h
+	@touch $@
+
 external/fastjet/LimitedWarning.hh: \
 	external/fastjet/internal/base.hh
 	@touch $@
 
-external/fastjet/config.h: \
-	external/fastjet/config_win.h
-	@touch $@
-
-modules/CscClusterId.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 classes/DelphesClasses.h: \
 	classes/SortableObject.h
@@ -2446,83 +1196,47 @@
 	@touch $@
 
-modules/BeamSpotFilter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
-modules/DualReadoutCalorimeter.h: \
-	classes/DelphesModule.h
-	@touch $@
-
 
 
 ###
 
-ifeq ($(ROOT_MAJOR),6)
-all: $(NOFASTJET) $(DELPHES) $(DELPHES_DICT_PCM) $(FASTJET_DICT_PCM) $(EXECUTABLE)
-display: $(DISPLAY) $(DISPLAY_DICT_PCM)
-else
-all: $(NOFASTJET) $(DELPHES) $(EXECUTABLE)
-display: $(DISPLAY)
-endif
-
-$(NOFASTJET): $(DELPHES_DICT_OBJ) $(DELPHES_OBJ) $(TCL_OBJ)
+all: $(SHARED) $(EXECUTABLE) $(STDHEP_EXECUTABLE)
+
+$(SHARED): $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ)
 	@mkdir -p $(@D)
 	@echo ">> Building $@"
+ifeq ($(ARCH),aix5)
+	@$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
+else
 ifeq ($(PLATFORM),macosx)
-	@$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
+# We need to make both the .dylib and the .so
+	@$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
+ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ifeq ($(MACOSX_MINOR),4)
+	@ln -sf $@ $(subst .$(DllSuf),.so,$@)
+endif
+endif
 else
 ifeq ($(PLATFORM),win32)
 	@bindexplib $* $^ > $*.def
-	@lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(NOFASTJETLIB)
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DELPHES_LIBS) $(OutPutOpt)$@
+	@lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(SHAREDLIB)
+	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) $(OutPutOpt)$@
 	@$(MT_DLL)
 else
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
+	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(LIBS)
+	@$(MT_DLL)
 endif
 endif
-
-$(DELPHES): $(DELPHES_DICT_OBJ) $(FASTJET_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(TCL_OBJ)
-	@mkdir -p $(@D)
-	@echo ">> Building $@"
-ifeq ($(PLATFORM),macosx)
-	@$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
-else
-ifeq ($(PLATFORM),win32)
-	@bindexplib $* $^ > $*.def
-	@lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DELPHESLIB)
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DELPHES_LIBS) $(OutPutOpt)$@
-	@$(MT_DLL)
-else
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DELPHES_LIBS)
 endif
-endif
-
-$(DISPLAY): $(DELPHES_DICT_OBJ) $(FASTJET_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ)
-	@mkdir -p $(@D)
-	@echo ">> Building $@"
-ifeq ($(PLATFORM),macosx)
-	@$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
-else
-ifeq ($(PLATFORM),win32)
-	@bindexplib $* $^ > $*.def
-	@lib -nologo -MACHINE:IX86 $^ -def:$*.def $(OutPutOpt)$(DISPLAYLIB)
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(DISPLAY_LIBS) $(OutPutOpt)$@
-	@$(MT_DLL)
-else
-	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(DISPLAY_LIBS)
-endif
-endif
 
 clean:
-	@rm -f $(DELPHES_DICT_OBJ) $(DISPLAY_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(DISPLAY_OBJ) $(TCL_OBJ) core
-	@rm -rf tmp
+	@rm -f $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ) $(STDHEP_OBJ) core
 
 distclean: clean
-	@rm -f $(NOFASTJET) $(NOFASTJETLIB) $(DELPHES) $(DELPHESLIB) $(DELPHES_DICT_PCM) $(FASTJET_DICT_PCM) $(DISPLAY) $(DISPLAYLIB) $(DISPLAY_DICT_PCM) $(EXECUTABLE)
+	@rm -f $(SHARED) $(SHAREDLIB) $(EXECUTABLE)
 
 dist:
 	@echo ">> Building $(DISTTAR)"
 	@mkdir -p $(DISTDIR)
-	@cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb Makefile MinBias.pileup configure cards classes cmake converters display doc examples external modules python readers validation $(DISTDIR)
+	@cp -a CREDITS README VERSION Makefile configure classes converters doc examples external modules readers $(DISTDIR)
 	@find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
 	@tar -czf $(DISTTAR) $(DISTDIR)
@@ -2531,5 +1245,5 @@
 ###
 
-.SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf) $(PcmSuf)
+.SUFFIXES: .$(SrcSuf) .$(ObjSuf) .$(DllSuf)
 
 %Dict.$(SrcSuf):
@@ -2537,54 +1251,24 @@
 	@echo ">> Generating $@"
 	@rootcint -f $@ -c -Iexternal $<
+	@echo "#define private public" > $@.arch
+	@echo "#define protected public" >> $@.arch
 	@mv $@ $@.base
-	@cat $< $@.base > $@
-	@rm $@.base
-
-$(DELPHES_DICT_PCM): %Dict$(PcmSuf):
-	@echo ">> Copying $@"
-	@cp $< $@
-
-$(FASTJET_DICT_PCM): %Dict$(PcmSuf):
-	@echo ">> Copying $@"
-	@cp $< $@
-
-$(DISPLAY_DICT_PCM): %Dict$(PcmSuf):
-	@echo ">> Copying $@"
-	@cp $< $@
-
-$(DELPHES_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
+	@cat $@.arch $< $@.base > $@
+	@rm $@.arch $@.base
+
+$(SOURCE_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
 	@mkdir -p $(@D)
 	@echo ">> Compiling $<"
 	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(FASTJET_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
+$(DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
 	@mkdir -p $(@D)
 	@echo ">> Compiling $<"
 	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(DISPLAY_OBJ): tmp/%.$(ObjSuf): %.$(SrcSuf)
-	@mkdir -p $(@D)
-	@echo ">> Compiling $<"
-	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
-
-$(DELPHES_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
-	@mkdir -p $(@D)
-	@echo ">> Compiling $<"
-	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
-
-$(FASTJET_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
-	@mkdir -p $(@D)
-	@echo ">> Compiling $<"
-	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
-
-$(DISPLAY_DICT_OBJ): %.$(ObjSuf): %.$(SrcSuf)
-	@mkdir -p $(@D)
-	@echo ">> Compiling $<"
-	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
-
 $(TCL_OBJ): tmp/%.$(ObjSuf): %.c
 	@mkdir -p $(@D)
 	@echo ">> Compiling $<"
-	@$(CC) $(patsubst -std=%,,$(CXXFLAGS)) -c $< $(OutPutOpt)$@
+	@gcc $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
 $(EXECUTABLE_OBJ): tmp/%.$(ObjSuf): %.cpp
@@ -2593,7 +1277,7 @@
 	@$(CXX) $(CXXFLAGS) -c $< $(OutPutOpt)$@
 
-$(EXECUTABLE): %$(ExeSuf): $(DELPHES_DICT_OBJ) $(FASTJET_DICT_OBJ) $(DELPHES_OBJ) $(FASTJET_OBJ) $(TCL_OBJ)
+$(EXECUTABLE): %$(ExeSuf): $(DICT_OBJ) $(SOURCE_OBJ) $(TCL_OBJ)
 	@echo ">> Building $@"
-	@$(LD) $(LDFLAGS) $^ $(DELPHES_LIBS) $(OutPutOpt)$@
+	@$(LD) $(LDFLAGS) $^ $(LIBS) $(OutPutOpt)$@
 
 ###
