Changeset 624dc48 in git
- Timestamp:
- Dec 9, 2014, 4:40:27 PM (10 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- 17826f2, f355a2c
- Parents:
- 2eb25b1 (diff), acf622f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r2eb25b1 r624dc48 324 324 modules/ModulesLinkDef.h \ 325 325 modules/Delphes.h \ 326 modules/AngularSmearing.h \ 326 327 modules/ParticlePropagator.h \ 327 328 modules/Efficiency.h \ … … 497 498 modules/Calorimeter.$(SrcSuf) \ 498 499 modules/Calorimeter.h \ 500 classes/DelphesClasses.h \ 501 classes/DelphesFactory.h \ 502 classes/DelphesFormula.h \ 503 external/ExRootAnalysis/ExRootResult.h \ 504 external/ExRootAnalysis/ExRootFilter.h \ 505 external/ExRootAnalysis/ExRootClassifier.h 506 tmp/modules/AngularSmearing.$(ObjSuf): \ 507 modules/AngularSmearing.$(SrcSuf) \ 508 modules/AngularSmearing.h \ 499 509 classes/DelphesClasses.h \ 500 510 classes/DelphesFactory.h \ … … 851 861 tmp/modules/Delphes.$(ObjSuf) \ 852 862 tmp/modules/Calorimeter.$(ObjSuf) \ 863 tmp/modules/AngularSmearing.$(ObjSuf) \ 853 864 tmp/modules/LeptonDressing.$(ObjSuf) \ 854 865 tmp/modules/UniqueObjectFinder.$(ObjSuf) \ … … 1535 1546 @touch $@ 1536 1547 1548 modules/AngularSmearing.h: \ 1549 classes/DelphesModule.h 1550 @touch $@ 1551 1537 1552 modules/IdentificationMap.h: \ 1538 1553 classes/DelphesModule.h … … 1543 1558 @touch $@ 1544 1559 1560 modules/Merger.h: \ 1561 classes/DelphesModule.h 1562 @touch $@ 1563 1545 1564 modules/Isolation.h: \ 1546 1565 classes/DelphesModule.h … … 1548 1567 1549 1568 modules/EnergyScale.h: \ 1550 classes/DelphesModule.h1551 @touch $@1552 1553 modules/Merger.h: \1554 1569 classes/DelphesModule.h 1555 1570 @touch $@ -
examples/delphes_card_FCC_basic.tcl
r2eb25b1 r624dc48 15 15 16 16 TrackMerger 17 AngularSmearing 17 18 ImpactParameterSmearing 18 19 … … 52 53 53 54 # radius of the magnetic field coverage, in m 54 set Radius 5.0055 set Radius 2.60 55 56 # half-length of the magnetic field coverage, in m 56 set HalfLength 12.0057 set HalfLength 6.00 57 58 58 59 # magnetic field 59 set Bz 5.060 set Bz 6.0 60 61 } 61 62 … … 73 74 set EfficiencyFormula { (pt <= 0.1) * (0.00) + \ 74 75 (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) + \ 75 (abs(eta) <= 1.5) * (pt > 1.0) * (0.9 9) + \76 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1 && pt <= 1.0) * (0. 70) + \77 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0) * (0.9 8) + \76 (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) + \ 77 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1 && pt <= 1.0) * (0.60) + \ 78 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0) * (0.90) + \ 78 79 (abs(eta) > 4.0) * (0.00)} 79 80 … … 129 130 130 131 # resolution formula for charged hadrons 131 set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.02) + \ 132 (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e1) * (0.01) + \ 133 (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \ 134 (abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05) + \ 135 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1 && pt <= 1.0) * (0.03) + \ 136 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0 && pt <= 1.0e1) * (0.02) + \ 137 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \ 138 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 2.0e2) * (0.05)} 132 set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1) * (0.01 + pt*2.e-5) + \ 133 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1) * (0.02 + pt*3.e-5)} 134 135 139 136 } 140 137 … … 167 164 168 165 # resolution formula for muons 169 set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1 && pt <= 5.0) * (0.02) + \ 170 (abs(eta) <= 0.5) * (pt > 5.0 && pt <= 1.0e2) * (0.015) + \ 171 (abs(eta) <= 0.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.03) + \ 172 (abs(eta) <= 0.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4) + \ 173 (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1 && pt <= 5.0) * (0.03) + \ 174 (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 5.0 && pt <= 1.0e2) * (0.02) + \ 175 (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.04) + \ 176 (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4) + \ 177 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1 && pt <= 5.0) * (0.04) + \ 178 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 5.0 && pt <= 1.0e2) * (0.035) + \ 179 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 1.0e2 && pt <= 2.0e2) * (0.05) + \ 180 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 2.0e2) * (0.05 + pt*1.e-4)} 166 set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1) * (0.01 + pt*5.e-6) + \ 167 (abs(eta) > 1.5 && abs(eta) <= 4.0) * (pt > 0.1) * (0.02 + pt*1.e-5)} 168 169 181 170 } 182 171 … … 193 182 } 194 183 184 185 ################################ 186 # Track angular smearing 187 ################################ 188 189 module AngularSmearing AngularSmearing { 190 set InputArray TrackMerger/tracks 191 set OutputArray tracks 192 193 194 # angular smearing in eta formula as a function of pt and eta 195 set EtaResolutionFormula { 0.001 } 196 197 # angular smearing in phi formula as a function of pt and eta 198 set PhiResolutionFormula { 0.001 } 199 200 } 201 195 202 ################################ 196 203 # Track impact parameter smearing … … 198 205 199 206 module ImpactParameterSmearing ImpactParameterSmearing { 200 set InputArray TrackMerger/tracks207 set InputArray AngularSmearing/tracks 201 208 set OutputArray tracks 202 209 203 210 204 # absolute impact parameter smearing formula (in mm) as a function of pt and eta205 set ResolutionFormula {(pt > 0.1 && pt <= 5.0) * (0.010) + \206 (pt > 5.0) * (0.005)}211 # absolute impact parameter smearing formula (in mm) as a function of pt and eta 212 set ResolutionFormula {(pt > 0.1 && pt <= 5.0) * (0.010) + \ 213 (pt > 5.0) * (0.005)} 207 214 208 215 } … … 219 226 set EFlowTowerOutputArray eflowPhotons 220 227 228 set TowerMinEnergy 0.5 229 set TowerMinSignificance 1.0 230 221 231 set pi [expr {acos(-1)}] 222 232 … … 224 234 # each list starts with the lower edge of the first tower 225 235 # the list ends with the higher edged of the last tower 226 227 # 5 degreestowers236 237 # 0.5 degree towers 228 238 set PhiBins {} 229 for {set i -36 } {$i <= 36} {incr i} {230 add PhiBins [expr {$i * $pi/36 .0}]239 for {set i -360} {$i <= 360} {incr i} { 240 add PhiBins [expr {$i * $pi/360.0}] 231 241 } 232 foreach eta {-1.566 -1.479 -1.392 -1.305 -1.218 -1.131 -1.044 -0.957 -0.87 -0.783 -0.696 -0.609 -0.522 -0.435 -0.348 -0.261 -0.174 -0.087 0 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.87 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653} { 242 243 # 0.01 unit in eta up to eta = 3 244 for {set i -300} {$i <= 300} {incr i} { 245 set eta [expr {$i * 0.01}] 233 246 add EtaPhiBins $eta $PhiBins 234 247 } 235 236 # 10 degrees towers 237 set PhiBins {} 238 for {set i -18} {$i <= 18} {incr i} { 239 add PhiBins [expr {$i * $pi/18.0}] 240 } 241 foreach eta {-4.35 -4.175 -4 -3.825 -3.65 -3.475 -3.3 -3.125 -2.95 -2.868 -2.65 -2.5 -2.322 -2.172 -2.043 -1.93 -1.83 -1.74 -1.653 1.74 1.83 1.93 2.043 2.172 2.322 2.5 2.65 2.868 2.95 3.125 3.3 3.475 3.65 3.825 4 4.175 4.35 4.525} { 242 add EtaPhiBins $eta $PhiBins 243 } 244 245 # 20 degrees towers 246 set PhiBins {} 247 for {set i -9} {$i <= 9} {incr i} { 248 add PhiBins [expr {$i * $pi/9.0}] 249 } 250 foreach eta {6 -5.6 -5.3 -5 -4.7 -4.525 4.7 5 5.3 5.6 6} { 251 add EtaPhiBins $eta $PhiBins 252 } 248 253 249 # default energy fractions {abs(PDG code)} {fraction of energy deposited in ECAL} 254 250 … … 273 269 274 270 # set ECalResolutionFormula {resolution formula as a function of eta and energy} 275 set ResolutionFormula { (abs(eta) <= 4.0) * sqrt(energy^2*0.005^2 + energy*0.02^2) + \ 276 (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.05^2 + energy*1.00^2)} 271 272 # This is the CMS ECAL resolution, extended up eta = 6.0 273 set ResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.003^2 + energy*0.029^2 + 0.125^2) + \ 274 (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)} 277 275 278 276 … … 290 288 set EFlowTowerOutputArray eflowNeutralHadrons 291 289 290 set TowerMinEnergy 1.0 291 set TowerMinSignificance 1.0 292 292 293 set pi [expr {acos(-1)}] 293 294 … … 295 296 # each list starts with the lower edge of the first tower 296 297 # the list ends with the higher edged of the last tower 297 298 # 5 degrees towers 298 299 300 # 5 degree towers 299 301 set PhiBins {} 300 for {set i - 36} {$i <= 36} {incr i} {301 add PhiBins [expr {$i * $pi/ 36.0}]302 for {set i -72} {$i <= 72} {incr i} { 303 add PhiBins [expr {$i * $pi/75.0}] 302 304 } 303 foreach eta {-1.566 -1.479 -1.392 -1.305 -1.218 -1.131 -1.044 -0.957 -0.87 -0.783 -0.696 -0.609 -0.522 -0.435 -0.348 -0.261 -0.174 -0.087 0 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.87 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653} { 305 306 # 0.05 unit in eta up to eta = 3 307 for {set i -60} {$i <= 60} {incr i} { 308 set eta [expr {$i * 0.05}] 304 309 add EtaPhiBins $eta $PhiBins 305 310 } 306 307 # 10 degrees towers 308 set PhiBins {} 309 for {set i -18} {$i <= 18} {incr i} { 310 add PhiBins [expr {$i * $pi/18.0}] 311 } 312 foreach eta {-4.35 -4.175 -4 -3.825 -3.65 -3.475 -3.3 -3.125 -2.95 -2.868 -2.65 -2.5 -2.322 -2.172 -2.043 -1.93 -1.83 -1.74 -1.653 1.74 1.83 1.93 2.043 2.172 2.322 2.5 2.65 2.868 2.95 3.125 3.3 3.475 3.65 3.825 4 4.175 4.35 4.525} { 313 add EtaPhiBins $eta $PhiBins 314 } 315 316 # 20 degrees towers 317 set PhiBins {} 318 for {set i -9} {$i <= 9} {incr i} { 319 add PhiBins [expr {$i * $pi/9.0}] 320 } 321 foreach eta {6 -5.6 -5.3 -5 -4.7 -4.525 4.7 5 5.3 5.6 6} { 322 add EtaPhiBins $eta $PhiBins 323 } 324 311 312 325 313 # default energy fractions {abs(PDG code)} {Fecal Fhcal} 326 314 add EnergyFraction {0} {1.0} … … 343 331 add EnergyFraction {3122} {0.7} 344 332 345 # set HCalResolutionFormula {resolution formula as a function of eta and energy} 346 set ResolutionFormula { (abs(eta) <= 4.0) * sqrt(energy^2*0.03^2 + energy*0.50^2) + \ 347 (abs(eta) > 4.0 && abs(eta) <= 6.0) * sqrt(energy^2*0.05^2 + energy*1.00^2)} 348 } 349 333 # set HCalResolutionFormula {resolution formula as a function of eta and energy} 334 335 # This is the ATLAS HCAL resolution, extended up eta = 6.0 336 set HCalResolutionFormula { (abs(eta) <= 1.7) * sqrt(energy^2*0.0302^2 + energy*0.5205^2 + 1.59^2) + \ 337 (abs(eta) > 1.7 && abs(eta) <= 3.2) * sqrt(energy^2*0.0500^2 + energy*0.706^2) + \ 338 (abs(eta) > 3.2 && abs(eta) <= 6.0) * sqrt(energy^2*0.09420^2 + energy*1.00^2)} 339 340 } 350 341 351 342 #################### … … 428 419 set ParameterR 0.5 429 420 430 set JetPTMin 5.0421 set JetPTMin 100.0 431 422 } 432 423 … … 445 436 set ParameterR 0.5 446 437 447 set JetPTMin 5.0438 set JetPTMin 100.0 448 439 } 449 440 -
modules/ModulesLinkDef.h
r2eb25b1 r624dc48 32 32 #include "modules/Delphes.h" 33 33 34 #include "modules/AngularSmearing.h" 34 35 #include "modules/ParticlePropagator.h" 35 36 #include "modules/Efficiency.h" … … 70 71 #pragma link C++ class Delphes+; 71 72 73 #pragma link C++ class AngularSmearing+; 72 74 #pragma link C++ class ParticlePropagator+; 73 75 #pragma link C++ class Efficiency+;
Note:
See TracChangeset
for help on using the changeset viewer.