From 8ca8b292a4af4214f1a071914092e800074c352d Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Fri, 30 Sep 2022 12:31:45 +0200 Subject: [PATCH 1/9] Update refs --- .../tests/refs/hlt2_noUT_trackefflines.ref | 6 ++-- .../refs/hlt2_reco_plus_thor_selections.ref | 32 +++++++---------- ...hlt2_reco_plus_thor_selections_fastest.ref | 32 +++++++---------- .../hlt2_reco_plus_thor_selections_legacy.ref | 34 ++++++++----------- ...sspion_tagger_on_example_b2jpsik_lines.ref | 6 ++-- .../tests/refs/hlt2_trackefflines.ref | 10 +++--- .../tests/refs/hlt2_with_hlt1_decisions.ref | 2 +- 7 files changed, 52 insertions(+), 70 deletions(-) diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref index 4aa041becb8..6ef6a84e64f 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref @@ -164,19 +164,19 @@ FunctionalChargedProtoParticleMa... INFO Number of counters : 1 FunctionalChargedProtoParticleMa... INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 190 | -FunctionalParticleMaker INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 108 | 108 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 108 | 108 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 57 | 55 | 0.96491 | 0.95449 | 0.0000 | 4.0000 | | "Nb created particles" | 57 | 53 | 0.92982 | 0.98870 | 0.0000 | 4.0000 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 9291 | 1279 |( 13.76601 +- 0.3574473)% | |*"# passed Track filter" | 9291 | 9291 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 100 | 610 | 6.1000 | 5.9775 | 0.0000 | 38.000 | | "Nb created particles" | 100 | 669 | 6.6900 | 5.2301 | 0.0000 | 27.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 190 | 190 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 190 | 190 |( 100.0000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref index 1fd45360f4c..bd75ad7dc37 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref @@ -164,46 +164,40 @@ FilteredPIDkaons INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 7087 | -FunctionalParticleMaker INFO Number of counters : 3 +FunctionalParticleMaker#1 INFO Number of counters : 3 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed Track filter" | 7087 | 0 |( 0.000000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "Nb created particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | -FunctionalParticleMaker#1 INFO Number of counters : 3 +FunctionalParticleMaker#2 INFO Number of counters : 3 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed Track filter" | 7087 | 0 |( 0.000000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "Nb created particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 7087 | 6645 |( 93.76323 +- 0.2872533)% | - |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | - | "Nb created anti-particles" | 99 | 3331 | 33.646 | 21.718 | 0.0000 | 107.00 | - | "Nb created particles" | 99 | 3314 | 33.475 | 21.457 | 1.0000 | 103.00 | FunctionalParticleMaker#3 INFO Number of counters : 4 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"# passed ProtoParticle filter" | 43 | 42 |( 97.67442 +- 2.298381)% | + |*"# passed Track filter" | 43 | 43 |( 100.0000 +- 0.000000)% | + | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | + | "Nb created particles" | 1 | 20 | 20.000 | 0.0000 | 20.000 | 20.000 | +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | -FunctionalParticleMaker#4 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 6645 |( 93.76323 +- 0.2872533)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3331 | 33.646 | 21.718 | 0.0000 | 107.00 | | "Nb created particles" | 99 | 3314 | 33.475 | 21.457 | 1.0000 | 103.00 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#6 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 43 | 42 |( 97.67442 +- 2.298381)% | |*"# passed Track filter" | 43 | 43 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | | "Nb created particles" | 1 | 20 | 20.000 | 0.0000 | 20.000 | 20.000 | -FunctionalParticleMaker#6 INFO Number of counters : 4 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | - |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | - | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | - | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | FunctionalParticleMaker#7 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | @@ -218,10 +212,10 @@ FunctionalParticleMaker#8 INFO Number of counters : 4 | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | FunctionalParticleMaker#9 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 7087 | 549 |( 7.746578 +- 0.3175521)% | + |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | - | "Nb created anti-particles" | 99 | 277 | 2.7980 | 4.2043 | 0.0000 | 22.000 | - | "Nb created particles" | 99 | 272 | 2.7475 | 3.1761 | 0.0000 | 15.000 | + | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | + | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | FutureEcalZSup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"No bank found" | 100 | 0 |( 0.000000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref index ce2ea9b9c9f..8130cc94044 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref @@ -200,48 +200,42 @@ FilteredPIDkaons INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 7231 | -FunctionalParticleMaker INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1005 | 1005 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 1005 |( 13.89849 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 497 | 5.0202 | 3.3514 | 0.0000 | 17.000 | | "Nb created particles" | 99 | 508 | 5.1313 | 3.7943 | 0.0000 | 17.000 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1005 | 913 |( 90.84577 +- 0.9096623)% | |*"# passed Track filter" | 7231 | 1005 |( 13.89849 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 457 | 4.6162 | 3.1995 | 0.0000 | 17.000 | | "Nb created particles" | 99 | 456 | 4.6061 | 3.4431 | 0.0000 | 13.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 6226 | 5937 |( 95.35818 +- 0.2666360)% | - |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | - | "Nb created anti-particles" | 99 | 2952 | 29.818 | 17.719 | 0.0000 | 74.000 | - | "Nb created particles" | 99 | 2985 | 30.152 | 17.978 | 0.0000 | 73.000 | FunctionalParticleMaker#3 INFO Number of counters : 4 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"# passed ProtoParticle filter" | 619 | 602 |( 97.25363 +- 0.6568810)% | + |*"# passed Track filter" | 738 | 619 |( 83.87534 +- 1.353737)% | + | "Nb created anti-particles" | 9 | 309 | 34.333 | 14.314 | 13.000 | 51.000 | + | "Nb created particles" | 9 | 293 | 32.556 | 17.964 | 12.000 | 73.000 | +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 5937 |( 95.35818 +- 0.2666360)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 2952 | 29.818 | 17.719 | 0.0000 | 74.000 | | "Nb created particles" | 99 | 2985 | 30.152 | 17.978 | 0.0000 | 73.000 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#6 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 42 | 41 |( 97.61905 +- 2.352437)% | |*"# passed Track filter" | 50 | 42 |( 84.00000 +- 5.184593)% | | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | | "Nb created particles" | 1 | 19 | 19.000 | 0.0000 | 19.000 | 19.000 | -FunctionalParticleMaker#6 INFO Number of counters : 4 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | - |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | - | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | - | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | FunctionalParticleMaker#7 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | @@ -256,10 +250,10 @@ FunctionalParticleMaker#8 INFO Number of counters : 4 | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | FunctionalParticleMaker#9 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 6226 | 454 |( 7.292001 +- 0.3295167)% | + |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | - | "Nb created anti-particles" | 99 | 230 | 2.3232 | 3.4196 | 0.0000 | 17.000 | - | "Nb created particles" | 99 | 224 | 2.2626 | 2.6269 | 0.0000 | 14.000 | + | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | + | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | FutureEcalZSup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"No bank found" | 100 | 0 |( 0.000000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref index 285aa7d9a23..07cc2d3d5a1 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref @@ -196,48 +196,42 @@ FilteredPIDkaons INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 7886 | -FunctionalParticleMaker INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1393 | 1393 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 1393 |( 17.66422 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 698 | 7.0505 | 5.2827 | 0.0000 | 22.000 | | "Nb created particles" | 99 | 695 | 7.0202 | 5.1971 | 0.0000 | 23.000 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1393 | 1232 |( 88.44221 +- 0.8566267)% | |*"# passed Track filter" | 7886 | 1393 |( 17.66422 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 622 | 6.2828 | 4.9687 | 0.0000 | 22.000 | | "Nb created particles" | 99 | 610 | 6.1616 | 4.6356 | 0.0000 | 19.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 6493 | 6186 |( 95.27183 +- 0.2633941)% | - |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | - | "Nb created anti-particles" | 99 | 3075 | 31.061 | 19.018 | 0.0000 | 87.000 | - | "Nb created particles" | 99 | 3111 | 31.424 | 19.535 | 0.0000 | 89.000 | FunctionalParticleMaker#3 INFO Number of counters : 4 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"# passed ProtoParticle filter" | 629 | 610 |( 96.97933 +- 0.6824420)% | + |*"# passed Track filter" | 778 | 629 |( 80.84833 +- 1.410747)% | + | "Nb created anti-particles" | 9 | 319 | 35.444 | 15.664 | 13.000 | 57.000 | + | "Nb created particles" | 9 | 291 | 32.333 | 15.578 | 11.000 | 60.000 | +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6186 |( 95.27183 +- 0.2633941)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3075 | 31.061 | 19.018 | 0.0000 | 87.000 | | "Nb created particles" | 99 | 3111 | 31.424 | 19.535 | 0.0000 | 89.000 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#6 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 42 | 41 |( 97.61905 +- 2.352437)% | |*"# passed Track filter" | 51 | 42 |( 82.35294 +- 5.338148)% | | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | | "Nb created particles" | 1 | 19 | 19.000 | 0.0000 | 19.000 | 19.000 | -FunctionalParticleMaker#6 INFO Number of counters : 4 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | - |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | - | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | - | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | FunctionalParticleMaker#7 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | @@ -252,11 +246,11 @@ FunctionalParticleMaker#8 INFO Number of counters : 4 | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | FunctionalParticleMaker#9 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 6493 | 476 |( 7.330972 +- 0.3234636)% | + |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | - | "Nb created anti-particles" | 99 | 238 | 2.4040 | 3.4900 | 0.0000 | 18.000 | - | "Nb created particles" | 99 | 238 | 2.4040 | 2.7668 | 0.0000 | 14.000 | -FutureEcalZSup INFO Number of counters : 1 + | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | + | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | +utureEcalZSup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"No bank found" | 100 | 0 |( 0.000000 +- 0.000000)% | FutureHcalZSup INFO Number of counters : 1 diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref index 4431e248d2b..6e294c4d529 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref @@ -95,19 +95,19 @@ DeterministicPrescaler#1 INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 9525 | -FunctionalParticleMaker INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 9525 | 1273 |( 13.36483 +- 0.3486554)% | |*"# passed Track filter" | 9525 | 9525 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 100 | 595 | 5.9500 | 4.4640 | 0.0000 | 23.000 | | "Nb created particles" | 100 | 678 | 6.7800 | 5.7734 | 0.0000 | 30.000 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 9525 | 8938 |( 93.83727 +- 0.2464006)% | |*"# passed Track filter" | 9525 | 9525 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 100 | 4430 | 44.300 | 20.155 | 7.0000 | 133.00 | | "Nb created particles" | 100 | 4508 | 45.080 | 20.832 | 11.000 | 114.00 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 2756 | 2581 |( 93.65022 +- 0.4645091)% | |*"# passed Track filter" | 2756 | 2756 |( 100.0000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref index b00dc80f01a..7ff48267441 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref @@ -241,31 +241,31 @@ FunctionalChargedProtoParticleMa... INFO Number of counters : 1 FunctionalChargedProtoParticleMa... INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 258 | -FunctionalParticleMaker INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 138 | 138 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 138 | 138 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 54 | 74 | 1.3704 | 1.2367 | 0.0000 | 6.0000 | | "Nb created particles" | 54 | 64 | 1.1852 | 1.0554 | 0.0000 | 5.0000 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7982 | 1129 |( 14.14432 +- 0.3900495)% | |*"# passed Track filter" | 9330 | 7982 |( 85.55198 +- 0.3639807)% | | "Nb created anti-particles" | 100 | 567 | 5.6700 | 5.4883 | 0.0000 | 43.000 | | "Nb created particles" | 100 | 562 | 5.6200 | 4.1201 | 0.0000 | 22.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 2459 | 348 |( 14.15209 +- 0.7029039)% | |*"# passed Track filter" | 2459 | 2459 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 31 | 169 | 5.4516 | 4.8048 | 0.0000 | 20.000 | | "Nb created particles" | 31 | 179 | 5.7742 | 3.4521 | 1.0000 | 16.000 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 127 | 127 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 127 | 127 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 74 | 67 | 0.90541 | 0.97494 | 0.0000 | 6.0000 | | "Nb created particles" | 74 | 60 | 0.81081 | 0.91053 | 0.0000 | 3.0000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 254 | 254 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 254 | 254 |( 100.0000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref index e66e9e80914..418c8d4a2bb 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref @@ -100,7 +100,7 @@ DeterministicPrescaler INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 625 | -FunctionalParticleMaker INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 625 | 582 |( 93.12000 +- 1.012455)% | |*"# passed Track filter" | 625 | 625 |( 100.0000 +- 0.000000)% | -- GitLab From 38ce777444afef73ccb107c406c090d369edda18 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Fri, 30 Sep 2022 15:02:20 +0200 Subject: [PATCH 2/9] Restore changes --- CODEOWNERS | 5 +- .../python/Hlt2Conf/lines/rd/__init__.py | 4 +- .../Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py | 329 +++++++++++++----- .../Hlt2Conf/lines/rd/b_to_xtaul_spruce.py | 4 +- .../lines/rd/builders/b_to_tautau_hlt2.py | 68 ++++ 5 files changed, 314 insertions(+), 96 deletions(-) create mode 100644 Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py diff --git a/CODEOWNERS b/CODEOWNERS index 11cf75cafd6..0e4332dfbad 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -132,8 +132,8 @@ /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/ @elsmith @mrama @cagapopo @tfulghes @fevolle @htilquin /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b2ll_builders.py @tmombach /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/B2ll_lines.py @tmombach -/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py @tfulghes -/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py @tfulghes +/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py @tfulghes @yaz +/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py @tfulghes /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py @tfulghes /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py @maik /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rare_tau_decay_builders.py @maik @@ -144,6 +144,7 @@ /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/bnv_builders.py @fdevelli /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py @fdevelli /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py @fdevelli +/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_tautau_hlt2.py @tfulghes @yaz # QEE /Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ @wbarter @ncooke @jideng @rjhunter @olupton @yqiu @cvazquez @hyin @dzuliani diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/__init__.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/__init__.py index 6c0bba66c4b..ad2cf0570d0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/__init__.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/__init__.py @@ -41,6 +41,7 @@ from . import omega_rare_decay_lines from . import baryonic_radiative from . import bnv_lines_hlt2 from . import lfv_lines_hlt2 +from . import b_to_tautau_hlt2 # provide "all_lines" for correct registration by the overall HLT2 lines module all_lines = {} @@ -69,10 +70,11 @@ all_lines.update(omega_rare_decay_lines.all_lines) all_lines.update(baryonic_radiative.all_lines) all_lines.update(bnv_lines_hlt2.all_lines) all_lines.update(lfv_lines_hlt2.all_lines) +all_lines.update(b_to_tautau_hlt2.hlt2_lines) sprucing_lines = {} -sprucing_lines.update(b_to_xtaul_spruce.sprucing_lines) sprucing_lines.update(b_to_ll_spruce.sprucing_lines) sprucing_lines.update(b_to_multilepton_spruce.sprucing_lines) sprucing_lines.update(b_to_xll_spruce.sprucing_lines) sprucing_lines.update(b_to_xgamma_exclusive_spruce.sprucing_lines) +sprucing_lines.update(b_to_xtaul_spruce.sprucing_lines) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py index dfa6f8ea60c..32e6e6ab507 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py @@ -54,14 +54,10 @@ from PyConf import configurable from GaudiKernel.SystemOfUnits import MeV, GeV from Hlt2Conf.lines.rd.builders import b_to_xtaul_rd_builder as builder from Hlt2Conf.lines.rd.builders import rdbuilder_thor as common_builder -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter import Functors as F hlt2_lines = {} -PROCESS = "hlt2" -""" -Set persistreco=True to save the full event reconstruction for sprucing a given HLT2 line -""" ## B0 -> K* tau l @@ -73,7 +69,7 @@ def Hlt2_Bd2KstTauTau_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (K*->K+ pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Bd -> (K*->K+ pi-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ kst = common_builder.make_rd_detached_kstar0s( @@ -111,7 +107,7 @@ def Hlt2_Bd2KstTauTau_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (K*->K+ pi-) (tau+->pi+pi+pi-) (tau+->pi-pi-pi+) + CC - + and for Bd -> (K*->K+ pi-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ kst = common_builder.make_rd_detached_kstar0s( @@ -149,7 +145,7 @@ def Hlt2_Bd2KstTauMu_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (K*->K+ pi-) (tau+->pi+pi+pi-) mu- + CC - + and for Bd -> (K*->K+ pi-) (tau-->pi-pi-pi+) mu+ + CC """ kst = common_builder.make_rd_detached_kstar0s( @@ -187,7 +183,7 @@ def Hlt2_Bd2KstTauMu_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (K*->K+ pi-) (tau+->pi+pi+pi-) mu+ + CC - + and for Bd -> (K*->K+ pi-) (tau-->pi-pi-pi+) mu- + CC """ kst = common_builder.make_rd_detached_kstar0s( @@ -225,7 +221,7 @@ def Hlt2_Bd2KstTauE_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (K*->K+ pi-) (tau+->pi+pi+pi-) e- + CC - + and for Bd -> (K*->K+ pi-) (tau-->pi-pi-pi+) e+ + CC """ kst = common_builder.make_rd_detached_kstar0s( @@ -263,7 +259,7 @@ def Hlt2_Bd2KstTauE_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (K*->K+ pi-) (tau+->pi+pi+pi-) e+ + CC - + and for Bd -> (K*->K+ pi-) (tau-->pi-pi-pi+) e- + CC """ kst = common_builder.make_rd_detached_kstar0s( @@ -302,7 +298,7 @@ def Hlt2_Bd2PhiTauTau_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (phi->K+ K-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Bd -> (phi->K+ K-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ phi = builder.filter_rd_detached_phis() @@ -327,7 +323,7 @@ def Hlt2_Bd2PhiTauTau_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (phi->K+ K-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Bd -> (phi->K+ K-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ phi = builder.filter_rd_detached_phis() @@ -352,7 +348,7 @@ def Hlt2_Bd2PhiTauMu_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (phi->K+ K-) (tau+->pi+pi+pi-) mu- + CC - + and for Bd -> (phi->K+ K-) (tau-->pi-pi-pi+) mu+ + CC """ phi = builder.filter_rd_detached_phis() @@ -377,7 +373,7 @@ def Hlt2_Bd2PhiTauMu_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (phi->K+ K-) (tau+->pi+pi+pi-) mu+ + CC - + and for Bd -> (phi->K+ K-) (tau-->pi-pi-pi+) mu- + CC """ phi = builder.filter_rd_detached_phis() @@ -402,7 +398,7 @@ def Hlt2_Bd2PhiTauE_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (phi->K+ K-) (tau+->pi+pi+pi-) e- + CC - + and for Bd -> (phi->K+ K-) (tau-->pi-pi-pi+) e+ + CC """ phi = builder.filter_rd_detached_phis() @@ -427,7 +423,7 @@ def Hlt2_Bd2PhiTauE_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (phi->K+ K-) (tau+->pi+pi+pi-) e+ + CC - + and for Bd -> (phi->K+ K-) (tau-->pi-pi-pi+) e- + CC """ phi = builder.filter_rd_detached_phis() @@ -448,12 +444,12 @@ def Hlt2_Bd2PhiTauE_SS_ExclusiveLine( @register_line_builder(hlt2_lines) @configurable def Hlt2_Bd2RhoTauTau_OS_ExclusiveLine( - name='Hlt2RD_BdToRhoTauTau_Rho2PiPi_TauTo3Pi_OS', + name='Hlt2RD_BdToRhoTauTau_RhoToPiPi_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Bd -> (rho->pi+ pi-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ rho = builder.make_rd_detached_rhos() @@ -473,12 +469,12 @@ def Hlt2_Bd2RhoTauTau_OS_ExclusiveLine( @register_line_builder(hlt2_lines) @configurable def Hlt2_Bd2RhoTauTau_SS_ExclusiveLine( - name='Hlt2RD_BdToRhoTauTau_Rho2PiPi_TauTo3Pi_SS', + name='Hlt2RD_BdToRhoTauTau_RhoToPiPi_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Bd -> (rho->pi+ pi-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ rho = builder.make_rd_detached_rhos() @@ -498,12 +494,12 @@ def Hlt2_Bd2RhoTauTau_SS_ExclusiveLine( @register_line_builder(hlt2_lines) @configurable def Hlt2_Bd2RhoTauMu_OS_ExclusiveLine( - name='Hlt2RD_BdToRhoTauMu_Rho2PiPi_TauTo3Pi_OS', + name='Hlt2RD_BdToRhoTauMu_RhoToPiPi_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) mu- + CC - + and for Bd -> (rho->pi+ pi-) (tau-->pi-pi-pi+) mu+ + CC """ rho = builder.make_rd_detached_rhos() @@ -523,12 +519,12 @@ def Hlt2_Bd2RhoTauMu_OS_ExclusiveLine( @register_line_builder(hlt2_lines) @configurable def Hlt2_Bd2RhoTauMu_SS_ExclusiveLine( - name='Hlt2RD_BdToRhoTauMu_Rho2PiPi_TauTo3Pi_SS', + name='Hlt2RD_BdToRhoTauMu_RhoToPiPi_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) mu+ + CC - + and for Bd -> (rho->pi+ pi-) (tau-->pi-pi-pi+) mu- + CC """ rho = builder.make_rd_detached_rhos() @@ -548,12 +544,12 @@ def Hlt2_Bd2RhoTauMu_SS_ExclusiveLine( @register_line_builder(hlt2_lines) @configurable def Hlt2_Bd2RhoTauE_OS_ExclusiveLine( - name='Hlt2RD_BdToRhoTauE_Rho2PiPi_TauTo3Pi_OS', + name='Hlt2RD_BdToRhoTauE_RhoToPiPi_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) e- + CC - + and for Bd -> (rho->pi+ pi-) (tau-->pi-pi-pi+) e+ + CC """ rho = builder.make_rd_detached_rhos() @@ -573,12 +569,12 @@ def Hlt2_Bd2RhoTauE_OS_ExclusiveLine( @register_line_builder(hlt2_lines) @configurable def Hlt2_Bd2RhoTauE_SS_ExclusiveLine( - name='Hlt2RD_BdToRhoTauE_Rho2PiPi_TauTo3Pi_SS', + name='Hlt2RD_BdToRhoTauE_RhoToPiPi_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) e+ + CC - + and for Bd -> (rho->pi+ pi-) (tau-->pi-pi-pi+) e- + CC """ rho = builder.make_rd_detached_rhos() @@ -604,7 +600,7 @@ def Hlt2_Bd2EtapTauTau_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Bd -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-)+ CC """ etap = builder.make_rd_detached_etaps() @@ -629,7 +625,7 @@ def Hlt2_Bd2EtapTauTau_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Bd -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ etap = builder.make_rd_detached_etaps() @@ -654,7 +650,7 @@ def Hlt2_Bd2EtapTauMu_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) mu- + CC - + and for Bd -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) mu+ + CC """ etap = builder.make_rd_detached_etaps() @@ -679,7 +675,7 @@ def Hlt2_Bd2EtapTauMu_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) mu+ + CC - + and for Bd -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) mu- + CC """ etap = builder.make_rd_detached_etaps() @@ -704,7 +700,7 @@ def Hlt2_Bd2EtapTauE_OS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) e- + CC - + and for Bd -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) e+ + CC """ etap = builder.make_rd_detached_etaps() @@ -729,7 +725,7 @@ def Hlt2_Bd2EtapTauE_SS_ExclusiveLine( persistreco=True): """ HLT2 line for Bd -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) e+ + CC - + and for Bd -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) e- + CC """ etap = builder.make_rd_detached_etaps() @@ -746,6 +742,157 @@ def Hlt2_Bd2EtapTauE_SS_ExclusiveLine( monitoring_variables=_RD_MONITORING_VARIABLES) +## B0 -> Ks0 tau l +@register_line_builder(hlt2_lines) +@configurable +def Hlt2_Bd2KsTauTau_LL_OS_ExclusiveLine( + name='Hlt2RD_BdToKsTauTau_KsLLToPiPi_TauTo3Pi_OS', + prescale=1, + persistreco=True): + """ + HLT2 line for Bd -> (KS0->pi+ pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC + + and for Bd -> (KS0->pi+ pi-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-)+ CC + """ + ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) + dilepton = builder.make_dilepton_from_tauls(daughter_id="tau+") + decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" + b2xtaul = builder.make_beauty2xtaul( + particles=[dilepton, ks], descriptors=decay_descriptor) + + return Hlt2Line( + name=name, + prescale=prescale, + persistreco=persistreco, + algs=rd_prefilter() + [dilepton, ks, b2xtaul], + monitoring_variables=_RD_MONITORING_VARIABLES) + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2_Bd2KsTauTau_LL_SS_ExclusiveLine( + name='Hlt2RD_BdToKsTauTau_KsLLToPiPi_TauTo3Pi_SS', + prescale=1, + persistreco=True): + """ + HLT2 line for Bd -> (KS0->pi+ pi-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC + + and for Bd -> (KS0->pi+ pi-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC + """ + ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) + dilepton = builder.make_dilepton_from_tauls(daughter_id="tau-") + decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" + b2xtaul = builder.make_beauty2xtaul( + particles=[dilepton, ks], descriptors=decay_descriptor) + + return Hlt2Line( + name=name, + prescale=prescale, + persistreco=persistreco, + algs=rd_prefilter() + [dilepton, ks, b2xtaul], + monitoring_variables=_RD_MONITORING_VARIABLES) + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2_Bd2KsTauMu_LL_OS_ExclusiveLine( + name='Hlt2RD_BdToKsTauMu_KsLLToPiPi_TauTo3Pi_OS', + prescale=1, + persistreco=True): + """ + HLT2 line for Bd -> (KS0->pi+ pi-) (tau+->pi+pi+pi-) mu- + CC + + and for Bd -> (KS0->pi+ pi-) (tau-->pi-pi-pi+) mu+ + CC + """ + ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) + dilepton = builder.make_dilepton_from_tauls(daughter_id="mu+") + decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" + b2xtaul = builder.make_beauty2xtaul( + particles=[dilepton, ks], descriptors=decay_descriptor) + + return Hlt2Line( + name=name, + prescale=prescale, + persistreco=persistreco, + algs=rd_prefilter() + [dilepton, ks, b2xtaul], + monitoring_variables=_RD_MONITORING_VARIABLES) + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2_Bd2KsTauMu_LL_SS_ExclusiveLine( + name='Hlt2RD_BdToKsTauMu_KsLLToPiPi_TauTo3Pi_SS', + prescale=1, + persistreco=True): + """ + HLT2 line for Bd -> (KS0->pi+ pi-) (tau+->pi+pi+pi-) mu+ + CC + + and for Bd -> (KS0->pi+ pi-) (tau-->pi-pi-pi+) mu- + CC + """ + ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) + dilepton = builder.make_dilepton_from_tauls(daughter_id="mu-") + decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" + b2xtaul = builder.make_beauty2xtaul( + particles=[dilepton, ks], descriptors=decay_descriptor) + + return Hlt2Line( + name=name, + prescale=prescale, + persistreco=persistreco, + algs=rd_prefilter() + [dilepton, ks, b2xtaul], + monitoring_variables=_RD_MONITORING_VARIABLES) + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2_Bd2KsTauE_LL_OS_ExclusiveLine( + name='Hlt2RD_BdToKsTauE_KsLLToPiPi_TauTo3Pi_OS', + prescale=1, + persistreco=True): + """ + HLT2 line for Bd -> (KS0->pi+ pi-) (tau+->pi+pi+pi-) e- + CC + + and for Bd -> (KS0->pi+ pi-) (tau-->pi-pi-pi+) e+ + CC + """ + ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) + dilepton = builder.make_dilepton_from_tauls(daughter_id="e+") + decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" + b2xtaul = builder.make_beauty2xtaul( + particles=[dilepton, ks], descriptors=decay_descriptor) + + return Hlt2Line( + name=name, + prescale=prescale, + persistreco=persistreco, + algs=rd_prefilter() + [dilepton, ks, b2xtaul], + monitoring_variables=_RD_MONITORING_VARIABLES) + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2_Bd2KsTauE_LL_SS_ExclusiveLine( + name='Hlt2RD_BdToKsTauE_KsLLToPiPi_TauTo3Pi_SS', + prescale=1, + persistreco=True): + """ + HLT2 line for Bd -> (KS0->pi+ pi-) (tau+->pi+pi+pi-) e+ + CC + + and for Bd -> (KS0->pi+ pi-) (tau-->pi-pi-pi+) e- + CC + """ + ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) + dilepton = builder.make_dilepton_from_tauls(daughter_id="e-") + decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" + b2xtaul = builder.make_beauty2xtaul( + particles=[dilepton, ks], descriptors=decay_descriptor) + + return Hlt2Line( + name=name, + prescale=prescale, + persistreco=persistreco, + algs=rd_prefilter() + [dilepton, ks, b2xtaul], + monitoring_variables=_RD_MONITORING_VARIABLES) + + ## B0 -> Ks0 tau l @register_line_builder(hlt2_lines) @configurable @@ -904,7 +1051,7 @@ def Hlt2_Bu2KplusTauTau_OS_ExclusiveLine( name='Hlt2RD_BuToKplTauTau_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for B+ -> K+ (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for B+ -> K+ (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ kaon = common_builder.make_rd_has_rich_detached_kaons( @@ -928,7 +1075,7 @@ def Hlt2_Bu2KplusTauTau_SS_ExclusiveLine( name='Hlt2RD_BuToKplTauTau_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for B+ -> K+ (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for B+ -> K+ (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ kaon = common_builder.make_rd_has_rich_detached_kaons( @@ -953,7 +1100,7 @@ def Hlt2_Bu2KplusTauMu_OS_ExclusiveLine(name='Hlt2RD_BuToKplTauMu_TauTo3Pi_OS', persistreco=True): """ HLT2 line for B+ -> K+ (tau+->pi+pi+pi-) mu- + CC - + and for B+ -> K+ (tau-->pi-pi-pi+) mu+ + CC """ kaon = common_builder.make_rd_has_rich_detached_kaons( @@ -978,7 +1125,7 @@ def Hlt2_Bu2KplusTauMu_SS_ExclusiveLine(name='Hlt2RD_BuToKplTauMu_TauTo3Pi_SS', persistreco=True): """ HLT2 line for B+ -> K+ (tau+->pi+pi+pi-) mu+ + CC - + and for B+ -> K+ (tau-->pi-pi-pi+) mu- + CC """ kaon = common_builder.make_rd_has_rich_detached_kaons( @@ -1003,7 +1150,7 @@ def Hlt2_Bu2KplusTauE_OS_ExclusiveLine(name='Hlt2RD_BuToKplTauE_TauTo3Pi_OS', persistreco=True): """ HLT2 line for B+ -> K+ (tau+->pi+pi+pi-) e- + CC - + and for B+ -> K+ (tau-->pi-pi-pi+) e+ + CC """ kaon = common_builder.make_rd_has_rich_detached_kaons( @@ -1028,7 +1175,7 @@ def Hlt2_Bu2KplusTauE_SS_ExclusiveLine(name='Hlt2RD_BuToKplTauE_TauTo3Pi_SS', persistreco=True): """ HLT2 line for B+ -> K+ (tau+->pi+pi+pi-) e+ + CC - + and for B+ -> K+ (tau-->pi-pi-pi+) e- + CC """ kaon = common_builder.make_rd_has_rich_detached_kaons( @@ -1055,7 +1202,7 @@ def Hlt2_Bu2K1plusTauTau_OS_ExclusiveLine( persistreco=True): """ HLT2 line for B+ -> (K1+->pi+pi+pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for B+ -> (K1+->pi+pi+pi-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ k1 = builder.make_rd_detached_k1s() @@ -1080,7 +1227,7 @@ def Hlt2_Bu2K1plusTauTau_SS_ExclusiveLine( persistreco=True): """ HLT2 line for B+ -> (K1+->pi+pi+pi-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for B+ -> (K1+->pi+pi+pi-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ k1 = builder.make_rd_detached_k1s() @@ -1105,7 +1252,7 @@ def Hlt2_Bu2K1plusTauMu_OS_ExclusiveLine( persistreco=True): """ HLT2 line for B+ -> (K1+->pi+pi+pi-) (tau+->pi+pi+pi-) mu- + CC - + and for B+ -> (K1+->pi+pi+pi-) (tau-->pi-pi-pi+) mu+ + CC """ k1 = builder.make_rd_detached_k1s() @@ -1130,7 +1277,7 @@ def Hlt2_Bu2K1plusTauMu_SS_ExclusiveLine( persistreco=True): """ HLT2 line for B+ -> (K1+->pi+pi+pi-) (tau+->pi+pi+pi-) mu+ + CC - + and for B+ -> (K1+->pi+pi+pi-) (tau-->pi-pi-pi+) mu- + CC """ k1 = builder.make_rd_detached_k1s() @@ -1155,7 +1302,7 @@ def Hlt2_Bu2K1plusTauE_OS_ExclusiveLine( persistreco=True): """ HLT2 line for B+ -> (K1+->pi+pi+pi-) (tau+->pi+pi+pi-) e- + CC - + and for B+ -> (K1+->pi+pi+pi-) (tau-->pi-pi-pi+) e+ + CC """ k1 = builder.make_rd_detached_k1s() @@ -1180,7 +1327,7 @@ def Hlt2_Bu2K1plusTauE_SS_ExclusiveLine( persistreco=True): """ HLT2 line for B+ -> (K1+->pi+pi+pi-) (tau+->pi+pi+pi-) e+ + CC - + and for B+ -> (K1+->pi+pi+pi-) (tau-->pi-pi-pi+) e- + CC """ k1 = builder.make_rd_detached_k1s() @@ -1502,11 +1649,11 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( ## Lb -> K p tau l @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2KpTauTau_OS_ExclusiveLine( - name='Hlt2RD_LbToKpTauTau_TauTo3Pi_OS', prescale=1, persistreco=True): +def Hlt2_Lambdab2PKTauTau_OS_ExclusiveLine( + name='Hlt2RD_LbToPKTauTau_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Lb -> p K- (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Lb -> p K- (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ lst = builder.make_dihadron_from_pK() @@ -1519,17 +1666,17 @@ def Hlt2_Lambdab2KpTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2KpTauTau_SS_ExclusiveLine( - name='Hlt2RD_LbToKpTauTau_TauTo3Pi_SS', prescale=1, persistreco=True): +def Hlt2_Lambdab2PKTauTau_SS_ExclusiveLine( + name='Hlt2RD_LbToPKTauTau_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Lb -> p K- (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Lb -> p K- (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ lst = builder.make_dihadron_from_pK() @@ -1542,17 +1689,17 @@ def Hlt2_Lambdab2KpTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2KpTauMu_OS_ExclusiveLine( - name='Hlt2RD_LbToKpTauMu_TauTo3Pi_OS', prescale=1, persistreco=True): +def Hlt2_Lambdab2PKTauMu_OS_ExclusiveLine( + name='Hlt2RD_LbToPKTauMu_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Lb -> p K- (tau+->pi+pi+pi-) mu- + CC - + and for Lb -> p K- (tau-->pi-pi-pi+) mu+ + CC """ lst = builder.make_dihadron_from_pK() @@ -1565,17 +1712,17 @@ def Hlt2_Lambdab2KpTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2KpTauMu_SS_ExclusiveLine( - name='Hlt2RD_LbToKpTauMu_TauTo3Pi_SS', prescale=1, persistreco=True): +def Hlt2_Lambdab2PKTauMu_SS_ExclusiveLine( + name='Hlt2RD_LbToPKTauMu_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Lb -> p K- (tau+->pi+pi+pi-) mu+ + CC - + and for Lb -> p K- (tau-->pi-pi-pi+) mu- + CC """ lst = builder.make_dihadron_from_pK() @@ -1588,18 +1735,18 @@ def Hlt2_Lambdab2KpTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2KpTauE_OS_ExclusiveLine(name='Hlt2RD_LbToKpTauE_TauTo3Pi_OS', +def Hlt2_Lambdab2PKTauE_OS_ExclusiveLine(name='Hlt2RD_LbToPKTauE_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Lb -> p K- (tau+->pi+pi+pi-) e- + CC - + and for Lb -> p K- (tau-->pi-pi-pi+) e+ + CC """ lst = builder.make_dihadron_from_pK() @@ -1612,18 +1759,18 @@ def Hlt2_Lambdab2KpTauE_OS_ExclusiveLine(name='Hlt2RD_LbToKpTauE_TauTo3Pi_OS', name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2KpTauE_SS_ExclusiveLine(name='Hlt2RD_LbToKpTauE_TauTo3Pi_SS', +def Hlt2_Lambdab2PKTauE_SS_ExclusiveLine(name='Hlt2RD_LbToPKTauE_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Lb -> p K- (tau+->pi+pi+pi-) e+ + CC - + and for Lb -> p K- (tau-->pi-pi-pi+) e- + CC """ lst = builder.make_dihadron_from_pK() @@ -1636,20 +1783,20 @@ def Hlt2_Lambdab2KpTauE_SS_ExclusiveLine(name='Hlt2RD_LbToKpTauE_TauTo3Pi_SS', name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) ## Lambda_b -> Lambda (LL) tau l @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2LambdaTauTau_OS_ExclusiveLine( - name='Hlt2RD_LbToLambdaTauTau_LambdaToPiP_TauTo3Pi_OS', +def Hlt2_Lambdab2LambdaTauTau_LL_OS_ExclusiveLine( + name="Hlt2RD_LbToLambdaTauTau_LambdaLLToPPi_TauTo3Pi_OS", prescale=1, persistreco=True): """ HLT2 line for Lb -> (L0->p pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Lb -> (L0->p pi-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ lambda0 = common_builder.make_rd_lambda_lls( @@ -1663,19 +1810,19 @@ def Hlt2_Lambdab2LambdaTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2LambdaTauTau_SS_ExclusiveLine( - name='Hlt2RD_LbToLambdaTauTau_LambdaToPiP_TauTo3Pi_SS', +def Hlt2_Lambdab2LambdaTauTau_LL_SS_ExclusiveLine( + name='Hlt2RD_LbToLambdaTauTau_LambdaLLToPPi_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Lb -> (L0->p pi-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Lb -> (L0->p pi-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ lambda0 = common_builder.make_rd_lambda_lls( @@ -1689,19 +1836,19 @@ def Hlt2_Lambdab2LambdaTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2LambdaTauMu_OS_ExclusiveLine( - name='Hlt2RD_LbToLambdaTauMu_LambdaToPiP_TauTo3Pi_OS', +def Hlt2_Lambdab2LambdaTauMu_LL_OS_ExclusiveLine( + name='Hlt2RD_LbToLambdaTauMu_LambdaLLToPPi_TauTo3Pi_OS', prescale=1, persistreco=True): """ HLT2 line for Lb -> (L0->p pi-) (tau+->pi+pi+pi-) mu- + CC - + and for Lb -> (L0->p pi-) (tau-->pi-pi-pi+) mu+ + CC """ lambda0 = common_builder.make_rd_lambda_lls( @@ -1715,19 +1862,19 @@ def Hlt2_Lambdab2LambdaTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2LambdaTauMu_SS_ExclusiveLine( - name='Hlt2RD_LbToLambdaTauMu_LambdaToPiP_TauTo3Pi_SS', +def Hlt2_Lambdab2LambdaTauMu_LL_SS_ExclusiveLine( + name='Hlt2RD_LbToLambdaTauMu_LambdaLLToPPi_TauTo3Pi_SS', prescale=1, persistreco=True): """ HLT2 line for Lb -> (L0->p pi-) (tau+->pi+pi+pi-) mu+ + CC - + and for Lb -> (L0->p pi-) (tau-->pi-pi-pi+) mu- + CC """ lambda0 = common_builder.make_rd_lambda_lls( @@ -1741,14 +1888,14 @@ def Hlt2_Lambdab2LambdaTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2LambdaTauE_OS_ExclusiveLine( - name='Hlt2RD_LbToLambdaTauE_LambdaToPiP_TauTo3Pi_OS', +def Hlt2_Lambdab2LambdaTauE_LL_OS_ExclusiveLine( + name='Hlt2RD_LbToLambdaTauE_LambdaLLToPPi_TauTo3Pi_OS', prescale=1, persistreco=True): """ @@ -1767,14 +1914,14 @@ def Hlt2_Lambdab2LambdaTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @configurable -def Hlt2_Lambdab2LambdaTauE_SS_ExclusiveLine( - name='Hlt2RD_LbToLambdaTauE_LambdaToPiP_TauTo3Pi_SS', +def Hlt2_Lambdab2LambdaTauE_LL_SS_ExclusiveLine( + name='Hlt2RD_LbToLambdaTauE_LambdaLLToPPi_TauTo3Pi_SS', prescale=1, persistreco=True): """ @@ -1793,5 +1940,5 @@ def Hlt2_Lambdab2LambdaTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py index 1f29d332ce2..277b3435c10 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py @@ -8,10 +8,10 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -''' +''' Author: Tommaso Fulghesu Contact: tommaso.fulghesu@cern.ch -Date: 07/12/2021 +Date: 07/12/2021 ''' ###################################################################################### diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py new file mode 100644 index 00000000000..458c518ac73 --- /dev/null +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py @@ -0,0 +1,68 @@ +############################################################################### +# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### +''' +Author: Ya Zhao, Tommaso Fulghesu +Contact: ya.zhao@cern.ch, tommaso.fulghesu@cern.ch +Date: 01/04/2022 +''' +####################################################################################### +#### #### +#### Hlt2 lines for selecting OS and SS events of B0 and B_s0 decaying into a pair #### +#### of taus, each one decays hadronically into three pions #### +#### #### +####################################################################################### + +from Moore.config import register_line_builder +from Moore.lines import Hlt2Line +from PyConf import configurable +from Hlt2Conf.lines.rd.builders import b_to_xtaul_rd_builder as builder +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from GaudiKernel.SystemOfUnits import GeV + +hlt2_lines = {} + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2RD_BdToTauTau_OS_Line(name="Hlt2RD_BdToTauTau_TauTo3Pi_OS", + prescale=1, + persistreco=True): + """ + Register B -> tautau (B0 and B_s0) line + """ + ditaus = builder.filter_BToTauTau( + ditaus=builder.make_dilepton_from_tauls( + parent_id="B_s0", daughter_id="tau+", tau_pt_min=1 * GeV)) + + return Hlt2Line( + name=name, + algs=rd_prefilter() + [ditaus], + persistreco=persistreco, + prescale=prescale) + + +@register_line_builder(hlt2_lines) +@configurable +def Hlt2RD_BdToTauTau_SS_Line(name="Hlt2RD_BdToTauTau_TauTo3Pi_SS", + prescale=1, + persistreco=True): + """ + Register B -> tautau (B0 and B_s0) line + """ + ditaus = builder.filter_BToTauTau( + ditaus=builder.make_dilepton_from_tauls( + parent_id="B_s0", daughter_id="tau-", tau_pt_min=1 * GeV)) + + return Hlt2Line( + name=name, + algs=rd_prefilter() + [ditaus], + persistreco=persistreco, + prescale=prescale) -- GitLab From ddca5a9730b87e1305cb3e7942fa1afa42bdd8b7 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Sun, 2 Oct 2022 10:15:45 +0200 Subject: [PATCH 3/9] Add monitoring variables --- .../rd/{builders => }/b_to_tautau_hlt2.py | 8 ++++-- .../Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py | 28 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) rename Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/{builders => }/b_to_tautau_hlt2.py (93%) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_tautau_hlt2.py similarity index 93% rename from Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py rename to Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_tautau_hlt2.py index 458c518ac73..3c6aff7da4b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_tautau_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_tautau_hlt2.py @@ -24,7 +24,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from PyConf import configurable from Hlt2Conf.lines.rd.builders import b_to_xtaul_rd_builder as builder -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES from GaudiKernel.SystemOfUnits import GeV hlt2_lines = {} @@ -46,7 +46,8 @@ def Hlt2RD_BdToTauTau_OS_Line(name="Hlt2RD_BdToTauTau_TauTo3Pi_OS", name=name, algs=rd_prefilter() + [ditaus], persistreco=persistreco, - prescale=prescale) + prescale=prescale, + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -65,4 +66,5 @@ def Hlt2RD_BdToTauTau_SS_Line(name="Hlt2RD_BdToTauTau_TauTo3Pi_SS", name=name, algs=rd_prefilter() + [ditaus], persistreco=persistreco, - prescale=prescale) + prescale=prescale, + monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py index 32e6e6ab507..bf7bb3a3ee3 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py @@ -54,7 +54,7 @@ from PyConf import configurable from GaudiKernel.SystemOfUnits import MeV, GeV from Hlt2Conf.lines.rd.builders import b_to_xtaul_rd_builder as builder from Hlt2Conf.lines.rd.builders import rdbuilder_thor as common_builder -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES import Functors as F hlt2_lines = {} @@ -1042,6 +1042,8 @@ def Hlt2_Bd2KsTauE_LL_SS_ExclusiveLine( persistreco=persistreco, algs=rd_prefilter() + [dilepton, ks, b2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) +======= +>>>>>>> 7cb9b915c (Add monitoring variables) ## Bu -> K+ tau l @@ -1644,6 +1646,8 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) +======= +>>>>>>> 7cb9b915c (Add monitoring variables) ## Lb -> K p tau l @@ -1666,7 +1670,7 @@ def Hlt2_Lambdab2PKTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1689,7 +1693,7 @@ def Hlt2_Lambdab2PKTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1735,7 +1739,7 @@ def Hlt2_Lambdab2PKTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1759,7 +1763,7 @@ def Hlt2_Lambdab2PKTauE_OS_ExclusiveLine(name='Hlt2RD_LbToPKTauE_TauTo3Pi_OS', name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1783,7 +1787,7 @@ def Hlt2_Lambdab2PKTauE_SS_ExclusiveLine(name='Hlt2RD_LbToPKTauE_TauTo3Pi_SS', name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1810,7 +1814,7 @@ def Hlt2_Lambdab2LambdaTauTau_LL_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1836,7 +1840,7 @@ def Hlt2_Lambdab2LambdaTauTau_LL_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1862,7 +1866,7 @@ def Hlt2_Lambdab2LambdaTauMu_LL_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1888,7 +1892,7 @@ def Hlt2_Lambdab2LambdaTauMu_LL_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1914,7 +1918,7 @@ def Hlt2_Lambdab2LambdaTauE_LL_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) @@ -1940,5 +1944,5 @@ def Hlt2_Lambdab2LambdaTauE_LL_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], + algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) -- GitLab From 5924fb439ff408feb9558d3d5d9e26dd129f8185 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Mon, 3 Oct 2022 11:18:26 +0200 Subject: [PATCH 4/9] Add missing builder --- .../rd/builders/b_to_xtaul_rd_builder.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py index bc36631a515..b11bb01ba58 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py @@ -312,3 +312,27 @@ def make_beauty2xtaul(particles, DecayDescriptor=descriptors, CombinationCut=combination_code, CompositeCut=vertex_code) + + +def filter_BToTauTau( + ditaus=make_dilepton_from_tauls(parent_id="B_s0", daughter_id="tau+"), + name="filter_RD_B2tautau", + m_min=2 * GeV, + m_max=7 * GeV, + p_min=3 * GeV, + pt_min=1 * GeV, + bpvdira_min=0.995, + bpvfdchi2_min=225, + bpvipchi2_max=50, + chi2_max=90, + bpvfd_max=90 * mm): + pvs = make_pvs() + code = require_all( + in_range(m_min, F.MASS, m_max), F.P > p_min, F.PT > pt_min, + F.BPVDIRA(pvs) > bpvdira_min, + F.BPVFDCHI2(pvs) > bpvfdchi2_min, + F.BPVIPCHI2(pvs) < bpvipchi2_max, + F.CHI2() < chi2_max, + F.BPVFD(pvs) < bpvfd_max) + return ParticleFilter(ditaus, F.FILTER(code), name=name) + -- GitLab From 0d5f57341ee844284c3df018b83415ef208fa5b9 Mon Sep 17 00:00:00 2001 From: Gitlab CI <noreply@cern.ch> Date: Wed, 5 Oct 2022 12:49:25 +0000 Subject: [PATCH 5/9] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/24972498 --- .../rd/builders/b_to_xtaul_rd_builder.py | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py index b11bb01ba58..bc0ace3e5cb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/b_to_xtaul_rd_builder.py @@ -315,17 +315,17 @@ def make_beauty2xtaul(particles, def filter_BToTauTau( - ditaus=make_dilepton_from_tauls(parent_id="B_s0", daughter_id="tau+"), - name="filter_RD_B2tautau", - m_min=2 * GeV, - m_max=7 * GeV, - p_min=3 * GeV, - pt_min=1 * GeV, - bpvdira_min=0.995, - bpvfdchi2_min=225, - bpvipchi2_max=50, - chi2_max=90, - bpvfd_max=90 * mm): + ditaus=make_dilepton_from_tauls(parent_id="B_s0", daughter_id="tau+"), + name="filter_RD_B2tautau", + m_min=2 * GeV, + m_max=7 * GeV, + p_min=3 * GeV, + pt_min=1 * GeV, + bpvdira_min=0.995, + bpvfdchi2_min=225, + bpvipchi2_max=50, + chi2_max=90, + bpvfd_max=90 * mm): pvs = make_pvs() code = require_all( in_range(m_min, F.MASS, m_max), F.P > p_min, F.PT > pt_min, @@ -335,4 +335,3 @@ def filter_BToTauTau( F.CHI2() < chi2_max, F.BPVFD(pvs) < bpvfd_max) return ParticleFilter(ditaus, F.FILTER(code), name=name) - -- GitLab From 9ac0c85358ddfba1b3bb74be6398426fdaeab4c9 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Tue, 15 Nov 2022 17:02:00 +0100 Subject: [PATCH 6/9] Fix linting --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py index bf7bb3a3ee3..45279914069 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py @@ -1042,8 +1042,6 @@ def Hlt2_Bd2KsTauE_LL_SS_ExclusiveLine( persistreco=persistreco, algs=rd_prefilter() + [dilepton, ks, b2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) -======= ->>>>>>> 7cb9b915c (Add monitoring variables) ## Bu -> K+ tau l @@ -1646,8 +1644,6 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) -======= ->>>>>>> 7cb9b915c (Add monitoring variables) ## Lb -> K p tau l -- GitLab From a0841adc9b26c57a991834c0324ad70306272499 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Tue, 15 Nov 2022 17:10:56 +0100 Subject: [PATCH 7/9] Remove duplicates --- .../Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py | 153 +----------------- 1 file changed, 1 insertion(+), 152 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py index 45279914069..7ab9aa03354 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_hlt2.py @@ -893,157 +893,6 @@ def Hlt2_Bd2KsTauE_LL_SS_ExclusiveLine( monitoring_variables=_RD_MONITORING_VARIABLES) -## B0 -> Ks0 tau l -@register_line_builder(hlt2_lines) -@configurable -def Hlt2_Bd2KsTauTau_LL_OS_ExclusiveLine( - name='Hlt2RD_BdToKsTauTau_KsLLToPiPi_TauTo3Pi_OS', - prescale=1, - persistreco=True): - """ - HLT2 line for Bd -> (Kshort->pi+ pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - - and for Bd -> (Kshort->pi+ pi-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-)+ CC - """ - ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) - dilepton = builder.make_dilepton_from_tauls(daughter_id="tau+") - decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" - b2xtaul = builder.make_beauty2xtaul( - particles=[dilepton, ks], descriptors=decay_descriptor) - - return Hlt2Line( - name=name, - prescale=prescale, - persistreco=persistreco, - algs=rd_prefilter() + [dilepton, ks, b2xtaul], - monitoring_variables=_RD_MONITORING_VARIABLES) - - -@register_line_builder(hlt2_lines) -@configurable -def Hlt2_Bd2KsTauTau_LL_SS_ExclusiveLine( - name='Hlt2RD_BdToKsTauTau_KsLLToPiPi_TauTo3Pi_SS', - prescale=1, - persistreco=True): - """ - HLT2 line for Bd -> (Kshort->pi+ pi-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - - and for Bd -> (Kshort->pi+ pi-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC - """ - ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) - dilepton = builder.make_dilepton_from_tauls(daughter_id="tau-") - decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" - b2xtaul = builder.make_beauty2xtaul( - particles=[dilepton, ks], descriptors=decay_descriptor) - - return Hlt2Line( - name=name, - prescale=prescale, - persistreco=persistreco, - algs=rd_prefilter() + [dilepton, ks, b2xtaul], - monitoring_variables=_RD_MONITORING_VARIABLES) - - -@register_line_builder(hlt2_lines) -@configurable -def Hlt2_Bd2KsTauMu_LL_OS_ExclusiveLine( - name='Hlt2RD_BdToKsTauMu_KsLLToPiPi_TauTo3Pi_OS', - prescale=1, - persistreco=True): - """ - HLT2 line for Bd -> (Kshort->pi+ pi-) (tau+->pi+pi+pi-) mu- + CC - - and for Bd -> (Kshort->pi+ pi-) (tau-->pi-pi-pi+) mu+ + CC - """ - ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) - dilepton = builder.make_dilepton_from_tauls(daughter_id="mu+") - decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" - b2xtaul = builder.make_beauty2xtaul( - particles=[dilepton, ks], descriptors=decay_descriptor) - - return Hlt2Line( - name=name, - prescale=prescale, - persistreco=persistreco, - algs=rd_prefilter() + [dilepton, ks, b2xtaul], - monitoring_variables=_RD_MONITORING_VARIABLES) - - -@register_line_builder(hlt2_lines) -@configurable -def Hlt2_Bd2KsTauMu_LL_SS_ExclusiveLine( - name='Hlt2RD_BdToKsTauMu_KsLLToPiPi_TauTo3Pi_SS', - prescale=1, - persistreco=True): - """ - HLT2 line for Bd -> (Kshort->pi+ pi-) (tau+->pi+pi+pi-) mu+ + CC - - and for Bd -> (Kshort->pi+ pi-) (tau-->pi-pi-pi+) mu- + CC - """ - ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) - dilepton = builder.make_dilepton_from_tauls(daughter_id="mu-") - decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" - b2xtaul = builder.make_beauty2xtaul( - particles=[dilepton, ks], descriptors=decay_descriptor) - - return Hlt2Line( - name=name, - prescale=prescale, - persistreco=persistreco, - algs=rd_prefilter() + [dilepton, ks, b2xtaul], - monitoring_variables=_RD_MONITORING_VARIABLES) - - -@register_line_builder(hlt2_lines) -@configurable -def Hlt2_Bd2KsTauE_LL_OS_ExclusiveLine( - name='Hlt2RD_BdToKsTauE_KsLLToPiPi_TauTo3Pi_OS', - prescale=1, - persistreco=True): - """ - HLT2 line for Bd -> (Kshort->pi+ pi-) (tau+->pi+pi+pi-) e- + CC - - and for Bd -> (Kshort->pi+ pi-) (tau-->pi-pi-pi+) e+ + CC - """ - ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) - dilepton = builder.make_dilepton_from_tauls(daughter_id="e+") - decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" - b2xtaul = builder.make_beauty2xtaul( - particles=[dilepton, ks], descriptors=decay_descriptor) - - return Hlt2Line( - name=name, - prescale=prescale, - persistreco=persistreco, - algs=rd_prefilter() + [dilepton, ks, b2xtaul], - monitoring_variables=_RD_MONITORING_VARIABLES) - - -@register_line_builder(hlt2_lines) -@configurable -def Hlt2_Bd2KsTauE_LL_SS_ExclusiveLine( - name='Hlt2RD_BdToKsTauE_KsLLToPiPi_TauTo3Pi_SS', - prescale=1, - persistreco=True): - """ - HLT2 line for Bd -> (Kshort->pi+ pi-) (tau+->pi+pi+pi-) e+ + CC - - and for Bd -> (Kshort->pi+ pi-) (tau-->pi-pi-pi+) e- + CC - """ - ks = common_builder.make_rd_ks0_lls(adocachi2cut=25., vchi2pdof_max=20.) - dilepton = builder.make_dilepton_from_tauls(daughter_id="e-") - decay_descriptor = "[B0 -> J/psi(1S) KS0]cc" - b2xtaul = builder.make_beauty2xtaul( - particles=[dilepton, ks], descriptors=decay_descriptor) - - return Hlt2Line( - name=name, - prescale=prescale, - persistreco=persistreco, - algs=rd_prefilter() + [dilepton, ks, b2xtaul], - monitoring_variables=_RD_MONITORING_VARIABLES) - - ## Bu -> K+ tau l @register_line_builder(hlt2_lines) @configurable @@ -1712,7 +1561,7 @@ def Hlt2_Lambdab2PKTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], monitoring_variables=_RD_MONITORING_VARIABLES) -- GitLab From f73976466e636ffe3c824b6340e91d30c4695362 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Tue, 15 Nov 2022 17:33:21 +0100 Subject: [PATCH 8/9] Restore refs files --- .../tests/refs/hlt2_noUT_trackefflines.ref | 6 ++-- .../refs/hlt2_reco_plus_thor_selections.ref | 32 ++++++++++------- ...hlt2_reco_plus_thor_selections_fastest.ref | 32 ++++++++++------- .../hlt2_reco_plus_thor_selections_legacy.ref | 34 +++++++++++-------- ...sspion_tagger_on_example_b2jpsik_lines.ref | 6 ++-- .../tests/refs/hlt2_trackefflines.ref | 10 +++--- .../tests/refs/hlt2_with_hlt1_decisions.ref | 2 +- 7 files changed, 70 insertions(+), 52 deletions(-) diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref index 6ef6a84e64f..4aa041becb8 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_noUT_trackefflines.ref @@ -164,19 +164,19 @@ FunctionalChargedProtoParticleMa... INFO Number of counters : 1 FunctionalChargedProtoParticleMa... INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 190 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 108 | 108 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 108 | 108 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 57 | 55 | 0.96491 | 0.95449 | 0.0000 | 4.0000 | | "Nb created particles" | 57 | 53 | 0.92982 | 0.98870 | 0.0000 | 4.0000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 9291 | 1279 |( 13.76601 +- 0.3574473)% | |*"# passed Track filter" | 9291 | 9291 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 100 | 610 | 6.1000 | 5.9775 | 0.0000 | 38.000 | | "Nb created particles" | 100 | 669 | 6.6900 | 5.2301 | 0.0000 | 27.000 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 190 | 190 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 190 | 190 |( 100.0000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref index bd75ad7dc37..1fd45360f4c 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections.ref @@ -164,58 +164,64 @@ FilteredPIDkaons INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 7087 | -FunctionalParticleMaker#1 INFO Number of counters : 3 +FunctionalParticleMaker INFO Number of counters : 3 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed Track filter" | 7087 | 0 |( 0.000000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "Nb created particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | -FunctionalParticleMaker#2 INFO Number of counters : 3 +FunctionalParticleMaker#1 INFO Number of counters : 3 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed Track filter" | 7087 | 0 |( 0.000000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "Nb created particles" | 99 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 43 | 42 |( 97.67442 +- 2.298381)% | - |*"# passed Track filter" | 43 | 43 |( 100.0000 +- 0.000000)% | - | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | - | "Nb created particles" | 1 | 20 | 20.000 | 0.0000 | 20.000 | 20.000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 + |*"# passed ProtoParticle filter" | 7087 | 6645 |( 93.76323 +- 0.2872533)% | + |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | + | "Nb created anti-particles" | 99 | 3331 | 33.646 | 21.718 | 0.0000 | 107.00 | + | "Nb created particles" | 99 | 3314 | 33.475 | 21.457 | 1.0000 | 103.00 | +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 6645 |( 93.76323 +- 0.2872533)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3331 | 33.646 | 21.718 | 0.0000 | 107.00 | | "Nb created particles" | 99 | 3314 | 33.475 | 21.457 | 1.0000 | 103.00 | -FunctionalParticleMaker#6 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 43 | 42 |( 97.67442 +- 2.298381)% | |*"# passed Track filter" | 43 | 43 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | | "Nb created particles" | 1 | 20 | 20.000 | 0.0000 | 20.000 | 20.000 | -FunctionalParticleMaker#7 INFO Number of counters : 4 +FunctionalParticleMaker#6 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | -FunctionalParticleMaker#8 INFO Number of counters : 4 +FunctionalParticleMaker#7 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | -FunctionalParticleMaker#9 INFO Number of counters : 4 +FunctionalParticleMaker#8 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 99 | 3556 | 35.919 | 23.386 | 1.0000 | 111.00 | | "Nb created particles" | 99 | 3531 | 35.667 | 23.027 | 1.0000 | 109.00 | +FunctionalParticleMaker#9 INFO Number of counters : 4 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"# passed ProtoParticle filter" | 7087 | 549 |( 7.746578 +- 0.3175521)% | + |*"# passed Track filter" | 7087 | 7087 |( 100.0000 +- 0.000000)% | + | "Nb created anti-particles" | 99 | 277 | 2.7980 | 4.2043 | 0.0000 | 22.000 | + | "Nb created particles" | 99 | 272 | 2.7475 | 3.1761 | 0.0000 | 15.000 | FutureEcalZSup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"No bank found" | 100 | 0 |( 0.000000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref index 8130cc94044..ce2ea9b9c9f 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_fastest.ref @@ -200,60 +200,66 @@ FilteredPIDkaons INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 7231 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1005 | 1005 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 1005 |( 13.89849 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 497 | 5.0202 | 3.3514 | 0.0000 | 17.000 | | "Nb created particles" | 99 | 508 | 5.1313 | 3.7943 | 0.0000 | 17.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1005 | 913 |( 90.84577 +- 0.9096623)% | |*"# passed Track filter" | 7231 | 1005 |( 13.89849 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 457 | 4.6162 | 3.1995 | 0.0000 | 17.000 | | "Nb created particles" | 99 | 456 | 4.6061 | 3.4431 | 0.0000 | 13.000 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 619 | 602 |( 97.25363 +- 0.6568810)% | - |*"# passed Track filter" | 738 | 619 |( 83.87534 +- 1.353737)% | - | "Nb created anti-particles" | 9 | 309 | 34.333 | 14.314 | 13.000 | 51.000 | - | "Nb created particles" | 9 | 293 | 32.556 | 17.964 | 12.000 | 73.000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 + |*"# passed ProtoParticle filter" | 6226 | 5937 |( 95.35818 +- 0.2666360)% | + |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | + | "Nb created anti-particles" | 99 | 2952 | 29.818 | 17.719 | 0.0000 | 74.000 | + | "Nb created particles" | 99 | 2985 | 30.152 | 17.978 | 0.0000 | 73.000 | +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 5937 |( 95.35818 +- 0.2666360)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 2952 | 29.818 | 17.719 | 0.0000 | 74.000 | | "Nb created particles" | 99 | 2985 | 30.152 | 17.978 | 0.0000 | 73.000 | -FunctionalParticleMaker#6 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 42 | 41 |( 97.61905 +- 2.352437)% | |*"# passed Track filter" | 50 | 42 |( 84.00000 +- 5.184593)% | | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | | "Nb created particles" | 1 | 19 | 19.000 | 0.0000 | 19.000 | 19.000 | -FunctionalParticleMaker#7 INFO Number of counters : 4 +FunctionalParticleMaker#6 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | -FunctionalParticleMaker#8 INFO Number of counters : 4 +FunctionalParticleMaker#7 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | -FunctionalParticleMaker#9 INFO Number of counters : 4 +FunctionalParticleMaker#8 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6226 | 6226 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | | "Nb created anti-particles" | 99 | 3092 | 31.232 | 18.655 | 1.0000 | 78.000 | | "Nb created particles" | 99 | 3134 | 31.657 | 18.982 | 1.0000 | 75.000 | +FunctionalParticleMaker#9 INFO Number of counters : 4 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"# passed ProtoParticle filter" | 6226 | 454 |( 7.292001 +- 0.3295167)% | + |*"# passed Track filter" | 7231 | 6226 |( 86.10151 +- 0.4068085)% | + | "Nb created anti-particles" | 99 | 230 | 2.3232 | 3.4196 | 0.0000 | 17.000 | + | "Nb created particles" | 99 | 224 | 2.2626 | 2.6269 | 0.0000 | 14.000 | FutureEcalZSup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"No bank found" | 100 | 0 |( 0.000000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref index 07cc2d3d5a1..285aa7d9a23 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_reco_plus_thor_selections_legacy.ref @@ -196,61 +196,67 @@ FilteredPIDkaons INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 7886 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1393 | 1393 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 1393 |( 17.66422 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 698 | 7.0505 | 5.2827 | 0.0000 | 22.000 | | "Nb created particles" | 99 | 695 | 7.0202 | 5.1971 | 0.0000 | 23.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1393 | 1232 |( 88.44221 +- 0.8566267)% | |*"# passed Track filter" | 7886 | 1393 |( 17.66422 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 622 | 6.2828 | 4.9687 | 0.0000 | 22.000 | | "Nb created particles" | 99 | 610 | 6.1616 | 4.6356 | 0.0000 | 19.000 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"# passed ProtoParticle filter" | 629 | 610 |( 96.97933 +- 0.6824420)% | - |*"# passed Track filter" | 778 | 629 |( 80.84833 +- 1.410747)% | - | "Nb created anti-particles" | 9 | 319 | 35.444 | 15.664 | 13.000 | 57.000 | - | "Nb created particles" | 9 | 291 | 32.333 | 15.578 | 11.000 | 60.000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 + |*"# passed ProtoParticle filter" | 6493 | 6186 |( 95.27183 +- 0.2633941)% | + |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | + | "Nb created anti-particles" | 99 | 3075 | 31.061 | 19.018 | 0.0000 | 87.000 | + | "Nb created particles" | 99 | 3111 | 31.424 | 19.535 | 0.0000 | 89.000 | +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6186 |( 95.27183 +- 0.2633941)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3075 | 31.061 | 19.018 | 0.0000 | 87.000 | | "Nb created particles" | 99 | 3111 | 31.424 | 19.535 | 0.0000 | 89.000 | -FunctionalParticleMaker#6 INFO Number of counters : 4 +FunctionalParticleMaker#5 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 42 | 41 |( 97.61905 +- 2.352437)% | |*"# passed Track filter" | 51 | 42 |( 82.35294 +- 5.338148)% | | "Nb created anti-particles" | 1 | 22 | 22.000 | 0.0000 | 22.000 | 22.000 | | "Nb created particles" | 1 | 19 | 19.000 | 0.0000 | 19.000 | 19.000 | -FunctionalParticleMaker#7 INFO Number of counters : 4 +FunctionalParticleMaker#6 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | -FunctionalParticleMaker#8 INFO Number of counters : 4 +FunctionalParticleMaker#7 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | -FunctionalParticleMaker#9 INFO Number of counters : 4 +FunctionalParticleMaker#8 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 6493 | 6493 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | | "Nb created anti-particles" | 99 | 3230 | 32.626 | 20.107 | 1.0000 | 91.000 | | "Nb created particles" | 99 | 3263 | 32.960 | 20.529 | 1.0000 | 92.000 | -utureEcalZSup INFO Number of counters : 1 +FunctionalParticleMaker#9 INFO Number of counters : 4 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"# passed ProtoParticle filter" | 6493 | 476 |( 7.330972 +- 0.3234636)% | + |*"# passed Track filter" | 7886 | 6493 |( 82.33578 +- 0.4294505)% | + | "Nb created anti-particles" | 99 | 238 | 2.4040 | 3.4900 | 0.0000 | 18.000 | + | "Nb created particles" | 99 | 238 | 2.4040 | 2.7668 | 0.0000 | 14.000 | +FutureEcalZSup INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"No bank found" | 100 | 0 |( 0.000000 +- 0.000000)% | FutureHcalZSup INFO Number of counters : 1 diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref index 6e294c4d529..4431e248d2b 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_sspion_tagger_on_example_b2jpsik_lines.ref @@ -95,19 +95,19 @@ DeterministicPrescaler#1 INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 9525 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 9525 | 1273 |( 13.36483 +- 0.3486554)% | |*"# passed Track filter" | 9525 | 9525 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 100 | 595 | 5.9500 | 4.4640 | 0.0000 | 23.000 | | "Nb created particles" | 100 | 678 | 6.7800 | 5.7734 | 0.0000 | 30.000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 9525 | 8938 |( 93.83727 +- 0.2464006)% | |*"# passed Track filter" | 9525 | 9525 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 100 | 4430 | 44.300 | 20.155 | 7.0000 | 133.00 | | "Nb created particles" | 100 | 4508 | 45.080 | 20.832 | 11.000 | 114.00 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 2756 | 2581 |( 93.65022 +- 0.4645091)% | |*"# passed Track filter" | 2756 | 2756 |( 100.0000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref index 7ff48267441..b00dc80f01a 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_trackefflines.ref @@ -241,31 +241,31 @@ FunctionalChargedProtoParticleMa... INFO Number of counters : 1 FunctionalChargedProtoParticleMa... INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 258 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 138 | 138 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 138 | 138 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 54 | 74 | 1.3704 | 1.2367 | 0.0000 | 6.0000 | | "Nb created particles" | 54 | 64 | 1.1852 | 1.0554 | 0.0000 | 5.0000 | -FunctionalParticleMaker#2 INFO Number of counters : 4 +FunctionalParticleMaker#1 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 7982 | 1129 |( 14.14432 +- 0.3900495)% | |*"# passed Track filter" | 9330 | 7982 |( 85.55198 +- 0.3639807)% | | "Nb created anti-particles" | 100 | 567 | 5.6700 | 5.4883 | 0.0000 | 43.000 | | "Nb created particles" | 100 | 562 | 5.6200 | 4.1201 | 0.0000 | 22.000 | -FunctionalParticleMaker#3 INFO Number of counters : 4 +FunctionalParticleMaker#2 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 2459 | 348 |( 14.15209 +- 0.7029039)% | |*"# passed Track filter" | 2459 | 2459 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 31 | 169 | 5.4516 | 4.8048 | 0.0000 | 20.000 | | "Nb created particles" | 31 | 179 | 5.7742 | 3.4521 | 1.0000 | 16.000 | -FunctionalParticleMaker#4 INFO Number of counters : 4 +FunctionalParticleMaker#3 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 127 | 127 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 127 | 127 |( 100.0000 +- 0.000000)% | | "Nb created anti-particles" | 74 | 67 | 0.90541 | 0.97494 | 0.0000 | 6.0000 | | "Nb created particles" | 74 | 60 | 0.81081 | 0.91053 | 0.0000 | 3.0000 | -FunctionalParticleMaker#5 INFO Number of counters : 4 +FunctionalParticleMaker#4 INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 254 | 254 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 254 | 254 |( 100.0000 +- 0.000000)% | diff --git a/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref b/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref index 418c8d4a2bb..e66e9e80914 100644 --- a/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref +++ b/Hlt/Hlt2Conf/tests/refs/hlt2_with_hlt1_decisions.ref @@ -100,7 +100,7 @@ DeterministicPrescaler INFO Number of counters : 1 FunctionalChargedProtoParticleMaker INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "CreatedProtos" | 625 | -FunctionalParticleMaker#1 INFO Number of counters : 4 +FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 625 | 582 |( 93.12000 +- 1.012455)% | |*"# passed Track filter" | 625 | 625 |( 100.0000 +- 0.000000)% | -- GitLab From a126752070582311a5a728a9a81bb3562c6d0f46 Mon Sep 17 00:00:00 2001 From: Tommaso Fulghesu <tommaso.fulghesu@cern.ch> Date: Wed, 16 Nov 2022 16:26:37 +0100 Subject: [PATCH 9/9] Improve naming for sprucing lines --- .../python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py index 277b3435c10..dbc77fd22df 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xtaul_spruce.py @@ -408,7 +408,7 @@ def Spruce_Bd2PhiTauE_SS_ExclusiveLine( @register_line_builder(sprucing_lines) @configurable def Spruce_Bd2RhoTauTau_OS_ExclusiveLine( - name='SpruceRD_BdToRhoTauTau_Rho2PiPi_TauTo3Pi_OS', prescale=1): + name='SpruceRD_BdToRhoTauTau_RhoToPiPi_TauTo3Pi_OS', prescale=1): """ Sprucing line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC @@ -430,7 +430,7 @@ def Spruce_Bd2RhoTauTau_OS_ExclusiveLine( @register_line_builder(sprucing_lines) @configurable def Spruce_Bd2RhoTauTau_SS_ExclusiveLine( - name='SpruceRD_BdToRhoTauTau_Rho2PiPi_TauTo3Pi_SS', prescale=1): + name='SpruceRD_BdToRhoTauTau_RhoToPiPi_TauTo3Pi_SS', prescale=1): """ Sprucing line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC @@ -452,7 +452,7 @@ def Spruce_Bd2RhoTauTau_SS_ExclusiveLine( @register_line_builder(sprucing_lines) @configurable def Spruce_Bd2RhoTauMu_OS_ExclusiveLine( - name='SpruceRD_BdToRhoTauMu_Rho2PiPi_TauTo3Pi_OS', prescale=1): + name='SpruceRD_BdToRhoTauMu_RhoToPiPi_TauTo3Pi_OS', prescale=1): """ Sprucing line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) mu- + CC @@ -474,7 +474,7 @@ def Spruce_Bd2RhoTauMu_OS_ExclusiveLine( @register_line_builder(sprucing_lines) @configurable def Spruce_Bd2RhoTauMu_SS_ExclusiveLine( - name='SpruceRD_BdToRhoTauMu_Rho2PiPi_TauTo3Pi_SS', prescale=1): + name='SpruceRD_BdToRhoTauMu_RhoToPiPi_TauTo3Pi_SS', prescale=1): """ Sprucing line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) mu+ + CC @@ -496,7 +496,7 @@ def Spruce_Bd2RhoTauMu_SS_ExclusiveLine( @register_line_builder(sprucing_lines) @configurable def Spruce_Bd2RhoTauE_OS_ExclusiveLine( - name='SpruceRD_BdToRhoTauE_Rho2PiPi_TauTo3Pi_OS', prescale=1): + name='SpruceRD_BdToRhoTauE_RhoToPiPi_TauTo3Pi_OS', prescale=1): """ Sprucing line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) e- + CC @@ -518,7 +518,7 @@ def Spruce_Bd2RhoTauE_OS_ExclusiveLine( @register_line_builder(sprucing_lines) @configurable def Spruce_Bd2RhoTauE_SS_ExclusiveLine( - name='SpruceRD_BdToRhoTauE_Rho2PiPi_TauTo3Pi_SS', prescale=1): + name='SpruceRD_BdToRhoTauE_RhoToPiPi_TauTo3Pi_SS', prescale=1): """ Sprucing line for Bd -> (rho->pi+ pi-) (tau+->pi+pi+pi-) e+ + CC -- GitLab