Changes in / [aafe927:d192152] in git

Files:

• Makefile (modified) (5 diffs)
• VERSION (added)
• cards/MuonCollider/MuonColliderDet_BTag_50.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_BTag_70.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_BTag_90.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_BTagging.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_JetFlavorAssociation.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_JetReco.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_JetSmearing.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_JetSmearing_1500.tcl (deleted)
• cards/MuonCollider/MuonColliderDet_TauTagging.tcl (deleted)
• cards/delphes_card_MuonColliderDet.tcl (deleted)
• doc/genMakefile.tcl (modified) (3 diffs)
• external/Hector/VERSION (added)
• external/fastjet/VERSION (added)
• external/fastjet/contribs/Nsubjettiness/VERSION (added)
• external/fastjet/contribs/RecursiveTools/VERSION (added)
• external/fastjet/contribs/SoftKiller/VERSION (added)
• external/fastjet/contribs/ValenciaPlugin/VERSION (added)
• external/tcl/VERSION (added)
• modules/FastJetFinder.cc (modified) (1 diff)
• readers/DelphesPythia8.cpp (modified) (2 diffs)
• validation/DelphesValidation.cpp (modified) (1 diff)
• validation/validation.sh (modified) (1 diff)

Makefile

@@ -89 +89 @@
 DISPLAYLIB = libDelphesDisplay.lib
 
-VERSION = x.y.z
+VERSION = $(shell cat VERSION)
 DISTDIR = Delphes-$(VERSION)
 DISTTAR = $(DISTDIR).tar.gz
@@ -174 +174 @@
 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 \
@@ -188 +199 @@
         stdhep2pileup$(ExeSuf) \
         CaloGrid$(ExeSuf) \
-        Example1$(ExeSuf)
+        Example1$(ExeSuf) \
+        DelphesValidation$(ExeSuf)
 
 EXECUTABLE_OBJ +=  \
@@ -198 +210 @@
         tmp/converters/stdhep2pileup.$(ObjSuf) \
         tmp/examples/CaloGrid.$(ObjSuf) \
-        tmp/examples/Example1.$(ObjSuf)
+        tmp/examples/Example1.$(ObjSuf) \
+        tmp/validation/DelphesValidation.$(ObjSuf)
 
 DelphesHepMC$(ExeSuf): \
@@ -2421 +2434 @@
         @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 converters display doc examples external modules python readers validation $(DISTDIR)
+        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
         @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
         @tar -czf $(DISTTAR) $(DISTDIR)

doc/genMakefile.tcl

@@ -282 +282 @@
 DISPLAYLIB = libDelphesDisplay.lib
 
-VERSION = x.y.z
+VERSION = $(shell cat VERSION)
 DISTDIR = Delphes-$(VERSION)
 DISTTAR = $(DISTDIR).tar.gz
@@ -290 +290 @@
 }
 
-executableDeps {converters/*.cpp} {examples/*.cpp}
+executableDeps {converters/*.cpp} {examples/*.cpp} {validation/*.cpp}
 
 executableDeps {readers/DelphesHepMC.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp}
@@ -434 +434 @@
         @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 converters display doc examples external modules python readers validation $(DISTDIR)
+        @cp -a AUTHORS CHANGELOG CMakeLists.txt COPYING DelphesEnv.sh LICENSE NOTICE README README_4LHCb VERSION Makefile MinBias.pileup configure cards classes converters display doc examples external modules python readers validation $(DISTDIR)
         @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \;
         @tar -czf $(DISTTAR) $(DISTDIR)

modules/FastJetFinder.cc

@@ -489 +489 @@
       fastjet::Filter trimmer(fastjet::JetDefinition(fastjet::kt_algorithm, fRTrim), fastjet::SelectorPtFractionMin(fPtFracTrim));
       fastjet::PseudoJet trimmed_jet = trimmer(*itOutputList);
-      
+
+      trimmed_jet = join(trimmed_jet.constituents());
+
       candidate->TrimmedP4[0].SetPtEtaPhiM(trimmed_jet.pt(), trimmed_jet.eta(), trimmed_jet.phi(), trimmed_jet.m());
 

readers/DelphesPythia8.cpp

@@ -296 +296 @@
 
     // jet matching
-#if PYTHIA_VERSION_INTEGER < 8300
     matching = combined->getHook(*pythia);
     if(!matching)
@@ -303 +302 @@
     }
     pythia->setUserHooksPtr(matching);
-#endif
 
     if(pythia == NULL)

validation/DelphesValidation.cpp

@@ -32 +32 @@
 #include "TGraph.h"
 #include "TGraphErrors.h"
-#include "TF1.h"
 #include "TH1.h"
 #include "TH2.h"

validation/validation.sh

@@ -38 +38 @@
 outputrootdir=report_${cardbase%.*}/root
 cardlabel=${cardbase%.*}
-version=x.y.z
+version=$(cat VERSION)
 outpdf=$mainoutputdir/${output%.*}.pdf
 cardsdir=validation/cards