Changes in / [25291dd:4e5ed02] in git
- Files:
-
- 8 added
- 23 deleted
- 28 edited
-
Makefile (modified) (5 diffs)
-
VERSION (added)
-
cards/CLIC/CLICdet_BeamCalF_Binning.tcl (deleted)
-
cards/CLIC/CLICdet_BeamCalR_Binning.tcl (deleted)
-
cards/CLIC/CLICdet_BeamCal_Efficiency_Stage3.tcl (deleted)
-
cards/CLIC/CLICdet_BeamCal_EnergyFractions.tcl (deleted)
-
cards/CLIC/CLICdet_BeamCal_Resolution_Stage3.tcl (deleted)
-
cards/CLIC/CLICdet_LumiCalF_Binning.tcl (deleted)
-
cards/CLIC/CLICdet_LumiCalR_Binning.tcl (deleted)
-
cards/CLIC/CLICdet_LumiCal_Efficiency_Stage3.tcl (deleted)
-
cards/CLIC/CLICdet_LumiCal_EnergyFractions.tcl (deleted)
-
cards/CLIC/CLICdet_LumiCal_Resolution_Stage3.tcl (deleted)
-
cards/FCC/FCChh.tcl (modified) (7 diffs)
-
cards/FCC/muonMomentumResolutionVsP.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_BTagging_N.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_BeamCalEfficiency.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_BeamCalF_Binning.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_BeamCalR_Binning.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_BeamCal_EnergyFractions.tcl (modified) (2 diffs)
-
cards/ILCgen/ILCgen_BeamCal_Resolution.tcl (modified) (2 diffs)
-
cards/ILCgen/ILCgen_CTagging_N.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ChrgHadMomentumSmearing.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ChrgHadTrackingEff.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ECAL_EnergyFractions.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ECAL_Resolution.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ElectronEfficiency.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ElectronMomentumSmearing.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_ElectronTrackingEff.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_HCAL_EnergyFractions.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_HCAL_Resolution.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_MuonMomentumSmearing.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_MuonTrackingEff.tcl (modified) (1 diff)
-
cards/ILCgen/ILCgen_PhotonEfficiency.tcl (modified) (1 diff)
-
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_TauTagging.tcl (deleted)
-
cards/delphes_card_CLICdet_Stage3_fcal.tcl (deleted)
-
cards/delphes_card_CircularEE.tcl (deleted)
-
cards/delphes_card_FCCeh.tcl (deleted)
-
cards/delphes_card_LHeC.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/DualReadoutCalorimeter.cc (modified) (1 diff)
-
modules/TrackCovariance.cc (modified) (3 diffs)
-
readers/DelphesPythia8.cpp (modified) (2 diffs)
-
validation/DelphesValidation.cpp (modified) (1 diff)
-
validation/validation.sh (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r25291dd r4e5ed02 89 89 DISPLAYLIB = libDelphesDisplay.lib 90 90 91 VERSION = x.y.z91 VERSION = $(shell cat VERSION) 92 92 DISTDIR = Delphes-$(VERSION) 93 93 DISTTAR = $(DISTDIR).tar.gz … … 174 174 tmp/examples/Example1.$(ObjSuf): \ 175 175 examples/Example1.cpp \ 176 classes/DelphesClasses.h \ 177 external/ExRootAnalysis/ExRootResult.h \ 178 external/ExRootAnalysis/ExRootTreeBranch.h \ 179 external/ExRootAnalysis/ExRootTreeReader.h \ 180 external/ExRootAnalysis/ExRootTreeWriter.h \ 181 external/ExRootAnalysis/ExRootUtilities.h 182 DelphesValidation$(ExeSuf): \ 183 tmp/validation/DelphesValidation.$(ObjSuf) 184 185 tmp/validation/DelphesValidation.$(ObjSuf): \ 186 validation/DelphesValidation.cpp \ 176 187 classes/DelphesClasses.h \ 177 188 external/ExRootAnalysis/ExRootResult.h \ … … 188 199 stdhep2pileup$(ExeSuf) \ 189 200 CaloGrid$(ExeSuf) \ 190 Example1$(ExeSuf) 201 Example1$(ExeSuf) \ 202 DelphesValidation$(ExeSuf) 191 203 192 204 EXECUTABLE_OBJ += \ … … 198 210 tmp/converters/stdhep2pileup.$(ObjSuf) \ 199 211 tmp/examples/CaloGrid.$(ObjSuf) \ 200 tmp/examples/Example1.$(ObjSuf) 212 tmp/examples/Example1.$(ObjSuf) \ 213 tmp/validation/DelphesValidation.$(ObjSuf) 201 214 202 215 DelphesHepMC$(ExeSuf): \ … … 2421 2434 @echo ">> Building $(DISTTAR)" 2422 2435 @mkdir -p $(DISTDIR) 2423 @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)2436 @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) 2424 2437 @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \; 2425 2438 @tar -czf $(DISTTAR) $(DISTDIR) -
cards/FCC/FCChh.tcl
r25291dd r4e5ed02 4 4 # Main authors: Michele Selvaggi (CERN) 5 5 # 6 # Released on: October 14th, 2020 7 # 8 # - fix muon resolution at high pT 9 # - updated btagging, tau tagging and photon ID 10 # 6 # Released on: Dec. 1st, 2017 11 7 # 12 8 # Configuration: FCC-hh baseline detector … … 1053 1049 (abs(eta) <= 2.5) * (pt > 1.0 && pt < 5.0) * (0.70) + 1054 1050 (abs(eta) <= 2.5) * (pt > 5.0 && pt < 10.0) * (0.85) + 1055 (abs(eta) <= 2.5) * (pt > 10.0) * (0.9 0) +1051 (abs(eta) <= 2.5) * (pt > 10.0) * (0.95) + 1056 1052 1057 1053 (abs(eta) > 2.5 && abs(eta) <= 4.0) * (pt > 1.0 && pt < 5.0) * (0.60) + … … 1142 1138 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.01)*(1.0 - pt/15000.) + \ 1143 1139 (abs(eta) < 2.5) * (pt > 15000.0) * (0.00) + \ 1144 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.0 1) + \1145 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.0 1)*(1.0 - pt/15000.) + \1140 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.0075) + \ 1141 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.0075)*(1.0 - pt/15000.) + \ 1146 1142 (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 15000.0) * (0.000) + \ 1147 1143 (abs(eta) > 4.0) * (0.00)} … … 1150 1146 1151 1147 (pt <= 10.0) * (0.00) + 1152 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0. 15) + \1153 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0. 15)*(1.0 - pt/15000.) + \1148 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0.05) + \ 1149 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.05)*(1.0 - pt/15000.) + \ 1154 1150 (abs(eta) < 2.5) * (pt > 15000.0) * (0.000) + \ 1155 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0. 10) + \1156 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0. 10)*(1.0 - pt/15000.) + \1151 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.03) + \ 1152 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.03)*(1.0 - pt/15000.) + \ 1157 1153 (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 15000.0) * (0.000) + \ 1158 1154 (abs(eta) > 4.0) * (0.00)} … … 1161 1157 1162 1158 (pt <= 10.0) * (0.00) + 1163 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0.8 2) +1164 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.8 2)*(1.0 - pt/15000.) +1159 (abs(eta) < 2.5) * (pt > 10.0 && pt < 500) * (0.85) + 1160 (abs(eta) < 2.5) * (pt > 500.0 && pt < 15000.0) * (0.85)*(1.0 - pt/15000.) + 1165 1161 (abs(eta) < 2.5) * (pt > 15000.0) * (0.000) + 1166 1162 (abs(eta) >= 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500) * (0.64) + … … 1221 1217 1222 1218 (pt <= 10.0) * (0.00) + 1223 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.0 2) + \1224 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.0 2) *(8./9. - pt/30000.) + \1219 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.01) + \ 1220 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.01) *(8./9. - pt/30000.) + \ 1225 1221 (abs(eta) < 2.5) * (pt > 34000.0) * (0.000) + \ 1226 1222 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 5000.0) * (0.0075) + \ … … 1232 1228 1233 1229 (pt <= 10.0) * (0.00) + 1234 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.00 1) + \1235 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.00 1) *(8./9. - pt/30000.) + \1230 (abs(eta) < 2.5) * (pt > 10.0 && pt < 5000.0) * (0.005) + \ 1231 (abs(eta) < 2.5) * (pt > 5000.0 && pt < 34000.0) * (0.005) *(8./9. - pt/30000.) + \ 1236 1232 (abs(eta) < 2.5) * (pt > 34000.0) * (0.000) + \ 1237 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 5000.0) * (0.00 1) + \1238 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 5000.0 && pt < 34000.0) * (0.00 1)*(8./9. - pt/30000.) + \1233 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 5000.0) * (0.00375) + \ 1234 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 5000.0 && pt < 34000.0) * (0.00375)*(8./9. - pt/30000.) + \ 1239 1235 (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 34000.0) * (0.00) + \ 1240 1236 (abs(eta) > 4.0) * (0.00)} -
cards/FCC/muonMomentumResolutionVsP.tcl
r25291dd r4e5ed02 12 12 set ResolutionFormula { 13 13 14 15 ( abs(eta) < 1.35 ) * 16 17 (sqrt(0.0000364164 + ( 18 3*9.06262e-8 *pt^2* cosh( 19 eta)^2 *(2.82074e-7/sin(2*atan(exp(-abs(eta))))^2 + ( 20 504.525 *(1/400000000 + (0.117945* 1/cosh(eta)^2)/( 21 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 22 sin(2*atan(exp(-abs(eta))))^2) *sin(2*atan(exp(-abs(eta))))^2)/( 23 0.00516429/sin(2*atan(exp(-abs(eta))))^2 + ( 24 96868.8 *(1/400000000 + 5*(0.117945 * 1/cosh(eta)^2)/( 25 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 26 sin(2*atan(exp(-abs(eta))))^2)) 27 28 ) + 14 ( abs(eta) < 1.35 ) * 15 16 (sqrt(0.0000364164 + ( 17 9.06262e-8 *pt^2* cosh( 18 eta)^2 *(2.82074e-7/sin(2*atan(exp(-abs(eta))))^2 + ( 19 504.525 *(1/400000000 + (0.117945* 1/cosh(eta)^2)/( 20 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 21 sin(2*atan(exp(-abs(eta))))^2) *sin(2*atan(exp(-abs(eta))))^2)/( 22 0.00516429/sin(2*atan(exp(-abs(eta))))^2 + ( 23 96868.8 *(1/400000000 + (0.117945 * 1/cosh(eta)^2)/( 24 pt^2 *sin(2*atan(exp(-abs(eta))))^2)))/ 25 sin(2*atan(exp(-abs(eta))))^2)) 26 27 ) + 29 28 30 29 ( abs(eta) > 1.35 && abs(eta) < 2.00) * -
cards/ILCgen/ILCgen_BTagging_N.tcl
r25291dd r4e5ed02 104 104 source ILCgen/ILCgen_BTagging_50.tcl 105 105 } 106 -
cards/ILCgen/ILCgen_BeamCalEfficiency.tcl
r25291dd r4e5ed02 2 2 # Based on IDR Figure 8.8a and Moritz Hebermehl PhD Thesis Figure 4.10 3 3 # A.F.Zarnecki, June 2020 4 5 # set EfficiencyFormula {efficiency formula as a function of eta and pt} 4 6 5 7 set EfficiencyFormula { -
cards/ILCgen/ILCgen_BeamCalF_Binning.tcl
r25291dd r4e5ed02 2 2 # corrected by A.F.Zarnecki 3 3 4 set pi [expr {acos(-1)} 5 4 set pi [expr {acos(-1)}] 5 6 6 # BeamCal eta range 4.0 - 5.8 -> 2.099-0.347 =1.752deg 7 7 # -
cards/ILCgen/ILCgen_BeamCalR_Binning.tcl
r25291dd r4e5ed02 2 2 # corrected by A.F.Zarnecki 3 3 4 set pi [expr {acos(-1)} 5 4 set pi [expr {acos(-1)}] 5 6 6 # BeamCal eta range 4.0 - 5.8 -> 2.099-0.347 =1.752deg 7 7 # -
cards/ILCgen/ILCgen_BeamCal_EnergyFractions.tcl
r25291dd r4e5ed02 1 1 #P.Sopicki 2 # default energy fractions {abs(PDG code)} {fraction of energy deposited in BeamCal} 2 3 3 4 add EnergyFraction {0} {0.0} … … 19 20 add EnergyFraction {310} {0.3} 20 21 add EnergyFraction {3122} {0.3} 22 -
cards/ILCgen/ILCgen_BeamCal_Resolution.tcl
r25291dd r4e5ed02 1 1 # P.Sopicki, corrected by A.F.Zarnecki 2 2 # BeamCal resolution 3 4 # set ResolutionFormula {resolution formula as a function of eta and energy} 3 5 4 6 set ResolutionFormula { … … 6 8 (abs(eta) > 4.8 && abs(eta) <= 5.8) * sqrt(energy^2*0.03^2 + energy*0.45^2) 7 9 } 10 -
cards/ILCgen/ILCgen_CTagging_N.tcl
r25291dd r4e5ed02 104 104 source ILCgen/ILCgen_CTagging_20.tcl 105 105 } 106 -
cards/ILCgen/ILCgen_ChrgHadMomentumSmearing.tcl
r25291dd r4e5ed02 6 6 7 7 set ResolutionFormula { 8 (abs(eta) <= 2.0) * 9 exp( -6.82012 - 0.284133*abs(eta) + 0.64585*eta*eta 8 9 (abs(eta) <= 2.0) * 10 exp( -6.82012 - 0.284133*abs(eta) + 0.64585*eta*eta 10 11 + (0.829675 -0.188197*abs(eta) + 0.106226 * eta*eta - 1.0) * log(pt) 11 12 + (0.0766417-0.00435667*abs(eta) + 0.00174804*eta*eta) * log(pt)*log(pt)) 12 + 13 (abs(eta) > 2.0 && abs(eta) <= 3.0) * 14 exp( -4.54609 13 14 + 15 16 (abs(eta) > 2.0 && abs(eta) <= 3.0) * 17 exp( -4.54609 15 18 + ( 0.87526 - 1.0) * log(pt) 16 19 + (-0.0800672 + 0.0891669 * abs(eta)) * log(pt)*log(pt)) 17 } 20 21 } 22 -
cards/ILCgen/ILCgen_ChrgHadTrackingEff.tcl
r25291dd r4e5ed02 4 4 # A.F.Zarnecki, June 12, 2020 5 5 6 set EfficiencyFormula { 7 (pt <= 0.1) * (0.00) + 8 (abs(eta) <= 1.83) * (pt > 0.1 && pt <= 0.2) * (0.70) + 9 (abs(eta) <= 1.83) * (pt > 0.2 && pt <= 0.3) * (0.93) + 10 (abs(eta) <= 1.83) * (pt > 0.3 && pt <= 0.7) * (0.995) + 11 (abs(eta) <= 1.83) * (pt > 0.7) * (1.00) + 12 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.1 && pt <= 0.2) * (0.697) + 13 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.2 && pt <= 0.3) * (0.925) + 14 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.3 && pt <= 0.7) * (0.99) + 15 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.7) * (0.995) + 16 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.1 && pt <= 0.2) * (0.665) + 17 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.2 && pt <= 0.3) * (0.884) + 18 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.3 && pt <= 0.7) * (0.945) + 19 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.7) * (0.95) + 20 (abs(eta) > 3.00) * (pt > 0.1) * (0.00) 21 } 6 set EfficiencyFormula { (pt <= 0.1) * (0.00) + 7 (abs(eta) <= 1.83) * (pt > 0.1 && pt <= 0.2) * (0.70) + 8 (abs(eta) <= 1.83) * (pt > 0.2 && pt <= 0.3) * (0.93) + 9 (abs(eta) <= 1.83) * (pt > 0.3 && pt <= 0.7) * (0.995) + 10 (abs(eta) <= 1.83) * (pt > 0.7) * (1.00) + 11 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.1 && pt <= 0.2) * (0.697) + 12 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.2 && pt <= 0.3) * (0.925) + 13 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.3 && pt <= 0.7) * (0.99) + 14 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.7) * (0.995) + 15 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.1 && pt <= 0.2) * (0.665) + 16 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.2 && pt <= 0.3) * (0.884) + 17 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.3 && pt <= 0.7) * (0.945) + 18 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.7) * (0.95) + 19 (abs(eta) > 3.00) * (pt > 0.1) * (0.00) } -
cards/ILCgen/ILCgen_ECAL_EnergyFractions.tcl
r25291dd r4e5ed02 1 1 #P.Sopicki 2 2 # default energy fractions {abs(PDG code)} {fraction in ECAL or LumiCal} 3 3 add EnergyFraction {0} {0.0} 4 4 # energy fractions for e, gamma and pi0 -
cards/ILCgen/ILCgen_ECAL_Resolution.tcl
r25291dd r4e5ed02 2 2 # ECAL and LumiCal resolution: same formula used at the moment 3 3 # 4 4 # set ResolutionFormula {resolution formula as a function of eta and energy} 5 5 set ResolutionFormula { 6 6 (abs(eta) <= 3 ) * sqrt(energy^2*0.01^2 + energy*0.17^2)+ 7 7 (abs(eta) > 3 && abs(eta) <= 4 ) * sqrt(energy^2*0.01^2 + energy*0.17^2) 8 8 } -
cards/ILCgen/ILCgen_ElectronEfficiency.tcl
r25291dd r4e5ed02 1 2 # set EfficiencyFormula {efficiency formula as a function of eta and pt} 1 3 2 4 # efficiency formula for electrons (ECAL and LumiCal) -
cards/ILCgen/ILCgen_ElectronMomentumSmearing.tcl
r25291dd r4e5ed02 6 6 7 7 set ResolutionFormula { 8 (abs(eta) <= 2.0) * 9 exp( -6.82012 - 0.284133*abs(eta) + 0.64585*eta*eta 8 9 (abs(eta) <= 2.0) * 10 exp( -6.82012 - 0.284133*abs(eta) + 0.64585*eta*eta 10 11 + (0.829675 -0.188197*abs(eta) + 0.106226 * eta*eta - 1.0) * log(pt) 11 12 + (0.0766417-0.00435667*abs(eta) + 0.00174804*eta*eta) * log(pt)*log(pt)) 12 + 13 (abs(eta) > 2.0 && abs(eta) <= 3.0) * 14 exp( -4.54609 13 14 + 15 16 (abs(eta) > 2.0 && abs(eta) <= 3.0) * 17 exp( -4.54609 15 18 + ( 0.87526 - 1.0) * log(pt) 16 19 + (-0.0800672 + 0.0891669 * abs(eta)) * log(pt)*log(pt)) 17 } 20 21 } 22 -
cards/ILCgen/ILCgen_ElectronTrackingEff.tcl
r25291dd r4e5ed02 4 4 # A.F.Zarnecki, June 12, 2020 5 5 6 set EfficiencyFormula { 7 (pt <= 0.1) * (0.00) + 8 (abs(eta) <= 1.83) * (pt > 0.1 && pt <= 0.2) * (0.70) + 9 (abs(eta) <= 1.83) * (pt > 0.2 && pt <= 0.3) * (0.93) + 10 (abs(eta) <= 1.83) * (pt > 0.3 && pt <= 0.7) * (0.995) + 11 (abs(eta) <= 1.83) * (pt > 0.7) * (1.00) + 12 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.1 && pt <= 0.2) * (0.697) + 13 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.2 && pt <= 0.3) * (0.925) + 14 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.3 && pt <= 0.7) * (0.99) + 15 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.7) * (0.995) + 16 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.1 && pt <= 0.2) * (0.665) + 17 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.2 && pt <= 0.3) * (0.884) + 18 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.3 && pt <= 0.7) * (0.945) + 19 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.7) * (0.95) + 20 (abs(eta) > 3.00) * (pt > 0.1) * (0.00) 21 } 6 set EfficiencyFormula { (pt <= 0.1) * (0.00) + 7 (abs(eta) <= 1.83) * (pt > 0.1 && pt <= 0.2) * (0.70) + 8 (abs(eta) <= 1.83) * (pt > 0.2 && pt <= 0.3) * (0.93) + 9 (abs(eta) <= 1.83) * (pt > 0.3 && pt <= 0.7) * (0.995) + 10 (abs(eta) <= 1.83) * (pt > 0.7) * (1.00) + 11 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.1 && pt <= 0.2) * (0.697) + 12 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.2 && pt <= 0.3) * (0.925) + 13 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.3 && pt <= 0.7) * (0.99) + 14 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.7) * (0.995) + 15 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.1 && pt <= 0.2) * (0.665) + 16 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.2 && pt <= 0.3) * (0.884) + 17 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.3 && pt <= 0.7) * (0.945) + 18 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.7) * (0.95) + 19 (abs(eta) > 3.00) * (pt > 0.1) * (0.00) } -
cards/ILCgen/ILCgen_HCAL_EnergyFractions.tcl
r25291dd r4e5ed02 1 1 #P.Sopicki 2 2 # default energy fractions {abs(PDG code)} {fraction in HCAL or LHCAL} 3 3 add EnergyFraction {0} {1.0} 4 4 # energy fractions for e, gamma and pi0 -
cards/ILCgen/ILCgen_HCAL_Resolution.tcl
r25291dd r4e5ed02 2 2 # HCAL and LHCAL resolution: same formula used at the moment 3 3 # 4 4 # set ResolutionFormula {resolution formula as a function of eta and energy} 5 5 set ResolutionFormula { 6 6 (abs(eta) <= 2.8 ) * sqrt(energy^2*0.017^2 + energy*0.45^2)+ 7 7 (abs(eta) > 2.8 && abs(eta)<=3.8 ) * sqrt(energy^2*0.017^2 + energy*0.45^2) 8 } 8 } 9 -
cards/ILCgen/ILCgen_MuonMomentumSmearing.tcl
r25291dd r4e5ed02 6 6 7 7 set ResolutionFormula { 8 (abs(eta) <= 2.0) * 9 exp( -6.82012 - 0.284133*abs(eta) + 0.64585*eta*eta 8 9 (abs(eta) <= 2.0) * 10 exp( -6.82012 - 0.284133*abs(eta) + 0.64585*eta*eta 10 11 + (0.829675 -0.188197*abs(eta) + 0.106226 * eta*eta - 1.0) * log(pt) 11 12 + (0.0766417-0.00435667*abs(eta) + 0.00174804*eta*eta) * log(pt)*log(pt)) 12 + 13 (abs(eta) > 2.0 && abs(eta) <= 3.0) * 14 exp( -4.54609 13 14 + 15 16 (abs(eta) > 2.0 && abs(eta) <= 3.0) * 17 exp( -4.54609 15 18 + ( 0.87526 - 1.0) * log(pt) 16 19 + (-0.0800672 + 0.0891669 * abs(eta)) * log(pt)*log(pt)) 17 } 20 21 } 22 -
cards/ILCgen/ILCgen_MuonTrackingEff.tcl
r25291dd r4e5ed02 4 4 # A.F.Zarnecki, June 12, 2020 5 5 6 set EfficiencyFormula { 7 (pt <= 0.1) * (0.00) + 8 (abs(eta) <= 1.83) * (pt > 0.1 && pt <= 0.2) * (0.70) + 9 (abs(eta) <= 1.83) * (pt > 0.2 && pt <= 0.3) * (0.93) + 10 (abs(eta) <= 1.83) * (pt > 0.3 && pt <= 0.7) * (0.995) + 11 (abs(eta) <= 1.83) * (pt > 0.7) * (1.00) + 12 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.1 && pt <= 0.2) * (0.697) + 13 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.2 && pt <= 0.3) * (0.925) + 14 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.3 && pt <= 0.7) * (0.99) + 15 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.7) * (0.995) + 16 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.1 && pt <= 0.2) * (0.665) + 17 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.2 && pt <= 0.3) * (0.884) + 18 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.3 && pt <= 0.7) * (0.945) + 19 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.7) * (0.95) + 20 (abs(eta) > 3.00) * (pt > 0.1) * (0.00) 21 } 6 set EfficiencyFormula { (pt <= 0.1) * (0.00) + 7 (abs(eta) <= 1.83) * (pt > 0.1 && pt <= 0.2) * (0.70) + 8 (abs(eta) <= 1.83) * (pt > 0.2 && pt <= 0.3) * (0.93) + 9 (abs(eta) <= 1.83) * (pt > 0.3 && pt <= 0.7) * (0.995) + 10 (abs(eta) <= 1.83) * (pt > 0.7) * (1.00) + 11 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.1 && pt <= 0.2) * (0.697) + 12 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.2 && pt <= 0.3) * (0.925) + 13 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.3 && pt <= 0.7) * (0.99) + 14 (abs(eta) > 1.83 && abs(eta) <= 2.65) * (pt > 0.7) * (0.995) + 15 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.1 && pt <= 0.2) * (0.665) + 16 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.2 && pt <= 0.3) * (0.884) + 17 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.3 && pt <= 0.7) * (0.945) + 18 (abs(eta) > 2.65 && abs(eta) <= 3.00) * (pt > 0.7) * (0.95) + 19 (abs(eta) > 3.00) * (pt > 0.1) * (0.00) } -
cards/ILCgen/ILCgen_PhotonEfficiency.tcl
r25291dd r4e5ed02 1 # set EfficiencyFormula (efficiency formula as a function of eta and pt) 2 # efficiency formula for photons (ECAL + LumiCal) 1 2 # set EfficiencyFormula {efficiency formula as a function of eta and pt} 3 4 # efficiency formula for photons (ECAL + LumiCal) 3 5 4 6 set EfficiencyFormula { -
doc/genMakefile.tcl
r25291dd r4e5ed02 282 282 DISPLAYLIB = libDelphesDisplay.lib 283 283 284 VERSION = x.y.z284 VERSION = $(shell cat VERSION) 285 285 DISTDIR = Delphes-$(VERSION) 286 286 DISTTAR = $(DISTDIR).tar.gz … … 290 290 } 291 291 292 executableDeps {converters/*.cpp} {examples/*.cpp} 292 executableDeps {converters/*.cpp} {examples/*.cpp} {validation/*.cpp} 293 293 294 294 executableDeps {readers/DelphesHepMC.cpp} {readers/DelphesLHEF.cpp} {readers/DelphesSTDHEP.cpp} {readers/DelphesROOT.cpp} … … 434 434 @echo ">> Building $(DISTTAR)" 435 435 @mkdir -p $(DISTDIR) 436 @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)436 @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) 437 437 @find $(DISTDIR) -depth -name .\* -exec rm -rf {} \; 438 438 @tar -czf $(DISTTAR) $(DISTDIR) -
modules/DualReadoutCalorimeter.cc
r25291dd r4e5ed02 645 645 //cout<<"Creating tower with Pt, Eta, Phi, Energy: "<<pt<<","<<eta<<","<<phi<<","<<neutralEnergy<<endl; 646 646 tower->Momentum.SetPtEtaPhiE(pt, eta, phi, neutralEnergy); 647 648 // if no hadronic energy, use ECAL resolution 649 if (fHCalTowerEnergy <= fHCalEnergyMin) 650 { 651 tower->Eem = neutralEnergy; 652 tower->Ehad = 0.0; 653 tower->PID = 22; 654 } 655 656 // if hadronic fraction > 0, use HCAL resolution 657 else 658 { 659 tower->Eem = 0; 660 tower->Ehad = neutralEnergy; 661 tower->PID = 130; 662 } 647 tower->Eem = neutralEnergy; 648 tower->Ehad = 0.0; 649 tower->PID = 22; 650 651 663 652 664 653 fEFlowPhotonOutputArray->Add(tower); 665 654 666 655 667 656 //clone tracks -
modules/TrackCovariance.cc
r25291dd r4e5ed02 102 102 while((candidate = static_cast<Candidate *>(fItInputArray->Next()))) 103 103 { 104 105 // converting to meters 106 const TLorentzVector &candidatePosition = candidate->InitialPosition*1e-03; 104 const TLorentzVector &candidatePosition = candidate->InitialPosition; 107 105 const TLorentzVector &candidateMomentum = candidate->Momentum; 108 106 … … 115 113 116 114 candidate->Momentum.SetVectM(track.GetObsP(), mass); 115 candidate->InitialPosition.SetXYZT(track.GetObsX().X(),track.GetObsX().Y(),track.GetObsX().Z(),candidatePosition.T()); 117 116 118 // converting back to mm119 candidate->InitialPosition.SetXYZT(track.GetObsX().X()*1e03,track.GetObsX().Y()*1e03,track.GetObsX().Z()*1e03,candidatePosition.T()*1e03);120 121 117 // save full covariance 5x5 matrix internally (D0, phi, Curvature, dz, ctg(theta)) 122 118 candidate->TrackCovariance = track.GetCov(); … … 127 123 ct = track.GetObsPar()[4]; 128 124 129 candidate->Xd = track.GetObsX().X() *1e03;130 candidate->Yd = track.GetObsX().Y() *1e03;131 candidate->Zd = track.GetObsX().Z() *1e03;125 candidate->Xd = track.GetObsX().X(); 126 candidate->Yd = track.GetObsX().Y(); 127 candidate->Zd = track.GetObsX().Z(); 132 128 133 candidate->D0 = track.GetObsPar()[0]*1e03;134 candidate->Phi 135 candidate->C = track.GetObsPar()[2]*1e03;136 candidate->DZ = track.GetObsPar()[3]*1e03;129 candidate->D0 = track.GetObsPar()[0]; 130 candidate->Phi = track.GetObsPar()[1]; 131 candidate->C = track.GetObsPar()[2]; 132 candidate->DZ = track.GetObsPar()[3]; 137 133 candidate->CtgTheta = track.GetObsPar()[4]; 138 candidate->P 139 candidate->PT 140 candidate->Charge 134 candidate->P = track.GetObsP().Mag(); 135 candidate->PT = pt; 136 candidate->Charge = q; 141 137 142 dd0 = TMath::Sqrt(track.GetCov()(0, 0)) *1e03;143 ddz = TMath::Sqrt(track.GetCov()(3, 3)) *1e03;138 dd0 = TMath::Sqrt(track.GetCov()(0, 0)); 139 ddz = TMath::Sqrt(track.GetCov()(3, 3)); 144 140 dphi = TMath::Sqrt(track.GetCov()(1, 1)); 145 141 dct = TMath::Sqrt(track.GetCov()(4, 4)); 146 142 dpt = 2 * TMath::Sqrt( track.GetCov()(2, 2))*pt*pt / (0.2998*fBz); 147 143 dp = TMath::Sqrt((1.+ct*ct)*dpt*dpt + 4*pt*pt*ct*ct*dct*dct/(1.+ct*ct)/(1.+ct*ct)); 148 dC = TMath::Sqrt(track.GetCov()(2, 2)) *1e03;144 dC = TMath::Sqrt(track.GetCov()(2, 2)); 149 145 150 146 candidate->ErrorD0 = dd0; -
readers/DelphesPythia8.cpp
r25291dd r4e5ed02 296 296 297 297 // jet matching 298 #if PYTHIA_VERSION_INTEGER < 8300299 298 matching = combined->getHook(*pythia); 300 299 if(!matching) … … 303 302 } 304 303 pythia->setUserHooksPtr(matching); 305 #endif306 304 307 305 if(pythia == NULL) -
validation/DelphesValidation.cpp
r25291dd r4e5ed02 32 32 #include "TGraph.h" 33 33 #include "TGraphErrors.h" 34 #include "TF1.h"35 34 #include "TH1.h" 36 35 #include "TH2.h" -
validation/validation.sh
r25291dd r4e5ed02 38 38 outputrootdir=report_${cardbase%.*}/root 39 39 cardlabel=${cardbase%.*} 40 version= x.y.z40 version=$(cat VERSION) 41 41 outpdf=$mainoutputdir/${output%.*}.pdf 42 42 cardsdir=validation/cards
Note:
See TracChangeset
for help on using the changeset viewer.
