Changeset 0852ba95 in git
- Timestamp:
- Feb 16, 2021, 4:33:20 PM (4 years ago)
- Branches:
- master
- Children:
- 726e804
- Parents:
- 2671df6 (diff), 7967061 (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:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
cards/delphes_card_CLICdet_Stage1.tcl
r2671df6 r0852ba95 298 298 299 299 set EfficiencyFormula { 300 (abs(eta) > 2.54) * (0.000) + 301 (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 302 (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 303 (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 304 (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) + 305 (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 300 (pt <= 0.1) * (0.000) + 301 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 302 (pt > 0.1) * (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 303 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 304 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 305 (pt > 0.1) * (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.990) + 306 (pt > 0.1) * (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 306 307 } 307 308 } … … 318 319 # Current full simulation with CLICdet provides for electrons: 319 320 set EfficiencyFormula { 320 (pt <= 1)* (0.000) +321 (abs(eta) > 2.54)* (0.000) +322 (energy >= 80)* (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +323 (energy >= 80)* (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +324 (energy >= 80)* (abs(eta) <= 2.34 ) * (1.000) +325 326 327 (energy < 5) * (abs(eta) > 2.34 ) * (0.000) +328 (energy < 5)* (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +329 (energy < 5)* (abs(eta) <= 0.76) * (0.999)321 (pt <= 0.1) * (0.000) + 322 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 323 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) + 324 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) + 325 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.34 ) * (1.000) + 326 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) + 327 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.17) * (1.000) + 328 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.54 && abs(eta) > 2.34 ) * (1.000) + 329 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) + 330 (pt > 0.1) * (energy < 5) * (abs(eta) <= 0.76) * (0.999) 330 331 } 331 332 } … … 341 342 # Current full simulation with CLICdet provides for muons: 342 343 set EfficiencyFormula { 343 (pt < 1) * (0.000) + 344 (abs(eta) > 2.54) * (0.000) + 345 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 346 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 347 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 348 (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 349 (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 && pt >=1 ) * (0.999) + 350 (abs(eta) <= 2.25 ) * (energy >= 1) * (1.000) 351 352 344 (pt <= 0.1) * (0.000) + 345 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 346 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 347 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 348 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 349 (pt > 0.1) * (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 350 (pt > 0.1) * (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 ) * (0.999) + 351 (pt > 0.1) * (abs(eta) <= 2.25 ) * (energy < 5 ) * (1.000) 353 352 } 354 353 } -
cards/delphes_card_CLICdet_Stage2.tcl
r2671df6 r0852ba95 490 490 491 491 set EfficiencyFormula { 492 (abs(eta) > 2.54) * (0.000) + 493 (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 494 (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 495 (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 496 (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) + 497 (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 492 (pt <= 0.1) * (0.000) + 493 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 494 (pt > 0.1) * (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 495 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 496 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 497 (pt > 0.1) * (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.990) + 498 (pt > 0.1) * (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 498 499 } 499 500 } … … 510 511 # Current full simulation with CLICdet provides for electrons: 511 512 set EfficiencyFormula { 512 (pt <= 1)* (0.000) +513 (abs(eta) > 2.54)* (0.000) +514 (energy >= 80)* (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +515 (energy >= 80)* (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +516 (energy >= 80)* (abs(eta) <= 2.34 ) * (1.000) +517 518 519 (energy < 5) * (abs(eta) > 2.34 ) * (0.000) +520 (energy < 5)* (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +521 (energy < 5)* (abs(eta) <= 0.76) * (0.999)513 (pt <= 0.1) * (0.000) + 514 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 515 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) + 516 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) + 517 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.34 ) * (1.000) + 518 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) + 519 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.17) * (1.000) + 520 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.54 && abs(eta) > 2.34 ) * (1.000) + 521 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) + 522 (pt > 0.1) * (energy < 5) * (abs(eta) <= 0.76) * (0.999) 522 523 } 523 524 } … … 533 534 # Current full simulation with CLICdet provides for muons: 534 535 set EfficiencyFormula { 535 (pt < 1) * (0.000) + 536 (abs(eta) > 2.54) * (0.000) + 537 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 538 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 539 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 540 (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 541 (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 && pt >=1 ) * (0.999) + 542 (abs(eta) <= 2.25 ) * (energy >= 1) * (1.000) 543 544 536 (pt <= 0.1) * (0.000) + 537 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 538 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 539 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 540 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 541 (pt > 0.1) * (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 542 (pt > 0.1) * (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 ) * (0.999) + 543 (pt > 0.1) * (abs(eta) <= 2.25 ) * (energy < 5 ) * (1.000) 545 544 } 546 545 } -
cards/delphes_card_CLICdet_Stage3.tcl
r2671df6 r0852ba95 484 484 485 485 set EfficiencyFormula { 486 (abs(eta) > 2.54) * (0.000) + 487 (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 488 (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 489 (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 490 (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) + 491 (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 486 (pt <= 0.1) * (0.000) + 487 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 488 (pt > 0.1) * (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 489 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 490 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 491 (pt > 0.1) * (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.990) + 492 (pt > 0.1) * (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 492 493 } 493 494 } … … 504 505 # Current full simulation with CLICdet provides for electrons: 505 506 set EfficiencyFormula { 506 (pt <= 1)* (0.000) +507 (abs(eta) > 2.54)* (0.000) +508 (energy >= 80)* (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +509 (energy >= 80)* (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +510 (energy >= 80)* (abs(eta) <= 2.34 ) * (1.000) +511 512 513 (energy < 5) * (abs(eta) > 2.34 ) * (0.000) +514 (energy < 5)* (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +515 (energy < 5)* (abs(eta) <= 0.76) * (0.999)507 (pt <= 0.1) * (0.000) + 508 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 509 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) + 510 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) + 511 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.34 ) * (1.000) + 512 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) + 513 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.17) * (1.000) + 514 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.54 && abs(eta) > 2.34 ) * (1.000) + 515 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) + 516 (pt > 0.1) * (energy < 5) * (abs(eta) <= 0.76) * (0.999) 516 517 } 517 518 } … … 527 528 # Current full simulation with CLICdet provides for muons: 528 529 set EfficiencyFormula { 529 (pt < 1) * (0.000) + 530 (abs(eta) > 2.54) * (0.000) + 531 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 532 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 533 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 534 (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 535 (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 && pt >=1 ) * (0.999) + 536 (abs(eta) <= 2.25 ) * (energy >= 1) * (1.000) 537 538 530 (pt <= 0.1) * (0.000) + 531 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 532 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 533 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 534 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 535 (pt > 0.1) * (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 536 (pt > 0.1) * (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 ) * (0.999) + 537 (pt > 0.1) * (abs(eta) <= 2.25 ) * (energy < 5 ) * (1.000) 539 538 } 540 539 } -
cards/delphes_card_CLICdet_Stage3_fcal.tcl
r2671df6 r0852ba95 492 492 493 493 set EfficiencyFormula { 494 (abs(eta) > 2.54) * (0.000) + 495 (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 496 (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 497 (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 498 (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) + 499 (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 494 (pt <= 0.1) * (0.000) + 495 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 496 (pt > 0.1) * (energy >= 80) * (abs(eta) < 2.54) * (1.000) + 497 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34) * (0.994) + 498 (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) + 499 (pt > 0.1) * (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.990) + 500 (pt > 0.1) * (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 500 501 } 501 502 } … … 512 513 # Current full simulation with CLICdet provides for electrons: 513 514 set EfficiencyFormula { 514 (pt <= 1)* (0.000) +515 (abs(eta) > 2.54)* (0.000) +516 (energy >= 80)* (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +517 (energy >= 80)* (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +518 (energy >= 80)* (abs(eta) <= 2.34 ) * (1.000) +519 520 521 (energy < 5) * (abs(eta) > 2.34 ) * (0.000) +522 (energy < 5)* (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +523 (energy < 5)* (abs(eta) <= 0.76) * (0.999)515 (pt <= 0.1) * (0.000) + 516 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 517 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) + 518 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) + 519 (pt > 0.1) * (energy >= 80) * (abs(eta) <= 2.34 ) * (1.000) + 520 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) + 521 (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.17) * (1.000) + 522 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.54 && abs(eta) > 2.34 ) * (1.000) + 523 (pt > 0.1) * (energy < 5) * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) + 524 (pt > 0.1) * (energy < 5) * (abs(eta) <= 0.76) * (0.999) 524 525 } 525 526 } … … 535 536 # Current full simulation with CLICdet provides for muons: 536 537 set EfficiencyFormula { 537 (pt < 1) * (0.000) + 538 (abs(eta) > 2.54) * (0.000) + 539 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 540 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 541 (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 542 (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 543 (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 && pt >=1 ) * (0.999) + 544 (abs(eta) <= 2.25 ) * (energy >= 1) * (1.000) 545 546 538 (pt <= 0.1) * (0.000) + 539 (pt > 0.1) * (abs(eta) > 2.54) * (0.000) + 540 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80) * (0.994) + 541 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80) * (0.996) + 542 (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 ) * (0.996) + 543 (pt > 0.1) * (abs(eta) <= 2.44 ) * (energy >= 5 ) * (1.000) + 544 (pt > 0.1) * (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 ) * (0.999) + 545 (pt > 0.1) * (abs(eta) <= 2.25 ) * (energy < 5 ) * (1.000) 547 546 } 548 547 } -
classes/DelphesTF2.cc
r2671df6 r0852ba95 32 32 { 33 33 34 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0) 34 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 23, 0) 35 fFormula = std::unique_ptr<TFormula>(new TFormula()); 36 #elif ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0) 35 37 fFormula = new TFormula(); 36 38 #endif
Note:
See TracChangeset
for help on using the changeset viewer.