From 69a878ef9b3f14163aefee2393728c628084f680 Mon Sep 17 00:00:00 2001 From: mstahl <marian.stahl@cern.ch> Date: Mon, 5 Sep 2022 11:55:49 +0200 Subject: [PATCH 1/4] [line monitoring] change logic of default monitors, such that variables are passed as list; switch off mass monitors for any rare decay line --- .../Hlt2Conf/lines/charm/rare_charm_lines.py | 107 ++++++ .../Hlt2Conf/lines/charm/rare_charm_makers.py | 2 + .../lines/generic_lines_thor/generic_lines.py | 2 +- .../Hlt2Conf/lines/monitoring/pi0_line.py | 2 +- .../python/Hlt2Conf/lines/rd/RpK_lines.py | 22 +- .../lines/rd/b_to_Xdilepton_detached.py | 30 +- .../python/Hlt2Conf/lines/rd/b_to_hemu.py | 42 ++- .../lines/rd/b_to_hemu_control_modes.py | 42 ++- .../Hlt2Conf/lines/rd/b_to_kstarmumu.py | 3 +- .../python/Hlt2Conf/lines/rd/b_to_ll_LFV.py | 12 +- .../lines/rd/b_to_majolep_majo_to_leppi.py | 36 ++- .../Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py | 13 +- .../lines/rd/b_to_xgamma_exclusive_hlt2.py | 4 +- .../python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py | 30 +- .../python/Hlt2Conf/lines/rd/baryonic.py | 38 ++- .../Hlt2Conf/lines/rd/baryonic_radiative.py | 12 +- .../Hlt2Conf/lines/rd/bnv_lines_hlt2.py | 82 ++++- .../lines/rd/builders/rd_prefilters.py | 7 + .../Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py | 304 +++++++++++------- .../lines/rd/hlt2_btosmutau_exclusive.py | 266 ++++++++++++--- .../lines/rd/hlt2_btostautau_exclusive.py | 172 ++++++++-- .../Hlt2Conf/lines/rd/lfv_lines_hlt2.py | 50 ++- .../lines/rd/omega_rare_decay_lines.py | 24 +- .../python/Hlt2Conf/lines/rd/qqbar_to_ll.py | 41 ++- .../Hlt2Conf/lines/rd/rare_tau_decay_lines.py | 32 +- .../python/Hlt2Conf/lines/rd/strange.py | 13 +- Hlt/Moore/python/Moore/lines.py | 10 +- Hlt/Moore/python/Moore/monitoring.py | 100 +++--- doc/tutorials/hlt2_line.rst | 11 +- 29 files changed, 1127 insertions(+), 382 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py index bd57fa0f807..f6b884431d4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_lines.py @@ -233,6 +233,7 @@ def dstar2dzeropi_dzero2mumu_line(name='Hlt2Charm_DstpToD0Pip_D0ToMumMup_Line', name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -258,6 +259,7 @@ def dstar2dzeropi_dzero2mue_line(name='Hlt2Charm_DstpToD0Pip_D0ToMumpEpm_Line', name=name, algs=charm_prefilters() + [electrons, muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -279,6 +281,7 @@ def dstar2dzeropi_dzero2ee_line(name='Hlt2Charm_DstpToD0Pip_D0ToEmEp_Line', name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -306,6 +309,7 @@ def dstar2dzeropi_dzero2taue_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -331,6 +335,7 @@ def dstar2dzeropi_dzero2pe_line(name='Hlt2Charm_DstpToD0Pip_D0ToPmpEpm_Line', name=name, algs=charm_prefilters() + [electrons, protons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -356,6 +361,7 @@ def dstar2dzeropi_dzero2pmu_line(name='Hlt2Charm_DstpToD0Pip_D0ToPmpMupm_Line', name=name, algs=charm_prefilters() + [muons, protons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -384,6 +390,7 @@ def dstar2dzeropi_dzero2pipi_line( name=name, algs=charm_prefilters() + [pions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -408,6 +415,7 @@ def dstar2dzeropi_dzero2kpi_line( name=name, algs=charm_prefilters() + [kaons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -442,6 +450,7 @@ def dstar2dzeropi_dzero2Kmu_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -466,6 +475,7 @@ def dstar2dzeropi_dzero2mumumumu_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -488,6 +498,7 @@ def dstar2dzeropi_dzero2eeee_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -526,6 +537,7 @@ def dstar2dzeropi_dzero2mumuee_line( name=name, algs=charm_prefilters() + [muons, electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -547,6 +559,7 @@ def d2pimumuos_line(name='Hlt2Charm_DpDspToPipMumMup_Line', prescale=1): name=name, algs=charm_prefilters() + [muons, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -567,6 +580,7 @@ def d2pimumuss_line(name='Hlt2Charm_DpDspToPimMupMup_Line', prescale=1): name=name, algs=charm_prefilters() + [muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -588,6 +602,7 @@ def d2pimumuwscontrol_line( name=name, algs=charm_prefilters() + [muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -609,6 +624,7 @@ def d2kmumuos_line(name='Hlt2Charm_DpDspToKpMumMup_Line', prescale=1): name=name, algs=charm_prefilters() + [muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -629,6 +645,7 @@ def d2kmumuss_line(name='Hlt2Charm_DpDspToKmMupMup_Line', prescale=1): name=name, algs=charm_prefilters() + [muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -650,6 +667,7 @@ def d2kmumuwscontrol_line( name=name, algs=charm_prefilters() + [muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -673,6 +691,7 @@ def d2pieeos_line(name='Hlt2Charm_DpDspToPipEmEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -698,6 +717,7 @@ def d2pieess_line(name='Hlt2Charm_DpDspToPimEpEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -722,6 +742,7 @@ def d2pieewscontrol_line(name='Hlt2Charm_DpDspToPipEpEp_RareCharmControl_Line', name=name, algs=charm_prefilters() + [electrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -746,6 +767,7 @@ def d2keeos_line(name='Hlt2Charm_DpDspToKpEmEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -771,6 +793,7 @@ def d2keess_line(name='Hlt2Charm_DpDspToKmEpEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -797,6 +820,7 @@ def d2keewscontrol_line(name='Hlt2Charm_DpDspToKpEpEp_RareCharmControl_Line', name=name, algs=charm_prefilters() + [electrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -824,6 +848,7 @@ def d2pimueos_line(name='Hlt2Charm_DpDspToPipMupEm_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -848,6 +873,7 @@ def d2piemuos_line(name='Hlt2Charm_DpDspToPipMumEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -872,6 +898,7 @@ def d2pimuess_line(name='Hlt2Charm_DpDspToPimMupEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -897,6 +924,7 @@ def d2pimuewscontrol_line( name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -924,6 +952,7 @@ def d2kmueos_line(name='Hlt2Charm_DpDspToKpMupEm_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -948,6 +977,7 @@ def d2kemuos_line(name='Hlt2Charm_DpDspToKpMumEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -972,6 +1002,7 @@ def d2kmuess_line(name='Hlt2Charm_DpDspToKmMupEp_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -997,6 +1028,7 @@ def d2kmuewscontrol_line(name='Hlt2Charm_DpDspToKpMupEp_RareCharmControl_Line', name=name, algs=charm_prefilters() + [electrons, muons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1021,6 +1053,7 @@ def d2kpipioscontrol_line( name=name, algs=charm_prefilters() + [dipions, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1042,6 +1075,7 @@ def d2pipipioscontrol_line( name=name, algs=charm_prefilters() + [dipions, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1071,6 +1105,7 @@ def d2kskcontrol_line(name='Hlt2Charm_DpDspToKsKp_LL_RareCharmControl_Line', name=name, algs=charm_prefilters() + [kaons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1100,6 +1135,7 @@ def d2kspicontrol_line(name='Hlt2Charm_DpDspToKsPip_LL_RareCharmControl_Line', name=name, algs=charm_prefilters() + [pions, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1126,6 +1162,7 @@ def dstar2dzeropi_dzero2pipimumuos_line( name=name, algs=charm_prefilters() + [dimuons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1149,6 +1186,7 @@ def dstar2dzeropi_dzero2pipieeos_line( name=name, algs=charm_prefilters() + [dielectrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1179,6 +1217,7 @@ def dstar2dzeropi_dzero2pipimumuss_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1209,6 +1248,7 @@ def dstar2dzeropi_dzero2pipieess_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1238,6 +1278,7 @@ def dstar2dzeropi_dzero2pipimueos_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1272,6 +1313,7 @@ def dstar2dzeropi_dzero2pipimuess_line( name=name, algs=charm_prefilters() + [electrons, muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1299,6 +1341,7 @@ def dstar2dzeropi_dzero2pipimumusscontrol_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1330,6 +1373,7 @@ def dstar2dzeropi_dzero2pipieesscontrol_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1354,6 +1398,7 @@ def dstar2dzeropi_dzero2kkmumuos_line( name=name, algs=charm_prefilters() + [muons, dimuons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1377,6 +1422,7 @@ def dstar2dzeropi_dzero2kkeeos_line( name=name, algs=charm_prefilters() + [electrons, dielectrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1407,6 +1453,7 @@ def dstar2dzeropi_dzero2kkmumuss_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1437,6 +1484,7 @@ def dstar2dzeropi_dzero2kkeess_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1466,6 +1514,7 @@ def dstar2dzeropi_dzero2kkmueos_line( name=name, algs=charm_prefilters() + [electrons, muons, kaons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1493,6 +1542,7 @@ def dstar2dzeropi_dzero2kkmumusscontrol_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1524,6 +1574,7 @@ def dstar2dzeropi_dzero2kkeesscontrol_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1558,6 +1609,7 @@ def dstar2dzeropi_dzero2kkmuess_line( name=name, algs=charm_prefilters() + [electrons, muons, kaons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1581,6 +1633,7 @@ def dstar2dzeropi_dzero2kpimumurs_line( name=name, algs=charm_prefilters() + [muons, dimuons, dzeros_rs, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1601,6 +1654,7 @@ def dstar2dzeropi_dzero2kpimumuws_line( name=name, algs=charm_prefilters() + [muons, dimuons, dzeros_ws, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1618,6 +1672,7 @@ def dzero2kpimumuosuntagged_line(name='Hlt2Charm_D0ToKmPipMumMup_Untag_Line', name=name, algs=charm_prefilters() + [muons, dimuons, dzeros], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1640,6 +1695,7 @@ def dstar2dzeropi_dzero2kpieers_line( name=name, algs=charm_prefilters() + [electrons, dielectrons, dzeros_rs, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1662,6 +1718,7 @@ def dstar2dzeropi_dzero2kpieews_line( name=name, algs=charm_prefilters() + [electrons, dielectrons, dzeros_ws, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1681,6 +1738,7 @@ def dzero2kpieeosuntagged_line(name='Hlt2Charm_D0ToKmPipEmEp_Untag_Line', name=name, algs=charm_prefilters() + [electrons, dielectrons, dzeros], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1716,6 +1774,7 @@ def dstar2dzeropi_dzero2kpimumuss_line( name=name, algs=charm_prefilters() + [muons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1751,6 +1810,7 @@ def dstar2dzeropi_dzero2kpieess_line( name=name, algs=charm_prefilters() + [electrons, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1783,6 +1843,7 @@ def dstar2dzeropi_dzero2kpimuers_line( algs=charm_prefilters() + [electrons, muons, kaons, pions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1815,6 +1876,7 @@ def dstar2dzeropi_dzero2kpimuews_line( algs=charm_prefilters() + [electrons, muons, kaons, pions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1843,6 +1905,7 @@ def dstar2dzeropi_dzero2kpimumusscontrol_line( name=name, algs=charm_prefilters() + [muons, kaons, pions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1878,6 +1941,7 @@ def dstar2dzeropi_dzero2kpimuess_line( name=name, algs=charm_prefilters() + [muons, kaons, pions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1910,6 +1974,7 @@ def dstar2dzeropi_dzero2kpieesscontrol_line( name=name, algs=charm_prefilters() + [electrons, kaons, pions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1942,6 +2007,7 @@ def dstar2dzeropi_dzero2pipipipicontrol_line( name=name, algs=charm_prefilters() + [pions, dipions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1971,6 +2037,7 @@ def dstar2dzeropi_dzero2kkpipicontrol_line( name=name, algs=charm_prefilters() + [kaons, dipions, dzeros, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -1999,6 +2066,7 @@ def dstar2dzeropi_dzero2kpipipirscontrol_line( name=name, algs=charm_prefilters() + [kaons, dipions, dzeros_rs, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2027,6 +2095,7 @@ def dstar2dzeropi_dzero2kpipipiwscontrol_line( name=name, algs=charm_prefilters() + [kaons, dipions, dzeros_ws, dstars], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2048,6 +2117,7 @@ def d2kksllmumuos_line(name='Hlt2Charm_DpDspToKsKpMumMup_LL_Line', prescale=1): name=name, algs=charm_prefilters() + [muons, kaons, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2066,6 +2136,7 @@ def d2kksddmumuos_line(name='Hlt2Charm_DpDspToKsKpMumMup_DD_Line', prescale=1): name=name, algs=charm_prefilters() + [muons, kaons, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2085,6 +2156,7 @@ def d2piksllmumuos_line(name='Hlt2Charm_DpDspToKsPipMumMup_LL_Line', name=name, algs=charm_prefilters() + [muons, pions, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2104,6 +2176,7 @@ def d2piksddmumuos_line(name='Hlt2Charm_DpDspToKsPipMumMup_DD_Line', name=name, algs=charm_prefilters() + [muons, pions, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2123,6 +2196,7 @@ def d2kpi0mergedmumuos_line(name='Hlt2Charm_DpDspToPi0KpMumMup_M_Line', name=name, algs=charm_prefilters() + [muons, kaons, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2142,6 +2216,7 @@ def d2kpi0resolvedmumuos_line(name='Hlt2Charm_DpDspToPi0KpMumMup_R_Line', name=name, algs=charm_prefilters() + [muons, kaons, dimuons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2162,6 +2237,7 @@ def d2kkslleeos_line(name='Hlt2Charm_DpDspToKsKpEmEp_LL_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, kaons, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2182,6 +2258,7 @@ def d2kksddeeos_line(name='Hlt2Charm_DpDspToKsKpEmEp_DD_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, kaons, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2202,6 +2279,7 @@ def d2pikslleeos_line(name='Hlt2Charm_DpDspToKsPipEmEp_LL_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, pions, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2222,6 +2300,7 @@ def d2piksddeeos_line(name='Hlt2Charm_DpDspToKsPipEmEp_DD_Line', prescale=1): name=name, algs=charm_prefilters() + [electrons, pions, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2242,6 +2321,7 @@ def d2kpi0mergedeeos_line(name='Hlt2Charm_DpDspToPi0KpEmEp_M_Line', name=name, algs=charm_prefilters() + [electrons, kaons, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2262,6 +2342,7 @@ def d2kpi0resolvedeeos_line(name='Hlt2Charm_DpDspToPi0KpEmEp_R_Line', name=name, algs=charm_prefilters() + [electrons, kaons, dielectrons, ds], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2285,6 +2366,7 @@ def Lc2pmumuos_line(name='Hlt2Charm_LcpToPpMumMup_Line', prescale=1): name=name, algs=charm_prefilters() + [protons, muons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2305,6 +2387,7 @@ def Lc2pmumuss_line(name='Hlt2Charm_LcpToPmMupMup_Line', prescale=1): name=name, algs=charm_prefilters() + [protons, muons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2326,6 +2409,7 @@ def Lc2peeos_line(name='Hlt2Charm_LcpToPpEmEp_Line', prescale=1): name=name, algs=charm_prefilters() + [protons, electrons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2351,6 +2435,7 @@ def Lc2peess_line(name='Hlt2Charm_LcpToPmEpEp_Line', prescale=1): name=name, algs=charm_prefilters() + [protons, electrons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2380,6 +2465,7 @@ def Lc2pmumeos_line(name='Hlt2Charm_LcpToPpMumpEpm_Line', prescale=1): name=name, algs=charm_prefilters() + [protons, electrons, muons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2396,6 +2482,7 @@ def Lc2pksllcontrol_line(name='Hlt2Charm_LcpToKsPp_LL_RareCharmControl_Line', name=name, algs=charm_prefilters() + [protons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2414,6 +2501,7 @@ def Lc2pksddcontrol_line(name='Hlt2Charm_LcpToKsPp_DD_RareCharmControl_Line', name=name, algs=charm_prefilters() + [protons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2444,6 +2532,7 @@ def Lc2ppipicontrol_line(name='Hlt2Charm_LcpToPpPimPip_RareCharmControl_Line', name=name, algs=charm_prefilters() + [protons, lambdas], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2465,6 +2554,7 @@ def xic2lambdallmumu_line(name='Hlt2Charm_Xic0ToL0MumMup_LL_Line', name=name, algs=charm_prefilters() + [muons, dimuons, xic], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2486,6 +2576,7 @@ def xic2lambdaddmumu_line(name='Hlt2Charm_Xic0ToL0MumMup_DD_Line', name=name, algs=charm_prefilters() + [muons, dimuons, xic], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2507,6 +2598,7 @@ def xic2lambdaddee_line(name='Hlt2Charm_Xic0ToL0EmEp_DD_Line', prescale=1.0): name=name, algs=charm_prefilters() + [electrons, dielectrons, xic], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2528,6 +2620,7 @@ def xic2lambdallee_line(name='Hlt2Charm_Xic0ToL0EmEp_LL_Line', prescale=1.0): name=name, algs=charm_prefilters() + [electrons, dielectrons, xic], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2557,6 +2650,7 @@ def b2dstarmu_dzero2kpieers_line( algs=charm_prefilters() + [tag_mu, electrons, dielectrons, dzeros_rs, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2583,6 +2677,7 @@ def b2dstarmu_dzero2kpieews_line( algs=charm_prefilters() + [tag_mu, electrons, dielectrons, dzeros_ws, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2607,6 +2702,7 @@ def b2dstarmu_dzero2kpimumurs_line( name=name, algs=charm_prefilters() + [tag_mu, muons, dimuons, dzeros_rs, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2631,6 +2727,7 @@ def b2dstarmu_dzero2kpimumuws_line( name=name, algs=charm_prefilters() + [tag_mu, muons, dimuons, dzeros_ws, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2656,6 +2753,7 @@ def b2dmu_d2pieeos_line(name='Hlt2Charm_B2DpDspMumX_DpDspToPipEmEp_Line', name=name, algs=charm_prefilters() + [tag_mu, electrons, dielectrons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2681,6 +2779,7 @@ def b2dmu_d2keeos_line(name='Hlt2Charm_B2DpDspMumX_DpDspToKpEmEp_Line', name=name, algs=charm_prefilters() + [tag_mu, electrons, dielectrons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2705,6 +2804,7 @@ def b2dmu_d2pimumuos_line(name='Hlt2Charm_B2DpDspMumX_DpDspToPipMumMup_Line', name=name, algs=charm_prefilters() + [tag_mu, muons, dimuons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2729,6 +2829,7 @@ def b2dmu_d2kmumuos_line(name='Hlt2Charm_B2DpDspMumX_DpDspToKpMumMup_Line', name=name, algs=charm_prefilters() + [tag_mu, muons, dimuons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2755,6 +2856,7 @@ def b2lcmu_Lc2pmumuos_line(name='Hlt2Charm_B2LcpMum_LcpToPpMumMup_Line', name=name, algs=charm_prefilters() + [tag_mu, protons, muons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2782,6 +2884,7 @@ def b2lcmu_Lc2peeos_line(name='Hlt2Charm_B2LcpMum_LcpToPpEmEp_Line', name=name, algs=charm_prefilters() + [tag_mu, protons, electrons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2801,6 +2904,7 @@ def b2lcmu_Lc2pksllcontrol_line( name=name, algs=charm_prefilters() + [tag_mu, protons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2821,6 +2925,7 @@ def b2lcmu_Lc2pksddcontrol_line( name=name, algs=charm_prefilters() + [tag_mu, protons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2854,6 +2959,7 @@ def b2dmu_d2kskcontrol_line( name=name, algs=charm_prefilters() + [tag_mu, kaons, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) @@ -2887,4 +2993,5 @@ def b2dmu_d2kspicontrol_line( name=name, algs=charm_prefilters() + [tag_mu, pions, bs], prescale=prescale, + monitoring_variables=m._MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py index 1bda5b3513b..844e955698b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -46,6 +46,8 @@ from PyConf.Algorithms import FunctionalDiElectronMaker from Functors.math import in_range import Functors as F from .particle_properties import _PION_M, _PI0_M + +_MONITORING_VARIABLES = ["pt", "eta", "vchi2", "ipchi2"] """****************************************""" """Common cuts""" """****************************************""" diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py index 98e2f48be78..e08cb2c9781 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py @@ -332,7 +332,7 @@ def bs2jpsiphi_jpsi2mumu_phi2kk_line( name=name, algs=upfront_reconstruction() + [require_pvs(pvs), phi_mon, jpsi, bs], prescale=prescale, - default_monitoring=False, + monitoring_variables=[], ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py index b7814ce86dd..a5b4002d087 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py @@ -41,5 +41,5 @@ def monitoring_pi0_line(name="Hlt2MonitoringPi0Line", prescale=1e-6): name=name, algs=upfront_reconstruction() + pi0_monitoring(name), prescale=prescale, - default_monitoring=False, + monitoring_variables=[], ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py index 713600f03eb..398b7517422 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py @@ -22,7 +22,7 @@ The following modes are included: from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors from .builders.rdbuilder_thor import (make_rd_detached_dimuon, make_rd_detached_dielectron) from .builders.RpK_builders import (make_lambdab_to_pkll, @@ -39,7 +39,10 @@ def lambdab_to_pkmumu_line(name="Hlt2RD_LambdabToPKMuMu_Line", prescale=1): dihadrons = make_dihadron_from_pK() lambdab = make_lambdab_to_pkll(dileptons, dihadrons, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [lambdab], prescale=prescale) + name=name, + algs=rd_prefilter() + [lambdab], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -51,7 +54,10 @@ def lambdab_to_pkmumu_ss_line(name="Hlt2RD_LambdabToPKMuMu_SS_Line", dihadrons = make_dihadron_from_pK(same_sign=True) lambdab = make_lambdab_to_pkll(dileptons, dihadrons, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [lambdab], prescale=prescale) + name=name, + algs=rd_prefilter() + [lambdab], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -62,7 +68,10 @@ def lambdab_to_pkee_line(name="Hlt2RD_LambdabToPKEE_Line", prescale=1): dihadrons = make_dihadron_from_pK() lambdab = make_lambdab_to_pkll(dileptons, dihadrons, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [lambdab], prescale=prescale) + name=name, + algs=rd_prefilter() + [lambdab], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -73,4 +82,7 @@ def lambdab_to_pkee_ss_line(name="Hlt2RD_LambdabToPKEE_SS_Line", prescale=1): dihadrons = make_dihadron_from_pK(same_sign=True) lambdab = make_lambdab_to_pkll(dileptons, dihadrons, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [lambdab], prescale=prescale) + name=name, + algs=rd_prefilter() + [lambdab], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py index 1e426db832c..bb4fb11a501 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py @@ -19,7 +19,7 @@ Authors: Martin Andersson, Eluned Smith from Moore.config import register_line_builder from Moore.lines import Hlt2Line -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors from GaudiKernel.SystemOfUnits import MeV from RecoConf.reconstruction_objects import make_pvs @@ -52,7 +52,10 @@ def bdtokstLLP_LLPtomumu_line(name="Hlt2RD_BdToKstLLP_LLPToMuMu_Line", m_min=4500 * MeV) return Hlt2Line( - name=name, algs=rd_prefilter() + [dimuons, kst, bd], prescale=prescale) + name=name, + algs=rd_prefilter() + [dimuons, kst, bd], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -75,7 +78,10 @@ def butokpLLP_LLPtomumu_line(name="Hlt2RD_BuToKpLLP_LLPToMuMu_Line", m_min=4500 * MeV) return Hlt2Line( - name=name, algs=rd_prefilter() + [dimuons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dimuons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) ### ee ### @@ -100,7 +106,8 @@ def bdtokstLLP_LLPtoee_line(name="Hlt2RD_BdToKstLLP_LLPToEE_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [dielectrons, kst, bd], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -122,7 +129,10 @@ def butokpLLP_LLPtoee_line(name="Hlt2RD_BuToKpLLP_LLPToEE_Line", fdchi2_min=121, m_min=4500 * MeV) return Hlt2Line( - name=name, algs=rd_prefilter() + [dielectrons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dielectrons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) ### mu e ### @@ -145,7 +155,10 @@ def bdtokstLLP_LLPtomue_line(name="Hlt2RD_BdToKstLLP_LLPToMuE_Line", fdchi2_min=121, m_min=4500 * MeV) return Hlt2Line( - name=name, algs=rd_prefilter() + [mues, kst, bd], prescale=prescale) + name=name, + algs=rd_prefilter() + [mues, kst, bd], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -168,4 +181,7 @@ def butokpLLP_LLPtomue_line(name="Hlt2RD_BuToKpLLP_LLPToMuE_Line", m_min=4500 * MeV) return Hlt2Line( - name=name, algs=rd_prefilter() + [mues, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [mues, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py index 6a199d7226e..1637a94ff44 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py @@ -17,7 +17,7 @@ B+ -> K+ e mu B+ -> pi+ e mu Bs -> phi(-> K+ K-) e mu Bd -> K*(892)0(-> K+ pi-) e mu -Lb -> p K e mu +Lb -> p K e mu """ from Moore.config import register_line_builder @@ -32,7 +32,7 @@ import Functors as F from .builders import b_to_hemu_builders from .builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors all_lines = {} @@ -52,7 +52,10 @@ def butokemu_line(name="Hlt2RD_BuToKpEMu_Line", prescale=1): "[B+ -> J/psi(1S) K+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -70,7 +73,10 @@ def butopiemu_line(name="Hlt2RD_BuToPipEMu_Line", prescale=1): "[B+ -> J/psi(1S) pi+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -98,7 +104,8 @@ def bstophiemu_line(name="Hlt2RD_BsToPhiEMu_PhiToKK_Line", prescale=1): return Hlt2Line( name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -120,7 +127,8 @@ def bdtokstemu_line(name="Hlt2RD_BdToKstEMu_KstToKpPim_Line", prescale=1): return Hlt2Line( name=name, algs=rd_prefilter() + [kstars, dileptons, bd], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -149,7 +157,8 @@ def lbtopkemu_line(name="Hlt2RD_LbToPKEMu_Line", prescale=1): return Hlt2Line( name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -167,7 +176,10 @@ def butokemuSS_line(name="Hlt2RD_BuToKpEMu_SameSign_Line", prescale=1): "[B+ -> J/psi(1S) K+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -185,7 +197,10 @@ def butopiemuSS_line(name="Hlt2RD_BuToPipEMu_SameSign_Line", prescale=1): "[B+ -> J/psi(1S) pi+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -214,7 +229,8 @@ def bstophiemuSS_line(name="Hlt2RD_BsToPhiEMu_SameSign_PhiToKK_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -237,7 +253,8 @@ def bdtokstemuSS_line(name="Hlt2RD_BdToKstEMu_SameSign_KstToKpPim_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [kstars, dileptons, bd], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -266,4 +283,5 @@ def lbtopkemuSS_line(name="Hlt2RD_LbToPKEMu_SameSign_Line", prescale=1): return Hlt2Line( name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py index 083e75556f3..59326f84e06 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py @@ -17,7 +17,7 @@ B+ -> K+ Jpsi B+ -> pi+ Jpsi Bs -> phi(-> K+ K-) Jpsi Bd -> K*(892)0(-> K+ pi-) Jpsi -Lb -> p K Jpsi +Lb -> p K Jpsi """ from Moore.config import register_line_builder @@ -32,7 +32,7 @@ import Functors as F from .builders import b_to_hemu_builders from .builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors all_lines = {} @@ -47,7 +47,10 @@ def butokjpsi_mumu_line(name="Hlt2RD_BuToKpJpsi_JpsiToMuMu_Line", prescale=1): "[B+ -> J/psi(1S) K+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -61,7 +64,10 @@ def butopijpsi_mumu_line(name="Hlt2RD_BuToPipJpsi_JpsiToMuMu_Line", "[B+ -> J/psi(1S) pi+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -86,7 +92,8 @@ def bstophijpsi_mumu_line(name="Hlt2RD_BsToPhiJpsi_PhiToKK_JpsiToMuMu_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -105,7 +112,8 @@ def bdtokstjpsi_mumu_line(name="Hlt2RD_BdToKstJpsi_KstToKpPim_JpsiToMuMu_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [kstars, dileptons, bd], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -130,7 +138,8 @@ def lbtopkjpsi_mumu_line(name="Hlt2RD_LbToPKJpsi_JpsiToMuMu_Line", prescale=1): return Hlt2Line( name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -144,7 +153,10 @@ def butokjpsi_ee_line(name="Hlt2RD_BuToKpJpsi_JpsiToEE_Line", prescale=1): "[B+ -> J/psi(1S) K+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -158,7 +170,10 @@ def butopijpsi_ee_line(name="Hlt2RD_BuToPipJpsi_JpsiToEE_Line", prescale=1): "[B+ -> J/psi(1S) pi+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [dileptons, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -184,7 +199,8 @@ def bstophijpsi_ee_line(name="Hlt2RD_BsToPhiJpsi_PhiToKK_JpsiToEE_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -204,7 +220,8 @@ def bdtokstjpsi_ee_line(name="Hlt2RD_BdToKstJpsi_KstToKpPim_JpsiToEE_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [kstars, dileptons, bd], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -230,4 +247,5 @@ def lbtopkjpsi_ee_line(name="Hlt2RD_LbToPKJpsi_JpsiToEE_Line", prescale=1): return Hlt2Line( name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py index 20be2f53742..8f4406d8489 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py @@ -17,7 +17,7 @@ from RecoConf.reconstruction_objects import make_pvs from .builders import b0_builder_kstarmumu from Hlt2Conf.lines.rd.builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors all_lines = {} @@ -37,4 +37,5 @@ def BdToKstarMuMu_line(name="Hlt2RD_BdToKstarMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [b], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py index 283d072e326..8fa958ed560 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py @@ -27,7 +27,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from PyConf import configurable from Hlt2Conf.lines.rd.builders.b_to_ll_LFV_builder import make_B_from_taumu, make_B_from_taue, make_taus, make_muons, make_electrons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors hlt2_lines = {} @@ -38,7 +38,7 @@ def Hlt2_Bs2TauMu_OS_ExclusiveLine(name='Hlt2RD_BsToTauMu_TauTo3Pi_OS_Line', prescale=1): """ HLT2 line for B(s) -> (tau+->pi+pi+pi-) mu- + CC - + and for B(s) -> (tau-->pi-pi-pi+) mu+ + CC """ @@ -50,7 +50,8 @@ def Hlt2_Bs2TauMu_OS_ExclusiveLine(name='Hlt2RD_BsToTauMu_TauTo3Pi_OS_Line', return Hlt2Line( name=name, prescale=prescale, - algs=rd_prefilter() + [taus, B_candidate]) + algs=rd_prefilter() + [taus, B_candidate], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -59,7 +60,7 @@ def Hlt2_Bs2TauE_OS_ExclusiveLine(name='Hlt2RD_BsToTauE_TauTo3Pi_OS_Line', prescale=1): """ HLT2 line for B(s) -> (tau+->pi+pi+pi-) e- + CC - + and for B(s) -> (tau-->pi-pi-pi+) e+ + CC """ @@ -71,4 +72,5 @@ def Hlt2_Bs2TauE_OS_ExclusiveLine(name='Hlt2RD_BsToTauE_TauTo3Pi_OS_Line', return Hlt2Line( name=name, prescale=prescale, - algs=rd_prefilter() + [taus, B_candidate]) + algs=rd_prefilter() + [taus, B_candidate], + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py index 80db7bfa33d..aac067f99e7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py @@ -49,7 +49,7 @@ from RecoConf.reconstruction_objects import make_pvs from Hlt2Conf.lines.rd.builders import rad_incl_builder from Hlt2Conf.lines.rd.builders.majorana_builder import make_majorana_lepton, make_majorana, make_bhadron_majorana -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors import Functors as F all_lines = {} @@ -97,7 +97,8 @@ def BpToMajoMu_MajoToEPi_LL_Tight_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -139,7 +140,8 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -187,7 +189,8 @@ def BpToMajoMu_MajoToEPi_DD_Tight_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -237,7 +240,8 @@ def BpToMajoE_MajoToMuPi_DD_Tight_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -282,7 +286,8 @@ def BpToMajoMu_MajoToEPi_LL_Loose_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -324,7 +329,8 @@ def BpToMajoE_MajoToMuPi_LL_Loose_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -372,7 +378,8 @@ def BpToMajoMu_MajoToEPi_DD_Loose_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -422,7 +429,8 @@ def BpToMajoE_MajoToMuPi_DD_Loose_line( return Hlt2Line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -453,7 +461,10 @@ def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2RD_BuToKs0Pi_Ks0ToPiPi_LL_Line", descriptor='[B+ -> KS0 pi+]cc') return Hlt2Line( - name=name, algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], prescale=prescale) + name=name, + algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -483,4 +494,7 @@ def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2RD_BuToKs0Pi_Ks0ToPiPi_DD_Line", descriptor='[B+ -> KS0 pi+]cc') return Hlt2Line( - name=name, algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], prescale=prescale) + name=name, + algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py index 44a56502485..70ecc49eb6f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py @@ -19,7 +19,7 @@ with: J/psi(1S) -> mu+ mu- [J/psi(1S) -> mu+ e-]cc -Contact: Harry Cliff (harry.victor.cliff@cern.ch) +Contact: Harry Cliff (harry.victor.cliff@cern.ch) """ from GaudiKernel.SystemOfUnits import MeV @@ -31,7 +31,7 @@ from Hlt2Conf.lines.rd.builders.rdbuilder_thor import ( make_rd_detached_dimuon, make_rd_detached_dielectron, make_rd_detached_mue, make_rd_ks0_lls, make_rd_lambda_lls, make_rd_detached_pions) -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors from Hlt2Conf.lines.rd.builders.b_to_v0ll_builder import ( make_b2ksll, make_lambdab2lambdall, make_b2kspill, make_ksttokspi) @@ -77,6 +77,7 @@ def b2ksmumull_line(name="Hlt2RD_BdToKSMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsMuMu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -108,6 +109,7 @@ def b2kseell_line(name="Hlt2RD_BdToKSEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsEE], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -141,6 +143,7 @@ def b2ksmuell_line(name="Hlt2RD_BdToKSMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsMuE], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -177,6 +180,7 @@ def lambdab2lambdamumull_line(name="Hlt2RD_LbToLMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LMuMu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -208,6 +212,7 @@ def lambdab2lambdaeell_line(name="Hlt2RD_LbToLEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LEE], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -241,6 +246,7 @@ def lambdab2lambdamuell_line(name="Hlt2RD_LbToLMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LMuE], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -286,6 +292,7 @@ def b2kspimumull_line(name="Hlt2RD_BuToKSPipMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiMuMu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -326,6 +333,7 @@ def b2kspieell_line(name="Hlt2RD_BuToKSPipEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiEE], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -368,4 +376,5 @@ def b2kspimuell_line(name="Hlt2RD_BuToKSPipMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiMuE], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py index 1ebdfce9d0f..3fd80728a6a 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py @@ -31,7 +31,7 @@ from Hlt2Conf.lines.rd.builders.rdbuilder_thor import ( from Hlt2Conf.lines.rd.builders.b_to_xgamma_exclusive_builders import ( make_b2xgamma_excl) -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors all_lines = {} @@ -70,6 +70,7 @@ def bs_to_phigamma_line(name="Hlt2RD_BsToPhiGamma_Line", algs=rd_prefilter() + [phis, b_s0], prescale=prescale, persistreco=persistreco, + monitoring_variables=rd_default_monitors(), ) @@ -115,4 +116,5 @@ def bd_to_kstgamma_line(name="Hlt2RD_BdToKstGamma_Line", algs=rd_prefilter() + [kst, b0], prescale=prescale, persistreco=persistreco, + monitoring_variables=rd_default_monitors(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py index 3bcfec30d07..5290a0f3e5f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py @@ -10,7 +10,7 @@ ############################################################################### from Moore.lines import Hlt2Line from Moore.config import register_line_builder -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors from RecoConf.reconstruction_objects import make_pvs from .builders import rdbuilder_thor from .builders import b_to_xll_builders @@ -70,6 +70,7 @@ def BuToKpEE_line(name="Hlt2RD_BuToKpEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -97,6 +98,7 @@ def BuToPipEE_line(name="Hlt2RD_BuToPipEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -131,6 +133,7 @@ def B0ToKpPimEE_line(name="Hlt2RD_B0ToKpPimEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, hadron, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -157,6 +160,7 @@ def B0ToKpKmEE_line(name="Hlt2RD_B0ToKpKmEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, dikaons, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -187,6 +191,7 @@ def B0ToPipPimEE_line(name="Hlt2RD_B0ToPipPimEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, dipions, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -226,6 +231,7 @@ def BuToKpPipPimEE_line(name="Hlt2RD_BuToKstpEE_KstpToKpPipPim_Line", name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -256,6 +262,7 @@ def BuToKpKmKpEE_line(name="Hlt2RD_BuToKstpEE_KstpToKpKpKm_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -285,6 +292,7 @@ def BuToKpEE_SameSign_line(name="Hlt2RD_BuToKpEE_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -312,6 +320,7 @@ def BuToPipEE_SameSign_line(name="Hlt2RD_BuToPipEE_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -347,6 +356,7 @@ def B0ToKpPimEE_SameSign_line(name="Hlt2RD_B0ToKpPimEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, hadron, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -374,6 +384,7 @@ def B0ToKpKmEE_SameSign_line(name="Hlt2RD_B0ToKpKmEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, dikaons, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -404,6 +415,7 @@ def B0ToPipPimEE_SameSign_line(name="Hlt2RD_B0ToPipPimEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, dipions, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -442,6 +454,7 @@ def BuToKpPipPimEE_SameSign_line( name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -473,6 +486,7 @@ def BuToKpKmKpEE_SameSign_line( name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -502,6 +516,7 @@ def BuToKpMuMu_line(name="Hlt2RD_BuToKpMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -531,6 +546,7 @@ def BuToPipMuMu_line(name="Hlt2RD_BuToPipMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -567,6 +583,7 @@ def B0ToKpPimMuMu_line(name="Hlt2RD_B0ToKpPimMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, hadron, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -594,6 +611,7 @@ def B0ToKpKmMuMu_line(name="Hlt2RD_B0ToKpKmMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, dikaons, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -624,6 +642,7 @@ def B0ToPipPimMuMu_line(name="Hlt2RD_B0ToPipPimMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, dipions, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -664,6 +683,7 @@ def BuToKpPipPimMuMu_line(name="Hlt2RD_BuToKstpMuMu_KstpToKpPipPim_Line", name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -696,6 +716,7 @@ def BuToKpKmKpMuMu_line(name="Hlt2RD_BuToKstpMuMu_KstpToKpKpKm_Line", name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -727,6 +748,7 @@ def BuToKpMuMu_SameSign_line(name="Hlt2RD_BuToKpMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -756,6 +778,7 @@ def BuToPipMuMu_SameSign_line(name="Hlt2RD_BuToPipMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -792,6 +815,7 @@ def B0ToKpPimMuMu_SameSign_line(name="Hlt2RD_B0ToKpPimMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, hadron, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -820,6 +844,7 @@ def B0ToKpKmMuMu_SameSign_line(name="Hlt2RD_B0ToKpKmMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, dikaons, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -851,6 +876,7 @@ def B0ToPipPimMuMu_SameSign_line(name="Hlt2RD_B0ToPipPimMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, dipions, B0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -892,6 +918,7 @@ def BuToKpPipPimMuMu_SameSign_line( name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -925,4 +952,5 @@ def BuToKpKmKpMuMu_SameSign_line( name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py index c35ad438f98..4f50178bead 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py @@ -27,7 +27,7 @@ from Moore.lines import Hlt2Line from GaudiKernel.SystemOfUnits import GeV, MeV from RecoConf.reconstruction_objects import make_pvs #from Hlt2Conf.algorithms import ParticleContainersMerger -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors from .builders.baryonic_builders import ( make_xim_to_lambda_pi_lll, make_xim_to_lambda_pi_ddl, @@ -72,7 +72,8 @@ def Hlt2RD_XibmToXimMuMu_LLL_Line(name="Hlt2RD_XibmToXimMuMu_LLL_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -107,7 +108,8 @@ def Hlt2RD_XibmToXimMuMu_DDL_Line(name="Hlt2RD_XibmToXimMuMu_DDL_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -142,7 +144,8 @@ def Hlt2RD_XibmToXimMuMu_DDD_Line(name="Hlt2RD_XibmToXimMuMu_DDD_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -175,7 +178,8 @@ def Hlt2RD_OmegabmToOmegamMuMu_LLL_Line( return Hlt2Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -210,7 +214,8 @@ def Hlt2RD_OmegabmToOmegamMuMu_DDL_Line( return Hlt2Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -245,7 +250,8 @@ def Hlt2RD_OmegabmToOmegamMuMu_DDD_Line( return Hlt2Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -272,7 +278,8 @@ def Hlt2RD_XibmToXimEE_LLL_Line(name="Hlt2RD_XibmToXimEE_LLL_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -301,7 +308,8 @@ def Hlt2RD_XibmToXimEE_DDL_Line(name="Hlt2RD_XibmToXimEE_DDL_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -330,7 +338,8 @@ def Hlt2RD_XibmToXimEE_DDD_Line(name="Hlt2RD_XibmToXimEE_DDD_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -357,7 +366,8 @@ def Hlt2RD_OmegabmToOmegamEE_LLL_Line(name="Hlt2RD_OmegabmToOmegamEE_LLL_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -386,7 +396,8 @@ def Hlt2RD_OmegabmToOmegamEE_DDL_Line(name="Hlt2RD_OmegabmToOmegamEE_DDL_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -415,4 +426,5 @@ def Hlt2RD_OmegabmToOmegamEE_DDD_Line(name="Hlt2RD_OmegabmToOmegamEE_DDD_Line", return Hlt2Line( name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], - prescale=prescale) + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py index b79e4ab346f..e85cccb8b68 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py @@ -33,7 +33,7 @@ from Hlt2Conf.lines.rd.builders.baryonic_radiative_builders import ( from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_photons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors from Moore.config import register_line_builder from Moore.lines import Hlt2Line @@ -88,7 +88,10 @@ def xibtoxigamma_xitolpi_lll_line( ) return Hlt2Line( - name=name, algs=rd_prefilter() + [xim, xibm], prescale=prescale) + name=name, + algs=rd_prefilter() + [xim, xibm], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -137,4 +140,7 @@ def obtoomgamma_omtol0k_omtol0k_lll_line( ) return Hlt2Line( - name=name, algs=rd_prefilter() + [omegam, omegabm], prescale=prescale) + name=name, + algs=rd_prefilter() + [omegam, omegabm], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py index ca4bfecc608..afc70f5de5b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py @@ -41,7 +41,7 @@ from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_pions, make_rd_detached_kaons, make_rd_detached_protons from Hlt2Conf.lines.rd.builders.bnv_builders import make_BToHMu, make_LzToHMu, make_LbToHMu, make_BToLcMu, make_LcToPKPi, make_LbToDsMu, make_DsToKKPi -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors from RecoConf.reconstruction_objects import make_pvs @@ -67,7 +67,11 @@ def BToPMu_line(name="Hlt2RD_BToPpMu_Line", prescale=1 / 2.): B = make_BToHMu(pvs, proton, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [B], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -82,7 +86,11 @@ def BToPMu_SS_line(name="Hlt2RD_BToPpMu_SS_Line", prescale=1): B = make_BToHMu(pvs, proton, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [B], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 2) Lz -> pi mu @@ -98,7 +106,11 @@ def LambdaToPiMu_line(name="Hlt2RD_LambdaToPipMu_Line", prescale=1): Lz = make_LzToHMu(pvs, pion, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lz], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lz], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -113,7 +125,11 @@ def LambdaToPiMu_SS_line(name="Hlt2RD_LambdaToPipMu_SS_Line", prescale=1): Lz = make_LzToHMu(pvs, pion, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lz], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lz], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 3) Lz -> K mu @@ -129,7 +145,11 @@ def LambdaToKMu_line(name="Hlt2RD_LambdaToKpMu_Line", prescale=1): Lz = make_LzToHMu(pvs, kaon, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lz], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lz], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -144,7 +164,11 @@ def LambdaToKMu_SS_line(name="Hlt2RD_LambdaToKpMu_SS_Line", prescale=1 / 2.): Lz = make_LzToHMu(pvs, kaon, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lz], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lz], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 4) Lb -> pi mu @@ -160,7 +184,11 @@ def LbToPiMu_line(name="Hlt2RD_LbToPipMu_Line", prescale=1): Lb = make_LbToHMu(pvs, pion, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lb], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -175,7 +203,11 @@ def LbToPiMu_SS_line(name="Hlt2RD_LbToPipMu_SS_Line", prescale=1): Lb = make_LbToHMu(pvs, pion, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lb], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 5) Lb -> K mu @@ -191,7 +223,11 @@ def LbToKMu_line(name="Hlt2RD_LbToKpMu_Line", prescale=1): Lb = make_LbToHMu(pvs, kaon, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lb], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -206,7 +242,11 @@ def LbToKMu_SS_line(name="Hlt2RD_LbToKpMu_SS_Line", prescale=1): Lb = make_LbToHMu(pvs, kaon, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lb], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 6) B -> Lc mu @@ -224,7 +264,10 @@ def BToLcMu_line(name="Hlt2RD_BToLcMu_LcToPpKmPip_Line", prescale=1): B = make_BToLcMu(pvs, Lambda_c, muon, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [Lambda_c, B], prescale=prescale) + name=name, + algs=rd_prefilter() + [Lambda_c, B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -241,7 +284,10 @@ def BToLcMu_SS_line(name="Hlt2RD_BToLcMu_SS_LcToPpKmPip_Line", prescale=1): B = make_BToLcMu(pvs, Lambda_c, muon, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [Lambda_c, B], prescale=prescale) + name=name, + algs=rd_prefilter() + [Lambda_c, B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 7) Lb -> Ds mu @@ -258,7 +304,10 @@ def LbToDsMu_line(name="Hlt2RD_LbToDsMu_DsToKpKmPip_Line", prescale=1): Lb = make_LbToDsMu(pvs, Ds, muon, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [Ds, Lb], prescale=prescale) + name=name, + algs=rd_prefilter() + [Ds, Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -274,4 +323,7 @@ def LbToDsMu_SS_line(name="Hlt2RD_LbToDsMu_SS_DsToKpKmPip_Line", prescale=1): Lb = make_LbToDsMu(pvs, Ds, muon, descriptor) return Hlt2Line( - name=name, algs=rd_prefilter() + [Ds, Lb], prescale=prescale) + name=name, + algs=rd_prefilter() + [Ds, Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py index f0f7b1cf51b..a7bb7c8250e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py @@ -56,6 +56,13 @@ def rd_prefilter_noPV(require_GEC=False): return upfront_reconstruction() + gec +def rd_default_monitors(): + """ + Returns default list of variables to monitor ["pt","eta","vchi2","ipchi2"] + """ + return ["pt", "eta", "vchi2", "ipchi2"] + + ################# ## END OF FILE ## ################# diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py index 751677fc796..cdb2cabe418 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py @@ -57,13 +57,13 @@ from PyConf import configurable from GaudiKernel.SystemOfUnits import MeV, GeV from Hlt2Conf.lines.rd.builders import beauty2xtaul_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_default_monitors import Functors as F hlt2_lines = {} PROCESS = "hlt2" """ -Set persistreco=True to save the full event reconstruction for sprucing a given HLT2 line +Set persistreco=True to save the full event reconstruction for sprucing a given HLT2 line """ @@ -76,7 +76,7 @@ def Hlt2_Bd2KstTauTau_OS_ExclusiveLine( persistreco=False): """ 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( @@ -102,7 +102,8 @@ def Hlt2_Bd2KstTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kst, b2xtaul]) + algs=rd_prefilter() + [dilepton, kst, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -113,7 +114,7 @@ def Hlt2_Bd2KstTauTau_SS_ExclusiveLine( persistreco=False): """ 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( @@ -139,7 +140,8 @@ def Hlt2_Bd2KstTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kst, b2xtaul]) + algs=rd_prefilter() + [dilepton, kst, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -150,7 +152,7 @@ def Hlt2_Bd2KstTauMu_OS_ExclusiveLine( persistreco=False): """ 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( @@ -175,7 +177,8 @@ def Hlt2_Bd2KstTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kst, b2xtaul]) + algs=rd_prefilter() + [dilepton, kst, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -186,7 +189,7 @@ def Hlt2_Bd2KstTauMu_SS_ExclusiveLine( persistreco=False): """ 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( @@ -211,7 +214,8 @@ def Hlt2_Bd2KstTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kst, b2xtaul]) + algs=rd_prefilter() + [dilepton, kst, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -222,7 +226,7 @@ def Hlt2_Bd2KstTauE_OS_ExclusiveLine( persistreco=False): """ 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( @@ -247,7 +251,8 @@ def Hlt2_Bd2KstTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kst, b2xtaul]) + algs=rd_prefilter() + [dilepton, kst, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -258,7 +263,7 @@ def Hlt2_Bd2KstTauE_SS_ExclusiveLine( persistreco=False): """ 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( @@ -283,7 +288,8 @@ def Hlt2_Bd2KstTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kst, b2xtaul]) + algs=rd_prefilter() + [dilepton, kst, b2xtaul], + monitoring_variables=rd_default_monitors()) ## B0 -> phi tau l @@ -295,7 +301,7 @@ def Hlt2_Bd2PhiTauTau_OS_ExclusiveLine( persistreco=False): """ 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() @@ -308,7 +314,8 @@ def Hlt2_Bd2PhiTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -319,7 +326,7 @@ def Hlt2_Bd2PhiTauTau_SS_ExclusiveLine( persistreco=False): """ 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() @@ -332,7 +339,8 @@ def Hlt2_Bd2PhiTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -343,7 +351,7 @@ def Hlt2_Bd2PhiTauMu_OS_ExclusiveLine( persistreco=False): """ 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() @@ -356,7 +364,8 @@ def Hlt2_Bd2PhiTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -367,7 +376,7 @@ def Hlt2_Bd2PhiTauMu_SS_ExclusiveLine( persistreco=False): """ 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() @@ -380,7 +389,8 @@ def Hlt2_Bd2PhiTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -391,7 +401,7 @@ def Hlt2_Bd2PhiTauE_OS_ExclusiveLine( persistreco=False): """ 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() @@ -404,7 +414,8 @@ def Hlt2_Bd2PhiTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -415,7 +426,7 @@ def Hlt2_Bd2PhiTauE_SS_ExclusiveLine( persistreco=False): """ 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() @@ -428,7 +439,8 @@ def Hlt2_Bd2PhiTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) ## B0 -> rho tau l @@ -440,7 +452,7 @@ def Hlt2_Bd2RhoTauTau_OS_ExclusiveLine( persistreco=False): """ 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() @@ -453,7 +465,8 @@ def Hlt2_Bd2RhoTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, rho, b2xtaul]) + algs=rd_prefilter() + [dilepton, rho, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -464,7 +477,7 @@ def Hlt2_Bd2RhoTauTau_SS_ExclusiveLine( persistreco=False): """ 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() @@ -477,7 +490,8 @@ def Hlt2_Bd2RhoTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, rho, b2xtaul]) + algs=rd_prefilter() + [dilepton, rho, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -488,7 +502,7 @@ def Hlt2_Bd2RhoTauMu_OS_ExclusiveLine( persistreco=False): """ 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() @@ -501,7 +515,8 @@ def Hlt2_Bd2RhoTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, rho, b2xtaul]) + algs=rd_prefilter() + [dilepton, rho, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -512,7 +527,7 @@ def Hlt2_Bd2RhoTauMu_SS_ExclusiveLine( persistreco=False): """ 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() @@ -525,7 +540,8 @@ def Hlt2_Bd2RhoTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, rho, b2xtaul]) + algs=rd_prefilter() + [dilepton, rho, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -536,7 +552,7 @@ def Hlt2_Bd2RhoTauE_OS_ExclusiveLine( persistreco=False): """ 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() @@ -549,7 +565,8 @@ def Hlt2_Bd2RhoTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, rho, b2xtaul]) + algs=rd_prefilter() + [dilepton, rho, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -560,7 +577,7 @@ def Hlt2_Bd2RhoTauE_SS_ExclusiveLine( persistreco=False): """ 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,7 +590,8 @@ def Hlt2_Bd2RhoTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, rho, b2xtaul]) + algs=rd_prefilter() + [dilepton, rho, b2xtaul], + monitoring_variables=rd_default_monitors()) ## B0 -> eta' tau l @@ -585,7 +603,7 @@ def Hlt2_Bd2EtapTauTau_OS_ExclusiveLine( persistreco=False): """ 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() @@ -598,7 +616,8 @@ def Hlt2_Bd2EtapTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -609,7 +628,7 @@ def Hlt2_Bd2EtapTauTau_SS_ExclusiveLine( persistreco=False): """ 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() @@ -622,7 +641,8 @@ def Hlt2_Bd2EtapTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -633,7 +653,7 @@ def Hlt2_Bd2EtapTauMu_OS_ExclusiveLine( persistreco=False): """ 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() @@ -646,7 +666,8 @@ def Hlt2_Bd2EtapTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -657,7 +678,7 @@ def Hlt2_Bd2EtapTauMu_SS_ExclusiveLine( persistreco=False): """ 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() @@ -670,7 +691,8 @@ def Hlt2_Bd2EtapTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -681,7 +703,7 @@ def Hlt2_Bd2EtapTauE_OS_ExclusiveLine( persistreco=False): """ 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() @@ -694,7 +716,8 @@ def Hlt2_Bd2EtapTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -705,7 +728,7 @@ def Hlt2_Bd2EtapTauE_SS_ExclusiveLine( persistreco=False): """ 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() @@ -718,7 +741,8 @@ def Hlt2_Bd2EtapTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) ## Bu -> K+ tau l @@ -730,7 +754,7 @@ def Hlt2_Bu2KplusTauTau_OS_ExclusiveLine( persistreco=False): """ 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( @@ -744,7 +768,8 @@ def Hlt2_Bu2KplusTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kaon, b2xtaul]) + algs=rd_prefilter() + [dilepton, kaon, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -755,7 +780,7 @@ def Hlt2_Bu2KplusTauTau_SS_ExclusiveLine( persistreco=False): """ 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( @@ -769,7 +794,8 @@ def Hlt2_Bu2KplusTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kaon, b2xtaul]) + algs=rd_prefilter() + [dilepton, kaon, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -779,7 +805,7 @@ def Hlt2_Bu2KplusTauMu_OS_ExclusiveLine( persistreco=False): """ 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( @@ -793,7 +819,8 @@ def Hlt2_Bu2KplusTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kaon, b2xtaul]) + algs=rd_prefilter() + [dilepton, kaon, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -803,7 +830,7 @@ def Hlt2_Bu2KplusTauMu_SS_ExclusiveLine( persistreco=False): """ 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( @@ -817,7 +844,8 @@ def Hlt2_Bu2KplusTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kaon, b2xtaul]) + algs=rd_prefilter() + [dilepton, kaon, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -827,7 +855,7 @@ def Hlt2_Bu2KplusTauE_OS_ExclusiveLine( persistreco=False): """ 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( @@ -841,7 +869,8 @@ def Hlt2_Bu2KplusTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kaon, b2xtaul]) + algs=rd_prefilter() + [dilepton, kaon, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -851,7 +880,7 @@ def Hlt2_Bu2KplusTauE_SS_ExclusiveLine( persistreco=False): """ 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( @@ -865,7 +894,8 @@ def Hlt2_Bu2KplusTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, kaon, b2xtaul]) + algs=rd_prefilter() + [dilepton, kaon, b2xtaul], + monitoring_variables=rd_default_monitors()) ## Bu -> K1(1270)+ tau l @@ -877,7 +907,7 @@ def Hlt2_Bu2K1plusTauTau_OS_ExclusiveLine( persistreco=False): """ 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() @@ -890,7 +920,8 @@ def Hlt2_Bu2K1plusTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, k1, b2xtaul]) + algs=rd_prefilter() + [dilepton, k1, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -901,7 +932,7 @@ def Hlt2_Bu2K1plusTauTau_SS_ExclusiveLine( persistreco=False): """ 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() @@ -914,7 +945,8 @@ def Hlt2_Bu2K1plusTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, k1, b2xtaul]) + algs=rd_prefilter() + [dilepton, k1, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -925,7 +957,7 @@ def Hlt2_Bu2K1plusTauMu_OS_ExclusiveLine( persistreco=False): """ 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() @@ -938,7 +970,8 @@ def Hlt2_Bu2K1plusTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, k1, b2xtaul]) + algs=rd_prefilter() + [dilepton, k1, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -949,7 +982,7 @@ def Hlt2_Bu2K1plusTauMu_SS_ExclusiveLine( persistreco=False): """ 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() @@ -962,7 +995,8 @@ def Hlt2_Bu2K1plusTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, k1, b2xtaul]) + algs=rd_prefilter() + [dilepton, k1, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -973,7 +1007,7 @@ def Hlt2_Bu2K1plusTauE_OS_ExclusiveLine( persistreco=False): """ 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() @@ -986,7 +1020,8 @@ def Hlt2_Bu2K1plusTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, k1, b2xtaul]) + algs=rd_prefilter() + [dilepton, k1, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -997,7 +1032,7 @@ def Hlt2_Bu2K1plusTauE_SS_ExclusiveLine( persistreco=False): """ 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() @@ -1010,7 +1045,8 @@ def Hlt2_Bu2K1plusTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, k1, b2xtaul]) + algs=rd_prefilter() + [dilepton, k1, b2xtaul], + monitoring_variables=rd_default_monitors()) ## Bs -> phi tau l @@ -1022,7 +1058,7 @@ def Hlt2_Bs2PhiTauTau_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (phi->K+ K-) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Bs -> (phi->K+ K-) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ phi = builder.filter_rd_detached_phis() @@ -1035,7 +1071,8 @@ def Hlt2_Bs2PhiTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1046,7 +1083,7 @@ def Hlt2_Bs2PhiTauTau_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (phi->K+ K-) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Bs -> (phi->K+ K-) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ phi = builder.filter_rd_detached_phis() @@ -1059,7 +1096,8 @@ def Hlt2_Bs2PhiTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1070,7 +1108,7 @@ def Hlt2_Bs2PhiTauMu_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (phi->K+ K-) (tau+->pi+pi+pi-) mu- + CC - + and for Bs -> (phi->K+ K-) (tau-->pi-pi-pi+) mu+ + CC """ phi = builder.filter_rd_detached_phis() @@ -1083,7 +1121,8 @@ def Hlt2_Bs2PhiTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1094,7 +1133,7 @@ def Hlt2_Bs2PhiTauMu_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (phi->K+ K-) (tau+->pi+pi+pi-) mu+ + CC - + and for Bs -> (phi->K+ K-) (tau-->pi-pi-pi+) mu- + CC """ phi = builder.filter_rd_detached_phis() @@ -1107,7 +1146,8 @@ def Hlt2_Bs2PhiTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1118,7 +1158,7 @@ def Hlt2_Bs2PhiTauE_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (phi->K+ K-) (tau+->pi+pi+pi-) e- + CC - + and for Bs -> (phi->K+ K-) (tau-->pi-pi-pi+) e+ + CC """ phi = builder.filter_rd_detached_phis() @@ -1131,7 +1171,8 @@ def Hlt2_Bs2PhiTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1142,7 +1183,7 @@ def Hlt2_Bs2PhiTauE_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (phi->K+ K-) (tau+->pi+pi+pi-) e+ + CC - + and for Bs -> (phi->K+ K-) (tau-->pi-pi-pi+) e- + CC """ phi = builder.filter_rd_detached_phis() @@ -1155,7 +1196,8 @@ def Hlt2_Bs2PhiTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, phi, b2xtaul]) + algs=rd_prefilter() + [dilepton, phi, b2xtaul], + monitoring_variables=rd_default_monitors()) ## Bs -> eta' tau l @@ -1167,7 +1209,7 @@ def Hlt2_Bs2EtapTauTau_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) (tau-->pi-pi-pi+) + CC - + and for Bs -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) (tau+->pi+pi+pi-) + CC """ etap = builder.make_rd_detached_etaps() @@ -1180,7 +1222,8 @@ def Hlt2_Bs2EtapTauTau_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1191,7 +1234,7 @@ def Hlt2_Bs2EtapTauTau_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) (tau+->pi+pi+pi-) + CC - + and for Bs -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) (tau-->pi-pi-pi+) + CC """ etap = builder.make_rd_detached_etaps() @@ -1204,7 +1247,8 @@ def Hlt2_Bs2EtapTauTau_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1215,7 +1259,7 @@ def Hlt2_Bs2EtapTauMu_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) mu- + CC - + and for Bs -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) mu+ + CC """ etap = builder.make_rd_detached_etaps() @@ -1228,7 +1272,8 @@ def Hlt2_Bs2EtapTauMu_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1239,7 +1284,7 @@ def Hlt2_Bs2EtapTauMu_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) mu+ + CC - + and for Bs -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) mu- + CC """ etap = builder.make_rd_detached_etaps() @@ -1252,7 +1297,8 @@ def Hlt2_Bs2EtapTauMu_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1263,7 +1309,7 @@ def Hlt2_Bs2EtapTauE_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) e- + CC - + and for Bs -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) e+ + CC """ etap = builder.make_rd_detached_etaps() @@ -1276,7 +1322,8 @@ def Hlt2_Bs2EtapTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1287,7 +1334,7 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Bs -> (eta'->pi+ pi- gamma) (tau+->pi+pi+pi-) e+ + CC - + and for Bs -> (eta'->pi+ pi- gamma) (tau-->pi-pi-pi+) e- + CC """ etap = builder.make_rd_detached_etaps() @@ -1300,7 +1347,8 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, etap, b2xtaul]) + algs=rd_prefilter() + [dilepton, etap, b2xtaul], + monitoring_variables=rd_default_monitors()) ## Lb -> K p tau l @@ -1311,7 +1359,7 @@ def Hlt2_Lambdab2KpTauTau_OS_ExclusiveLine( persistreco=False): """ 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() @@ -1324,7 +1372,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1334,7 +1383,7 @@ def Hlt2_Lambdab2KpTauTau_SS_ExclusiveLine( persistreco=False): """ 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() @@ -1347,7 +1396,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1357,7 +1407,7 @@ def Hlt2_Lambdab2KpTauMu_OS_ExclusiveLine( persistreco=False): """ 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() @@ -1370,7 +1420,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1380,7 +1431,7 @@ def Hlt2_Lambdab2KpTauMu_SS_ExclusiveLine( persistreco=False): """ 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() @@ -1393,7 +1444,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1403,7 +1455,7 @@ def Hlt2_Lambdab2KpTauE_OS_ExclusiveLine( persistreco=False): """ 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() @@ -1416,7 +1468,8 @@ def Hlt2_Lambdab2KpTauE_OS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul]) + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + monitoring_variables=rd_default_monitors()) @register_line_builder(hlt2_lines) @@ -1426,7 +1479,7 @@ def Hlt2_Lambdab2KpTauE_SS_ExclusiveLine( persistreco=False): """ 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() @@ -1439,7 +1492,8 @@ def Hlt2_Lambdab2KpTauE_SS_ExclusiveLine( name=name, prescale=prescale, persistreco=persistreco, - algs=rd_prefilter() + [dilepton, lst, lb2xtaul]) + algs=rd_prefilter() + [dilepton, lst, lb2xtaul], + monitoring_variables=rd_default_monitors()) ## Lambda_b -> Lambda tau l @@ -1451,7 +1505,7 @@ def Hlt2_Lambdab2LambdaTauTau_OS_ExclusiveLine( persistreco=False): """ 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( @@ -1465,7 +1519,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1476,7 +1531,7 @@ def Hlt2_Lambdab2LambdaTauTau_SS_ExclusiveLine( persistreco=False): """ 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( @@ -1490,7 +1545,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1501,7 +1557,7 @@ def Hlt2_Lambdab2LambdaTauMu_OS_ExclusiveLine( persistreco=False): """ 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( @@ -1515,7 +1571,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1526,7 +1583,7 @@ def Hlt2_Lambdab2LambdaTauMu_SS_ExclusiveLine( persistreco=False): """ 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( @@ -1540,7 +1597,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1551,7 +1609,7 @@ def Hlt2_Lambdab2LambdaTauE_OS_ExclusiveLine( persistreco=False): """ HLT2 line for Lb -> (L0->p pi-) (tau+->pi+pi+pi-) e- + CC - + and for Lb -> (L0->p pi-) (tau-->pi-pi-pi+) e+ + CC """ lambda0 = common_builder.make_rd_lambda_lls( @@ -1565,7 +1623,8 @@ 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_default_monitors()) @register_line_builder(hlt2_lines) @@ -1576,7 +1635,7 @@ def Hlt2_Lambdab2LambdaTauE_SS_ExclusiveLine( persistreco=False): """ HLT2 line for Lb -> (L0->p pi-) (tau+->pi+pi+pi-) e+ + CC - + and for Lb -> (L0->p pi-) (tau-->pi-pi-pi+) e- + CC """ lambda0 = common_builder.make_rd_lambda_lls( @@ -1590,4 +1649,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_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py index 5e8b8d13a68..b78b9530181 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py @@ -61,7 +61,7 @@ from Hlt2Conf.algorithms_thor import require_all from Hlt2Conf.lines.rd.builders import rdbuilder_thor from Hlt2Conf.lines.rd.builders import btosmutau_exclusive -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors all_lines = {} @@ -185,7 +185,11 @@ def bstophimutau_tautomu_line(name='Hlt2RD_BsToKKTauMu_TauToMu_Line', phimus = btosmutau_exclusive.make_phimu(kaons, kaons, muons, pvs) bs = btosmutau_exclusive.make_bs(phimus, muons_from_tau, pvs) algs = rd_prefilter() + [phimus, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -209,7 +213,11 @@ def bstophimutau_tautomu_same_sign_kaons_sskmu_line( pvs, name="rd_make_bs_to_kktaumu_same_sign_kaons") algs = rd_prefilter() + [phimus, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -233,7 +241,11 @@ def bstophimutau_tautomu_same_sign_kaons_oskmu_line( pvs, name="rd_make_bs_to_kktaumu_same_sign_kaons") algs = rd_prefilter() + [phimus, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -253,7 +265,11 @@ def bstophimutau_tautomu_same_sign_muons_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bs_to_kktaumu_same_sign_muons") algs = rd_prefilter() + [phimus, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -271,7 +287,11 @@ def bstophimutau_tautomu_fakemuon_from_tau_line( pvs, name="rd_make_bs_to_kktaumu_fake_muon_from_tau") algs = rd_prefilter() + [phimus, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -295,7 +315,11 @@ def bstophimutau_tautomu_fakemuon_from_b_line( pvs, name="rd_make_bs_to_kktaumu_fake_muon_from_b") algs = rd_prefilter() + [phimus_fake_muon, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -317,7 +341,11 @@ def bstophimutau_tautomu_fakekaon_line( bs = btosmutau_exclusive.make_bs( phimus, muons_from_tau, pvs, name="rd_make_bs_to_kktaumu_fake_kaons") algs = rd_prefilter() + [phimus, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -334,7 +362,11 @@ def lbtopkmutau_tautomu_sspmu_line( lb = btosmutau_exclusive.make_lb( pkmus, muons_from_tau, pvs, decay_descriptor="[Lambda_b0 -> B0 mu-]cc") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -351,7 +383,11 @@ def lbtopkmutau_tautomu_ospmu_line( lb = btosmutau_exclusive.make_lb( pkmus, muons_from_tau, pvs, decay_descriptor="[Lambda_b0 -> B0 mu+]cc") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -377,7 +413,11 @@ def lbtopkmutau_tautomu_same_sign_pk_sspmu_line( decay_descriptor="[Lambda_b0 -> B0 mu-]cc", name="rd_make_lb_to_pkmutau_same_sign_pk") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -403,7 +443,11 @@ def lbtopkmutau_tautomu_same_sign_pk_ospmu_line( decay_descriptor="[Lambda_b0 -> B0 mu+]cc", name="rd_make_lb_to_pkmutau_same_sign_pk") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -424,7 +468,11 @@ def lbtopkmutau_tautomu_same_sign_muons_sspmu_line( decay_descriptor="[Lambda_b0 -> B0 mu+]cc", name="rd_make_lb_to_pkmutau_same_sign_muons") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -445,7 +493,11 @@ def lbtopkmutau_tautomu_same_sign_muons_ospmu_line( decay_descriptor="[Lambda_b0 -> B0 mu-]cc", name="rd_make_lb_to_pkmutau_same_sign_muons") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -467,7 +519,11 @@ def lbtopkmutau_tautomu_fakemuon_from_tau_sspmu_line( decay_descriptor="[Lambda_b0 -> B0 mu-]cc", name="rd_make_lb_to_pkmutau_fake_muon_from_tau") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -489,7 +545,11 @@ def lbtopkmutau_tautomu_fakemuon_from_tau_ospmu_line( decay_descriptor="[Lambda_b0 -> B0 mu+]cc", name="rd_make_lb_to_pkmutau_fake_muon_from_tau") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -517,7 +577,11 @@ def lbtopkmutau_tautomu_fakemuon_from_b_sspmu_line( decay_descriptor="[Lambda_b0 -> B0 mu-]cc", name="rd_make_lb_to_pkmutau_fake_muon_from_b") algs = rd_prefilter() + [pkmus_fake_muon, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -545,7 +609,11 @@ def lbtopkmutau_tautomu_fakemuon_from_b_ospmu_line( decay_descriptor="[Lambda_b0 -> B0 mu+]cc", name="rd_make_lb_to_pkmutau_fake_muon_from_b") algs = rd_prefilter() + [pkmus_fake_muon, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -572,7 +640,11 @@ def lbtopkmutau_tautomu_fakeproton_sspmu_line( decay_descriptor="[Lambda_b0 -> B0 mu-]cc", name="rd_make_lb_to_pkmutau_fake_protons") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -599,7 +671,11 @@ def lbtopkmutau_tautomu_fakeproton_ospmu_line( decay_descriptor="[Lambda_b0 -> B0 mu+]cc", name="rd_make_lb_to_pkmutau_fake_protons") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -625,7 +701,11 @@ def lbtopkmutau_tautomu_fakekaon_sspmu_line( decay_descriptor="[Lambda_b0 -> B0 mu-]cc", name="rd_make_lb_to_pkmutau_fake_kaons") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -651,7 +731,11 @@ def lbtopkmutau_tautomu_fakekaon_ospmu_line( decay_descriptor="[Lambda_b0 -> B0 mu+]cc", name="rd_make_lb_to_pkmutau_fake_kaons") algs = rd_prefilter() + [pkmus, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -668,7 +752,11 @@ def bdtokstmutau_tautomu_sskmu_line( bd = btosmutau_exclusive.make_bd( kstmus, muons_from_tau, pvs, decay_descriptor="[B_s0 -> B0 mu-]cc") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -685,7 +773,11 @@ def bdtokstmutau_tautomu_oskmu_line( bd = btosmutau_exclusive.make_bd( kstmus, muons_from_tau, pvs, decay_descriptor="[B_s0 -> B0 mu+]cc") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -711,7 +803,11 @@ def bdtokstmutau_tautomu_same_sign_kpi_sskmu_line( decay_descriptor="[B_s0 -> B0 mu-]cc", name="rd_make_bd_to_kpimutau_same_sign_kpi") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -737,7 +833,11 @@ def bdtokstmutau_tautomu_same_sign_kpi_oskmu_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bd_to_kpimutau_same_sign_kpi") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -758,7 +858,11 @@ def bdtokstmutau_tautomu_same_sign_muons_sskmu_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bd_to_kpimutau_same_sign_muons") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -779,7 +883,11 @@ def bdtokstmutau_tautomu_same_sign_muons_oskmu_line( decay_descriptor="[B_s0 -> B0 mu-]cc", name="rd_make_bd_to_kpimutau_same_sign_muons") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -801,7 +909,11 @@ def bdtokstmutau_tautomu_fakemuon_from_tau_sskmu_line( decay_descriptor="[B_s0 -> B0 mu-]cc", name="rd_make_bd_to_kpimutau_fake_muon_from_tau") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -823,7 +935,11 @@ def bdtokstmutau_tautomu_fakemuon_from_tau_oskmu_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bd_to_kpimutau_fake_muon_from_tau") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -851,7 +967,11 @@ def bdtokstmutau_tautomu_fakemuon_from_b_sskmu_line( decay_descriptor="[B_s0 -> B0 mu-]cc", name="rd_make_bd_to_kpimutau_fake_muon_from_b") algs = rd_prefilter() + [kstmus_fake_muon, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -879,7 +999,11 @@ def bdtokstmutau_tautomu_fakemuon_from_b_oskmu_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bd_to_kpimutau_fake_muon_from_b") algs = rd_prefilter() + [kstmus_fake_muon, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -906,7 +1030,11 @@ def bdtokstmutau_tautomu_fakekaon_sskmu_line( decay_descriptor="[B_s0 -> B0 mu-]cc", name="rd_make_bd_to_kpimutau_fake_kaons") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -933,7 +1061,11 @@ def bdtokstmutau_tautomu_fakekaon_oskmu_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bd_to_kpimutau_fake_kaons") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -959,7 +1091,11 @@ def bdtokstmutau_tautomu_fakepion_sskmu_line( decay_descriptor="[B_s0 -> B0 mu-]cc", name="rd_make_bd_to_kpimutau_fake_pions") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -985,7 +1121,11 @@ def bdtokstmutau_tautomu_fakepion_oskmu_line( decay_descriptor="[B_s0 -> B0 mu+]cc", name="rd_make_bd_to_kpimutau_fake_pions") algs = rd_prefilter() + [kstmus, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1001,7 +1141,10 @@ def butokmutau_tautomu_oskmu_line(name='Hlt2RD_BuToKTauMu_TauToMu_OSKmu_Line', bu = btosmutau_exclusive.make_bu( kmus, muons_from_tau, pvs, decay_descriptor="[B+ -> B0 mu+]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [kmus, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1017,7 +1160,10 @@ def butokmutau_tautomu_sskmu_line(name='Hlt2RD_BuToKTauMu_TauToMu_SSKmu_Line', bu = btosmutau_exclusive.make_bu( kmus, muons_from_tau, pvs, decay_descriptor="[B+ -> B0 mu-]cc") return Hlt2Line( - name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [kmus, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1037,7 +1183,10 @@ def butokmutau_tautomu_same_sign_muons_oskmu_line( decay_descriptor="[B+ -> B0 mu-]cc", name="rd_make_bu_to_kmutau_same_sign_muons") return Hlt2Line( - name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [kmus, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1057,7 +1206,10 @@ def butokmutau_tautomu_same_sign_muons_sskmu_line( decay_descriptor="[B+ -> B0 mu-]cc", name="rd_make_bu_to_kmutau_same_sign_muons") return Hlt2Line( - name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [kmus, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1078,7 +1230,11 @@ def butokmutau_tautomu_fakemuon_from_tau_oskmu_line( decay_descriptor="[B+ -> B0 mu+]cc", name="rd_make_bu_to_kmutau_fake_muon_from_tau") algs = rd_prefilter() + [kmus, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1099,7 +1255,11 @@ def butokmutau_tautomu_fakemuon_from_tau_sskmu_line( decay_descriptor="[B+ -> B0 mu-]cc", name="rd_make_bu_to_kmutau_fake_muon_from_tau") algs = rd_prefilter() + [kmus, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1125,7 +1285,11 @@ def butokmutau_tautomu_fakemuon_from_b_oskmu_line( decay_descriptor="[B+ -> B0 mu+]cc", name="rd_make_bu_to_kmutau_fake_muon_from_b") algs = rd_prefilter() + [kmus_fake_muon, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1151,7 +1315,11 @@ def butokmutau_tautomu_fakemuon_from_b_sskmu_line( decay_descriptor="[B+ -> B0 mu-]cc", name="rd_make_bu_to_kmutau_fake_muon_from_b") algs = rd_prefilter() + [kmus_fake_muon, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1176,7 +1344,10 @@ def butokmutau_tautomu_fakekaon_oskmu_line( decay_descriptor="[B+ -> B0 mu+]cc", name="rd_make_bu_to_kmutau_fake_kaons") return Hlt2Line( - name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [kmus, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -1201,4 +1372,7 @@ def butokmutau_tautomu_fakekaon_sskmu_line( decay_descriptor="[B+ -> B0 mu-]cc", name="rd_make_bu_to_kmutau_fake_kaons") return Hlt2Line( - name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale) + name=name, + algs=rd_prefilter() + [kmus, bu], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py index 3d74a175aeb..f4d284bf4d3 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py @@ -27,7 +27,7 @@ Final states built are (all taus decay to muons and neutrinos): - Bd -> K*(-> K+ pi-) tau+ tau- - Bd -> K*(-> K+ pi+) tau+ tau- and its charge conjugate - Bd -> K*(-> K+ pi-) tau+ tau+, K*(-> K+ pi-) tau- tau- and their charge conjugates - - Bd -> K*(-> K+ pi-) tau+ tau- with a fake kaon + - Bd -> K*(-> K+ pi-) tau+ tau- with a fake kaon - Bd -> K*(-> K+ pi-) tau+ tau- with a fake pion - Bd -> K*(-> K+ pi-) tau+ tau- with a fake muon 4. Bs decays to K* K* @@ -59,7 +59,7 @@ from Hlt2Conf.algorithms_thor import require_all from Hlt2Conf.lines.rd.builders import rdbuilder_thor from Hlt2Conf.lines.rd.builders import btostautau_exclusive -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors all_lines = {} @@ -156,7 +156,11 @@ def bstophitautau_tautomu_line( dimuons = btostautau_exclusive.make_dimuon(muons, muons, pvs) bs = btostautau_exclusive.make_bs(phis, dimuons, pvs) algs = rd_prefilter() + [dimuons, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -175,7 +179,11 @@ def bstophitautau_tautomu_same_sign_kaons_line( bs = btostautau_exclusive.make_bs( phis, dimuons, pvs, name="rd_make_bs_to_kktautau_same_sign_kaons") algs = rd_prefilter() + [dimuons, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -194,7 +202,11 @@ def bstophitautau_tautomu_same_sign_muons_line( bs = btostautau_exclusive.make_bs( phis, dimuons, pvs, name="rd_make_bs_to_kktautau_same_sign_muons") algs = rd_prefilter() + [dimuons, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -212,7 +224,11 @@ def bstophitautau_tautomu_fakemuon_line( bs = btostautau_exclusive.make_bs( phis, dimuons, pvs, name="rd_make_bs_to_kktautau_fake_muons") algs = rd_prefilter() + [dimuons, phis, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -230,7 +246,11 @@ def bstophitautau_tautomu_fakekaon_line( bs = btostautau_exclusive.make_bs( phis, dimuons, pvs, name="rd_make_bs_to_kktautau_fake_kaons") algs = rd_prefilter() + [dimuons, phis, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -244,7 +264,11 @@ def lbtopktautau_tautomu_line(name='Hlt2RD_LbToPKTauTau_TauToMu_Line', dimuons = btostautau_exclusive.make_dimuon(muons, muons, pvs) lb = btostautau_exclusive.make_lb(pks, dimuons, pvs) algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -264,7 +288,11 @@ def lbtopktautau_tautomu_same_sign_pK_line( lb = btostautau_exclusive.make_lb( pks, dimuons, pvs, name="rd_make_lb_to_pktautau_same_sign_pk") algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -284,7 +312,11 @@ def lbtopktautau_tautomu_same_sign_muons_sspmu_line( lb = btostautau_exclusive.make_lb( pks, dimuons, pvs, name="rd_make_lb_to_pktautau_same_sign_muons") algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -304,7 +336,11 @@ def lbtopktautau_tautomu_same_sign_muons_ospmu_line( lb = btostautau_exclusive.make_lb( pks, dimuons, pvs, name="rd_make_lb_to_pktautau_same_sign_muons") algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -322,7 +358,11 @@ def lbtopktautau_tautomu_fakemuon_line( lb = btostautau_exclusive.make_lb( pks, dimuons, pvs, name="rd_make_lb_to_pktautau_fake_muons") algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -339,7 +379,11 @@ def lbtopktautau_tautomu_fakeproton_line( lb = btostautau_exclusive.make_lb( pks, dimuons, pvs, name="rd_make_lb_to_pktautau_fake_protons") algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -355,7 +399,11 @@ def lbtopktautau_tautomu_fakekaon_line( lb = btostautau_exclusive.make_lb( pks, dimuons, pvs, name="rd_make_lb_to_pktautau_fake_kaons") algs = rd_prefilter() + [dimuons, pks, lb] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -369,7 +417,11 @@ def bdtoksttautau_tautomu_line( dimuons = btostautau_exclusive.make_dimuon(muons, muons, pvs) bd = btostautau_exclusive.make_bd(ksts, dimuons, pvs) algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -389,7 +441,11 @@ def bdtoksttautau_tautomu_same_sign_Kpi_line( bd = btostautau_exclusive.make_bd( ksts, dimuons, pvs, name="rd_make_bd_to_kpitautau_same_sign_kpi") algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -410,7 +466,11 @@ def bdtoksttautau_tautomu_same_sign_muons_sskmu_line( bd = btostautau_exclusive.make_bd( ksts, dimuons, pvs, name="rd_make_bd_to_kpitautau_same_sign_muons") algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -431,7 +491,11 @@ def bdtoksttautau_tautomu_same_sign_muons_oskmu_line( bd = btostautau_exclusive.make_bd( ksts, dimuons, pvs, name="rd_make_bd_to_kpitautau_same_sign_muons") algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -450,7 +514,11 @@ def bdtoksttautau_tautomu_fakemuon_line( bd = btostautau_exclusive.make_bd( ksts, dimuons, pvs, name="rd_make_bd_to_kpitautau_fake_muons") algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -468,7 +536,11 @@ def bdtoksttautau_tautomu_fakekaon_line( bd = btostautau_exclusive.make_bd( ksts, dimuons, pvs, name="rd_make_bd_to_kpitautau_fake_kaons") algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -485,7 +557,11 @@ def bdtoksttautau_tautomu_fakepion_line( bd = btostautau_exclusive.make_bd( ksts, dimuons, pvs, name="rd_make_bd_to_kpitautau_fake_pions") algs = rd_prefilter() + [dimuons, ksts, bd] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -504,7 +580,11 @@ def bstokstksttautau_tautomu_line( dimuons = btostautau_exclusive.make_dimuon(muons, muons, pvs) bs = btostautau_exclusive.make_bs_to_kstkst(ksts, dimuons, pvs) algs = rd_prefilter() + [dimuons, ksts, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -529,7 +609,11 @@ def bstokstksttautau_tautomu_same_sign_kstar_line( decay_descriptor="[B_s0 -> K*(892)0 K*(892)0 D0]cc", name="rd_make_bs_to_kstksttautau_same_sign_kst") algs = rd_prefilter() + [dimuons, ksts, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -558,7 +642,11 @@ def bstokstksttautau_tautomu_same_sign_muons_line( decay_descriptor="[B_s0 -> K*(892)0 K*(892)~0 D0]cc", name="rd_make_bs_to_kstksttautau_same_sign_muons") algs = rd_prefilter() + [dimuons, ksts, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -582,7 +670,11 @@ def bstokstksttautau_tautomu_fakemuon_line( bs = btostautau_exclusive.make_bs_to_kstkst( ksts, dimuons, pvs, name="rd_make_bs_to_kstksttautau_fake_muons") algs = rd_prefilter() + [dimuons, ksts, bs] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -594,7 +686,11 @@ def butoktautau_tautomu_line(name='Hlt2RD_BuToKTauTau_TauToMu_Line', dimuons = btostautau_exclusive.make_dimuon(muons, muons, pvs) bu = btostautau_exclusive.make_bu(kaons, dimuons, pvs) algs = rd_prefilter() + [dimuons, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -612,7 +708,11 @@ def butoktautau_tautomu_same_sign_muons_oskmu_line( bu = btostautau_exclusive.make_bu( kaons, dimuons, pvs, name="rd_make_bu_to_ktautau_same_sign_muons") algs = rd_prefilter() + [dimuons, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -630,7 +730,11 @@ def butoktautau_tautomu_same_sign_muons_sskmu_line( bu = btostautau_exclusive.make_bu( kaons, dimuons, pvs, name="rd_make_bu_to_ktautau_same_sign_muons") algs = rd_prefilter() + [dimuons, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -646,7 +750,11 @@ def butoktautau_tautomu_fakemuon_line( bu = btostautau_exclusive.make_bu( kaons, dimuons, pvs, name="rd_make_bu_to_ktautau_fake_muon") algs = rd_prefilter() + [dimuons, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -660,4 +768,8 @@ def butoktautau_tautomu_fakekaon_line( bu = btostautau_exclusive.make_bu( fake_kaons, dimuons, pvs, name="rd_make_bu_to_ktautau_fake_kaon") algs = rd_prefilter() + [dimuons, bu] - return Hlt2Line(name=name, algs=algs, prescale=prescale) + return Hlt2Line( + name=name, + algs=algs, + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py index f860e48c487..7ad7a4f9a1f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py @@ -38,7 +38,7 @@ from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_pions, make_rd_detached_kaons, make_rd_detached_protons from Hlt2Conf.lines.rd.builders.bnv_builders import make_BToHMu, make_LzToHMu, make_LbToHMu -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors from RecoConf.reconstruction_objects import make_pvs @@ -64,7 +64,11 @@ def BToPiMu_line(name="Hlt2RD_BToPipMu_Line", prescale=1): B = make_BToHMu(pvs, pion, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [B], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -79,7 +83,11 @@ def BToPiMu_SS_line(name="Hlt2RD_BToPipMu_SS_Line", prescale=1): B = make_BToHMu(pvs, pion, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [B], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 2) Bs -> K mu @@ -95,7 +103,11 @@ def BToKMu_line(name="Hlt2RD_BToKpMu_Line", prescale=1 / 2.): B = make_BToHMu(pvs, kaon, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [B], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -110,7 +122,11 @@ def BToKMu_SS_line(name="Hlt2RD_BToKpMu_SS_Line", prescale=1): B = make_BToHMu(pvs, kaon, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [B], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [B], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 3) Lz -> p mu @@ -126,7 +142,11 @@ def LzToPMu_line(name="Hlt2RD_LambdaToPpMu_Line", prescale=1): Lz = make_LzToHMu(pvs, proton, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lz], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lz], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -141,7 +161,11 @@ def LzToPMu_SS_line(name="Hlt2RD_LambdaToPpMu_SS_Line", prescale=1 / 3.): Lz = make_LzToHMu(pvs, proton, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lz], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lz], + prescale=prescale, + monitoring_variables=rd_default_monitors()) # 4) Lb -> p mu @@ -157,7 +181,11 @@ def LbToPMu_line(name="Hlt2RD_LbToPpMu_Line", prescale=1): Lb = make_LbToHMu(pvs, proton, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lb], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -172,4 +200,8 @@ def LbToPMu_SS_line(name="Hlt2RD_LbToPpMu_SS_Line", prescale=1): Lb = make_LbToHMu(pvs, proton, muon, descriptor) - return Hlt2Line(name=name, algs=rd_prefilter() + [Lb], prescale=prescale) + return Hlt2Line( + name=name, + algs=rd_prefilter() + [Lb], + prescale=prescale, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py index 40e87de1c57..d451dea1bf0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py @@ -16,7 +16,7 @@ Email: chuangxin.lin@cern.ch Date: 30/12/2021 The following modes are included (Xi- with LLL and DDL): -* Omega- -> Xi- mu+ mu- +* Omega- -> Xi- mu+ mu- * Omega- -> Xi- e+ e- * Omega- -> Xi- gamma * Omega- -> Xi- pi+ pi- @@ -27,7 +27,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from GaudiKernel.SystemOfUnits import MeV from RecoConf.reconstruction_objects import make_pvs -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors from .builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_electrons, make_rd_detached_pions, make_rd_photons from .builders.omega_rare_decay_builder import make_xim_to_lambda_pim_lll, make_omega_to_xi_dip, make_omega_to_xi_gamma @@ -51,7 +51,10 @@ def omega_to_ximumu_lll_line(name="Hlt2RD_OmegamToXimMuMu_LLL_Line", particle2=p2, descriptor=descriptor) return Hlt2Line( - name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega]) + name=name, + prescale=prescale, + algs=rd_prefilter() + [xim, omega], + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -70,7 +73,10 @@ def omega_to_xiee_lll_line(name="Hlt2RD_OmegamToXimEE_LLL_Line", prescale=1): particle2=p2, descriptor=descriptor) return Hlt2Line( - name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega]) + name=name, + prescale=prescale, + algs=rd_prefilter() + [xim, omega], + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -90,7 +96,10 @@ def omega_to_xipipi_lll_line(name="Hlt2RD_OmegamToXimPiPi_LLL_Line", particle2=p2, descriptor=descriptor) return Hlt2Line( - name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega]) + name=name, + prescale=prescale, + algs=rd_prefilter() + [xim, omega], + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -108,4 +117,7 @@ def omega_to_xigamma_lll_line(name="Hlt2RD_OmegamToXimGamma_LLL_Line", gamma=gamma, descriptor=descriptor) return Hlt2Line( - name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega]) + name=name, + prescale=prescale, + algs=rd_prefilter() + [xim, omega], + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py index 5cb191e2415..ecaace2ebbe 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py @@ -31,7 +31,7 @@ from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_mue, make_rd_prompt_mue, make_rd_prompt_dielectrons #make_rd_prompt_dimuons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors from Hlt2Conf.algorithms_thor import require_all import Functors as F @@ -59,7 +59,8 @@ def phi_to_mue_line(name="Hlt2RD_PhiToMuE_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -78,7 +79,8 @@ def phi_to_mue_ss_line(name="Hlt2RD_PhiToMuE_SS_Line", name=name, algs=rd_prefilter() + [emu_SS], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -99,7 +101,8 @@ def jpsi_to_mue_line(name="Hlt2RD_JpsiToMuE_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -121,7 +124,8 @@ def jpsi_to_mue_ss_line(name="Hlt2RD_JpsiToMuE_SS_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -143,7 +147,8 @@ def upsilon_to_mue_line(name="Hlt2RD_UpsilonToMuE_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -165,7 +170,8 @@ def upsilon_to_mue_ss_line(name="Hlt2RD_UpsilonToMuE_SS_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) ##### DETACHED LINES ##### @@ -195,7 +201,8 @@ def phi_to_mue_detached_line(name="Hlt2RD_PhiToMuE_Detached_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -222,7 +229,8 @@ def phi_to_mue_ss_detached_line(name="Hlt2RD_PhiToMuE_SS_Detached_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -249,7 +257,8 @@ def jpsi_to_mue_detached_line(name="Hlt2RD_JpsiToMuE_Detached_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -276,7 +285,8 @@ def jpsi_to_mue_ss_detached_line(name="Hlt2RD_JpsiToMuE_SS_Detached_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) ##### CONTROL ee LINES ##### @@ -299,7 +309,8 @@ def phi_to_ee_line(name="Hlt2RD_PhiToEE_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -319,7 +330,8 @@ def jpsi_to_ee_line(name="Hlt2RD_JpsiToEE_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -339,7 +351,8 @@ def upsilon_to_ee_line(name="Hlt2RD_UpsilonToEE_Line", name=name, algs=rd_prefilter() + [emu], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) ################# diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py index f6d246d695a..ae0047c6cb2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py @@ -34,7 +34,7 @@ from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line from Hlt2Conf.algorithms import ParticleContainersMerger -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_default_monitors from .builders.rdbuilder_thor import ( make_rd_detached_muons, make_rd_detached_electrons, make_rd_detached_pions, make_rd_has_rich_detached_protons, make_rd_detached_phis, @@ -60,7 +60,8 @@ def tau_to_mumumu_line(name="Hlt2RD_TauToMuMuMu_Line", name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -89,7 +90,8 @@ def tau_to_mumue_line(name="Hlt2RD_TauToMuMuE_Line", name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -118,7 +120,8 @@ def tau_to_muee_line(name="Hlt2RD_TauToMuEE_Line", name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -137,7 +140,8 @@ def tau_to_eee_line(name="Hlt2RD_TauToEEE_Line", prescale=1, name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -166,7 +170,8 @@ def tau_to_pmumu_line(name="Hlt2RD_TauToPMuMu_Line", name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -189,7 +194,8 @@ def tau_to_phimu_line(name="Hlt2RD_TauToPhiMu_Line", name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -209,7 +215,8 @@ def tau_to_5mu_line(name="Hlt2RD_TauTo5Mu_Line", prescale=1, name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -229,7 +236,8 @@ def tau_to_7mu_line(name="Hlt2RD_TauTo7Mu_Line", prescale=1, name=name, algs=rd_prefilter() + [tau], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -256,7 +264,8 @@ def ds_to_phipi_mumu_line(name="Hlt2RD_DsToPhiPi_PhiToMuMu_Line", name=name, algs=rd_prefilter() + [ds], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) @register_line_builder(all_lines) @@ -283,4 +292,5 @@ def ds_to_phipi_ee_line(name="Hlt2RD_DsToPhiPi_PhiToEE_Line", name=name, algs=rd_prefilter() + [ds], prescale=prescale, - persistreco=persistreco) + persistreco=persistreco, + monitoring_variables=rd_default_monitors()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py index 613460dc26c..0a65cc43e9e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py @@ -19,7 +19,7 @@ TODO: - Replace PID variables by ProbNN once we have a proper tuning """ from GaudiKernel.SystemOfUnits import MeV -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors from Hlt2Conf.lines.rd.builders import strange_builders from Moore.config import register_line_builder from Moore.lines import Hlt2Line @@ -44,6 +44,7 @@ def ks02pipi_line(name="Hlt2RD_KS0ToPiPi_Line", prescale=1e-4): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -60,6 +61,7 @@ def ks02mumu_line(name="Hlt2RD_KS0ToMuMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], + monitoring_variables=rd_default_monitors(), ) @@ -89,6 +91,7 @@ def ks02mumu_sb_line(name="Hlt2RD_KS0ToMuMu_SB_Line", prescale=1e-4): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -110,6 +113,7 @@ def ks02mumu_ss_line(name="Hlt2RD_KS0ToMuMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -128,6 +132,7 @@ def ks02emu_line(name="Hlt2RD_KS0ToEMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], + monitoring_variables=rd_default_monitors(), ) @@ -150,6 +155,7 @@ def ks02emu_ss_line(name="Hlt2RD_KS0ToEMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -172,6 +178,7 @@ def ks02ee_line(name="Hlt2RD_KS0ToEE_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], + monitoring_variables=rd_default_monitors(), ) @@ -198,6 +205,7 @@ def ks02ee_ss_line(name="Hlt2RD_KS0ToEE_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -216,6 +224,7 @@ def lambda02ppi_line(name="Hlt2RD_Lambda0ToPPi_Line", prescale=1e-3): name=name, algs=rd_prefilter() + [l0], prescale=prescale, + monitoring_variables=rd_default_monitors(), ) @@ -233,6 +242,7 @@ def lambda02pmu_line(name="Hlt2RD_Lambda0ToPMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [l0], + monitoring_variables=rd_default_monitors(), ) @@ -250,4 +260,5 @@ def lambda02pe_line(name="Hlt2RD_Lambda0ToPE_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [l0], + monitoring_variables=rd_default_monitors(), ) diff --git a/Hlt/Moore/python/Moore/lines.py b/Hlt/Moore/python/Moore/lines.py index 903489046fa..6c8a1f01870 100644 --- a/Hlt/Moore/python/Moore/lines.py +++ b/Hlt/Moore/python/Moore/lines.py @@ -272,6 +272,8 @@ class Hlt2Line(DecisionLine): HLT1 filter that is prepended to the control flow defined by `algs`. ThOr DECREPORTS_RE_FILTER is used. Note that this parameter should look like "['Hlt1LineADecision', 'Hlt1.*LineDecision']". + monitoring_variables (list(str)): Variables to create default monitoring plots for. + These variables need to be implemented in .monitoring.py """ _CLASS_NAME_PREFIX = "Hlt2" _ANNSVC_NAME = "HltANNSvc" @@ -285,7 +287,7 @@ class Hlt2Line(DecisionLine): extra_outputs=None, persistreco=False, hlt1_filter_code="", - default_monitoring=True, + monitoring_variables=["pt", "eta", "m", "vchi2", "ipchi2"], ): self.hlt1_filter_code = hlt1_filter_code if hlt1_filter_code: @@ -293,10 +295,10 @@ class Hlt2Line(DecisionLine): "Hlt1_prefilter", self.hlt1_filter_code, self._HLT1_FILTER_SOURCE_ID, self._ANNSVC_NAME) algs = [hlt1_filter] + algs - self.default_monitoring = default_monitoring + self.monitoring_variables = monitoring_variables # the first is a local switch for every instance of Hlt2Line, the second a global one (`with run_default_monitoring.bind(run=False)`). - if self.default_monitoring and run_default_monitoring(): - monitoring_algs = monitoring(algs, name) + if self.monitoring_variables and run_default_monitoring(): + monitoring_algs = monitoring(algs, name, self.monitoring_variables) if len(monitoring_algs) == 0: log.debug(f"No default monitoring for {name}") else: diff --git a/Hlt/Moore/python/Moore/monitoring.py b/Hlt/Moore/python/Moore/monitoring.py index 2bd1c5c3b02..f54f21331d3 100644 --- a/Hlt/Moore/python/Moore/monitoring.py +++ b/Hlt/Moore/python/Moore/monitoring.py @@ -21,13 +21,16 @@ def run_default_monitoring(run=True): return run -def monitoring(algs, name): +def monitoring(algs, name, mon_vars): """Create a list of monitoring algorithms from the control flow (algs). The last item in the CF whose producer is a Combiner or ParticleContainerMerger is taken as input to monitor. From that particle, mass, pt, eta, (decay time), vertex chi2 and ip chi2 histograms will be filled. Args: algs (list of Algorithms): Control flow of this line. + name (str): Name of the calling line. + monitoring_variables (list(str)): Variables to create default monitoring plots for. + These variables need to be implemented in .monitoring.py Returns: List of monitoring algorithms. @@ -122,54 +125,59 @@ def monitoring(algs, name): return mass_functor_dict # pt - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_pt", - Input=producer_output, - Variable=F.PT, - HistogramName="/" + name + "/pt", - Bins=80, - Range=_parse_all(r"\( RHO_COORDINATE @ THREEMOMENTUM \)", 0., - 40. * GeV))) + if "pt" in mon_vars: + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_pt", + Input=producer_output, + Variable=F.PT, + HistogramName="/" + name + "/pt", + Bins=80, + Range=_parse_all(r"\( RHO_COORDINATE @ THREEMOMENTUM \)", 0., + 40. * GeV))) # eta - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_eta", - Input=producer_output, - Variable=F.ETA, - HistogramName="/" + name + "/eta", - Bins=40, - Range=(1.5, 5.5))) + if "eta" in mon_vars: + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_eta", + Input=producer_output, + Variable=F.ETA, + HistogramName="/" + name + "/eta", + Bins=40, + Range=(1.5, 5.5))) # mass - mass_functor = _parse_mass_functor() - #TODO: parse decay descriptor to set defaults in _parse_all. Might need https://gitlab.cern.ch/lhcb/Moore/-/issues/289 - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_m", - Input=producer_output, - Variable=mass_functor["functor"], - HistogramName="/" + name + "/m", - Bins=100, - Range=_parse_all(mass_functor["regex"], 0., 7. * GeV))) + if "m" in mon_vars: + mass_functor = _parse_mass_functor() + #TODO: parse decay descriptor to set defaults in _parse_all. Might need https://gitlab.cern.ch/lhcb/Moore/-/issues/289 + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_m", + Input=producer_output, + Variable=mass_functor["functor"], + HistogramName="/" + name + "/m", + Bins=100, + Range=_parse_all(mass_functor["regex"], 0., 7. * GeV))) # vertex chi2 - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_vchi2", - Input=producer_output, - Variable=F.CHI2DOF, - HistogramName="/" + name + "/vchi2", - Bins=64, - Range=_parse_all("CHI2DOF", 0., 32.))) + if "vchi2" in mon_vars: + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_vchi2", + Input=producer_output, + Variable=F.CHI2DOF, + HistogramName="/" + name + "/vchi2", + Bins=64, + Range=_parse_all("CHI2DOF", 0., 32.))) # ip chi2 - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_ipchi2", - Input=producer_output, - Variable=F.BPVIPCHI2(make_pvs()), - HistogramName="/" + name + "/ipchi2", - Bins=64, - # to not spell out BPVIPCHI2.bind( TES(DataHandles=[DataHandle('/Event/TrackBeamLineVertexFinderSoA/OutputVertices')], DataTypes=['LHCb::Event::PV::PrimaryVertexContainer']), FORWARDARGS ) - # *? matches the previous token between zero and unlimited times, as few times as possible, expanding as needed (lazy) - Range=_parse_all(r"BPVIPCHI2.*? FORWARDARGS \)", 0., 1000.))) + if "ipchi2" in mon_vars: + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_ipchi2", + Input=producer_output, + Variable=F.BPVIPCHI2(make_pvs()), + HistogramName="/" + name + "/ipchi2", + Bins=64, + # to not spell out BPVIPCHI2.bind( TES(DataHandles=[DataHandle('/Event/TrackBeamLineVertexFinderSoA/OutputVertices')], DataTypes=['LHCb::Event::PV::PrimaryVertexContainer']), FORWARDARGS ) + # *? matches the previous token between zero and unlimited times, as few times as possible, expanding as needed (lazy) + Range=_parse_all(r"BPVIPCHI2.*? FORWARDARGS \)", 0., 1000.))) return monitoring_algs diff --git a/doc/tutorials/hlt2_line.rst b/doc/tutorials/hlt2_line.rst index 5bb3b29014a..9150433ec23 100644 --- a/doc/tutorials/hlt2_line.rst +++ b/doc/tutorials/hlt2_line.rst @@ -863,9 +863,14 @@ offline production, as proposed by the Early Measurements Task Force The documentation here concerns the online-monitoring that **can** be configured in Moore. If you choose to not configure any monitoring, a set of default monitors will run. This means that every Hlt2 line will fill, currently 5 histograms by default -(mass, |pT|, :math:`\eta`, vertex :math:`\chi^2` and |chi2ip| w.r.t. the "best" PV). -To switch off this default monitors, add ``default_monitoring=False`` to your ``Hlt2Line`` instance -(``Hlt2Line(name=..., algs=[...], default_monitoring=False, ...)``). +(|pT|, :math:`\eta`, mass, vertex :math:`\chi^2` and |chi2ip| w.r.t. the "best" PV). +These default monitors can be configured individually for your line by passing a list +other than `["pt", "eta", "m", "vchi2", "ipchi2"]` as `monitoring_variables` to your +``Hlt2Line`` instance. +Any new variables need to be defined in +`monitoring.py <https://gitlab.cern.ch/lhcb/Moore/-/blob/master/Hlt/Moore/python/Moore/monitoring.py>`_. +For switching off the default monitors for a line entirely, simply pass an empty list: +(``Hlt2Line(name=..., algs=[...], monitoring_variables=[], ...)``). Default monitoring can also be switched off globally with .. code-block:: python -- GitLab From 3ef72b464367f6b9e41e630d9c07f7df83a15e0c Mon Sep 17 00:00:00 2001 From: Miroslav Saur <Miroslav Saur miroslav.saur@cern.ch> Date: Mon, 5 Sep 2022 14:24:29 +0200 Subject: [PATCH 2/4] [line monitoring] modified settings for RD lines, added dedicated rd_monitors_vrd without mass monitoring --- .../python/Hlt2Conf/lines/rd/RpK_lines.py | 10 +- .../lines/rd/b_to_Xdilepton_detached.py | 14 +- .../python/Hlt2Conf/lines/rd/b_to_hemu.py | 22 ++-- .../lines/rd/b_to_hemu_control_modes.py | 22 ++-- .../Hlt2Conf/lines/rd/b_to_kstarmumu.py | 4 +- .../python/Hlt2Conf/lines/rd/b_to_ll_LFV.py | 6 +- .../python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py | 12 +- .../lines/rd/b_to_majolep_majo_to_leppi.py | 22 ++-- .../Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py | 20 +-- .../lines/rd/b_to_xgamma_exclusive_hlt2.py | 6 +- .../python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py | 58 ++++----- .../python/Hlt2Conf/lines/rd/baryonic.py | 26 ++-- .../Hlt2Conf/lines/rd/baryonic_radiative.py | 6 +- .../Hlt2Conf/lines/rd/bnv_lines_hlt2.py | 30 ++--- .../lines/rd/builders/rd_prefilters.py | 11 +- .../Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py | 122 +++++++++--------- .../lines/rd/hlt2_btosmutau_exclusive.py | 92 ++++++------- .../lines/rd/hlt2_btostautau_exclusive.py | 58 ++++----- .../Hlt2Conf/lines/rd/lfv_lines_hlt2.py | 18 +-- .../lines/rd/omega_rare_decay_lines.py | 10 +- .../Hlt2Conf/lines/rd/prompt_multilepton.py | 26 +++- .../python/Hlt2Conf/lines/rd/qqbar_to_ll.py | 28 ++-- .../python/Hlt2Conf/lines/rd/rad_incl.py | 4 + .../Hlt2Conf/lines/rd/rare_tau_decay_lines.py | 22 ++-- .../python/Hlt2Conf/lines/rd/strange.py | 24 ++-- 25 files changed, 359 insertions(+), 314 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py index 398b7517422..87999190e38 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py @@ -22,7 +22,7 @@ The following modes are included: from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_default from .builders.rdbuilder_thor import (make_rd_detached_dimuon, make_rd_detached_dielectron) from .builders.RpK_builders import (make_lambdab_to_pkll, @@ -42,7 +42,7 @@ def lambdab_to_pkmumu_line(name="Hlt2RD_LambdabToPKMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -57,7 +57,7 @@ def lambdab_to_pkmumu_ss_line(name="Hlt2RD_LambdabToPKMuMu_SS_Line", name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -71,7 +71,7 @@ def lambdab_to_pkee_line(name="Hlt2RD_LambdabToPKEE_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -85,4 +85,4 @@ def lambdab_to_pkee_ss_line(name="Hlt2RD_LambdabToPKEE_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py index bb4fb11a501..f69488623d0 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py @@ -19,7 +19,7 @@ Authors: Martin Andersson, Eluned Smith from Moore.config import register_line_builder from Moore.lines import Hlt2Line -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from GaudiKernel.SystemOfUnits import MeV from RecoConf.reconstruction_objects import make_pvs @@ -55,7 +55,7 @@ def bdtokstLLP_LLPtomumu_line(name="Hlt2RD_BdToKstLLP_LLPToMuMu_Line", name=name, algs=rd_prefilter() + [dimuons, kst, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -81,7 +81,7 @@ def butokpLLP_LLPtomumu_line(name="Hlt2RD_BuToKpLLP_LLPToMuMu_Line", name=name, algs=rd_prefilter() + [dimuons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) ### ee ### @@ -107,7 +107,7 @@ def bdtokstLLP_LLPtoee_line(name="Hlt2RD_BdToKstLLP_LLPToEE_Line", name=name, algs=rd_prefilter() + [dielectrons, kst, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -132,7 +132,7 @@ def butokpLLP_LLPtoee_line(name="Hlt2RD_BuToKpLLP_LLPToEE_Line", name=name, algs=rd_prefilter() + [dielectrons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) ### mu e ### @@ -158,7 +158,7 @@ def bdtokstLLP_LLPtomue_line(name="Hlt2RD_BdToKstLLP_LLPToMuE_Line", name=name, algs=rd_prefilter() + [mues, kst, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -184,4 +184,4 @@ def butokpLLP_LLPtomue_line(name="Hlt2RD_BuToKpLLP_LLPToMuE_Line", name=name, algs=rd_prefilter() + [mues, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py index 1637a94ff44..f79ca676af1 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py @@ -32,7 +32,7 @@ import Functors as F from .builders import b_to_hemu_builders from .builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd all_lines = {} @@ -55,7 +55,7 @@ def butokemu_line(name="Hlt2RD_BuToKpEMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -76,7 +76,7 @@ def butopiemu_line(name="Hlt2RD_BuToPipEMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -105,7 +105,7 @@ def bstophiemu_line(name="Hlt2RD_BsToPhiEMu_PhiToKK_Line", prescale=1): name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -128,7 +128,7 @@ def bdtokstemu_line(name="Hlt2RD_BdToKstEMu_KstToKpPim_Line", prescale=1): name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -158,7 +158,7 @@ def lbtopkemu_line(name="Hlt2RD_LbToPKEMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -179,7 +179,7 @@ def butokemuSS_line(name="Hlt2RD_BuToKpEMu_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -200,7 +200,7 @@ def butopiemuSS_line(name="Hlt2RD_BuToPipEMu_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -230,7 +230,7 @@ def bstophiemuSS_line(name="Hlt2RD_BsToPhiEMu_SameSign_PhiToKK_Line", name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -254,7 +254,7 @@ def bdtokstemuSS_line(name="Hlt2RD_BdToKstEMu_SameSign_KstToKpPim_Line", name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -284,4 +284,4 @@ def lbtopkemuSS_line(name="Hlt2RD_LbToPKEMu_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py index 59326f84e06..21d28ade3de 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py @@ -32,7 +32,7 @@ import Functors as F from .builders import b_to_hemu_builders from .builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_default all_lines = {} @@ -50,7 +50,7 @@ def butokjpsi_mumu_line(name="Hlt2RD_BuToKpJpsi_JpsiToMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -67,7 +67,7 @@ def butopijpsi_mumu_line(name="Hlt2RD_BuToPipJpsi_JpsiToMuMu_Line", name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -93,7 +93,7 @@ def bstophijpsi_mumu_line(name="Hlt2RD_BsToPhiJpsi_PhiToKK_JpsiToMuMu_Line", name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -113,7 +113,7 @@ def bdtokstjpsi_mumu_line(name="Hlt2RD_BdToKstJpsi_KstToKpPim_JpsiToMuMu_Line", name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -139,7 +139,7 @@ def lbtopkjpsi_mumu_line(name="Hlt2RD_LbToPKJpsi_JpsiToMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -156,7 +156,7 @@ def butokjpsi_ee_line(name="Hlt2RD_BuToKpJpsi_JpsiToEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -173,7 +173,7 @@ def butopijpsi_ee_line(name="Hlt2RD_BuToPipJpsi_JpsiToEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -200,7 +200,7 @@ def bstophijpsi_ee_line(name="Hlt2RD_BsToPhiJpsi_PhiToKK_JpsiToEE_Line", name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -221,7 +221,7 @@ def bdtokstjpsi_ee_line(name="Hlt2RD_BdToKstJpsi_KstToKpPim_JpsiToEE_Line", name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -248,4 +248,4 @@ def lbtopkjpsi_ee_line(name="Hlt2RD_LbToPKJpsi_JpsiToEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py index 8f4406d8489..6b2575e629c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py @@ -17,7 +17,7 @@ from RecoConf.reconstruction_objects import make_pvs from .builders import b0_builder_kstarmumu from Hlt2Conf.lines.rd.builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd all_lines = {} @@ -37,5 +37,5 @@ def BdToKstarMuMu_line(name="Hlt2RD_BdToKstarMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [b], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_vrd(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py index 8fa958ed560..4f22219e05a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py @@ -27,7 +27,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from PyConf import configurable from Hlt2Conf.lines.rd.builders.b_to_ll_LFV_builder import make_B_from_taumu, make_B_from_taue, make_taus, make_muons, make_electrons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd hlt2_lines = {} @@ -51,7 +51,7 @@ def Hlt2_Bs2TauMu_OS_ExclusiveLine(name='Hlt2RD_BsToTauMu_TauTo3Pi_OS_Line', name=name, prescale=prescale, algs=rd_prefilter() + [taus, B_candidate], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(hlt2_lines) @@ -73,4 +73,4 @@ def Hlt2_Bs2TauE_OS_ExclusiveLine(name='Hlt2RD_BsToTauE_TauTo3Pi_OS_Line', name=name, prescale=prescale, algs=rd_prefilter() + [taus, B_candidate], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py index b103cbfc0fb..844662ad79c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py @@ -30,7 +30,7 @@ from Moore.config import HltLine, register_line_builder from .builders.rdbuilder_thor import make_rd_detached_dihadron from .builders.b_to_ll_builders import filter_B2MuMu, filter_B2MuE, filter_B2EE, make_B2MuMuGamma, make_B2EEGamma, make_B2MuEGamma -from .builders.rd_prefilters import rd_prefilter +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd all_lines = {} @@ -50,6 +50,7 @@ def Hlt2RD_BToMuMu_Line(name="Hlt2RD_BToMuMu_Line", algs=rd_prefilter() + [dimuons], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -68,6 +69,7 @@ def Hlt2RD_BToMuMu_SameSign_Line(name="Hlt2RD_BToMuMu_SameSign_Line", algs=rd_prefilter() + [dimuons], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -84,6 +86,7 @@ def Hlt2RD_BToEE_Line(name="Hlt2RD_BToEE_Line", prescale=1, persistreco=True): algs=rd_prefilter() + [dielectrons], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -102,6 +105,7 @@ def Hlt2RD_BToEE_SameSign_Line(name="Hlt2RD_BToEE_SameSign_Line", algs=rd_prefilter() + [dielectrons], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -119,6 +123,7 @@ def Hlt2RD_BToMuE_Line(name="Hlt2RD_BToMuE_Line", prescale=1, algs=rd_prefilter() + [emu], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -137,6 +142,7 @@ def Hlt2RD_BToMuE_SameSign_Line(name="Hlt2RD_BToMuE_SameSign_Line", algs=rd_prefilter() + [emu], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -153,6 +159,7 @@ def Hlt2RD_BTohh_Line(name="Hlt2RD_BTohh_Line", prescale=1, persistreco=True): algs=rd_prefilter() + [dihadrons], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -170,6 +177,7 @@ def Hlt2RD_BToMuMuGamma_Line(name="Hlt2RD_BToMuMuGamma_Line", algs=rd_prefilter() + [bs], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -187,6 +195,7 @@ def Hlt2RD_BToEEGamma_Line(name="Hlt2RD_BToEEGamma_Line", algs=rd_prefilter() + [bs], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -204,4 +213,5 @@ def Hlt2RD_BToMuEGamma_Line(name="Hlt2RD_BToMuEGamma_Line", algs=rd_prefilter() + [bs], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py index aac067f99e7..351f05a6116 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py @@ -49,7 +49,7 @@ from RecoConf.reconstruction_objects import make_pvs from Hlt2Conf.lines.rd.builders import rad_incl_builder from Hlt2Conf.lines.rd.builders.majorana_builder import make_majorana_lepton, make_majorana, make_bhadron_majorana -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd import Functors as F all_lines = {} @@ -98,7 +98,7 @@ def BpToMajoMu_MajoToEPi_LL_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -141,7 +141,7 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -190,7 +190,7 @@ def BpToMajoMu_MajoToEPi_DD_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -241,7 +241,7 @@ def BpToMajoE_MajoToMuPi_DD_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -287,7 +287,7 @@ def BpToMajoMu_MajoToEPi_LL_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -330,7 +330,7 @@ def BpToMajoE_MajoToMuPi_LL_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -379,7 +379,7 @@ def BpToMajoMu_MajoToEPi_DD_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -430,7 +430,7 @@ def BpToMajoE_MajoToMuPi_DD_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -464,7 +464,7 @@ def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2RD_BuToKs0Pi_Ks0ToPiPi_LL_Line", name=name, algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -497,4 +497,4 @@ def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2RD_BuToKs0Pi_Ks0ToPiPi_DD_Line", name=name, algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py index 70ecc49eb6f..bd937e9b7b4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py @@ -31,7 +31,7 @@ from Hlt2Conf.lines.rd.builders.rdbuilder_thor import ( make_rd_detached_dimuon, make_rd_detached_dielectron, make_rd_detached_mue, make_rd_ks0_lls, make_rd_lambda_lls, make_rd_detached_pions) -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default from Hlt2Conf.lines.rd.builders.b_to_v0ll_builder import ( make_b2ksll, make_lambdab2lambdall, make_b2kspill, make_ksttokspi) @@ -77,7 +77,7 @@ def b2ksmumull_line(name="Hlt2RD_BdToKSMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsMuMu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -109,7 +109,7 @@ def b2kseell_line(name="Hlt2RD_BdToKSEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsEE], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -143,7 +143,7 @@ def b2ksmuell_line(name="Hlt2RD_BdToKSMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsMuE], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -180,7 +180,7 @@ def lambdab2lambdamumull_line(name="Hlt2RD_LbToLMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LMuMu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -212,7 +212,7 @@ def lambdab2lambdaeell_line(name="Hlt2RD_LbToLEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LEE], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -246,7 +246,7 @@ def lambdab2lambdamuell_line(name="Hlt2RD_LbToLMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LMuE], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -292,7 +292,7 @@ def b2kspimumull_line(name="Hlt2RD_BuToKSPipMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiMuMu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -333,7 +333,7 @@ def b2kspieell_line(name="Hlt2RD_BuToKSPipEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiEE], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -376,5 +376,5 @@ def b2kspimuell_line(name="Hlt2RD_BuToKSPipMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiMuE], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py index 3fd80728a6a..2ff3dbc37d6 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py @@ -31,7 +31,7 @@ from Hlt2Conf.lines.rd.builders.rdbuilder_thor import ( from Hlt2Conf.lines.rd.builders.b_to_xgamma_exclusive_builders import ( make_b2xgamma_excl) -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default all_lines = {} @@ -70,7 +70,7 @@ def bs_to_phigamma_line(name="Hlt2RD_BsToPhiGamma_Line", algs=rd_prefilter() + [phis, b_s0], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -116,5 +116,5 @@ def bd_to_kstgamma_line(name="Hlt2RD_BdToKstGamma_Line", algs=rd_prefilter() + [kst, b0], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py index 5290a0f3e5f..b031186c68d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py @@ -10,7 +10,7 @@ ############################################################################### from Moore.lines import Hlt2Line from Moore.config import register_line_builder -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_default from RecoConf.reconstruction_objects import make_pvs from .builders import rdbuilder_thor from .builders import b_to_xll_builders @@ -70,7 +70,7 @@ def BuToKpEE_line(name="Hlt2RD_BuToKpEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -98,7 +98,7 @@ def BuToPipEE_line(name="Hlt2RD_BuToPipEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -133,7 +133,7 @@ def B0ToKpPimEE_line(name="Hlt2RD_B0ToKpPimEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, hadron, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -160,7 +160,7 @@ def B0ToKpKmEE_line(name="Hlt2RD_B0ToKpKmEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -191,7 +191,7 @@ def B0ToPipPimEE_line(name="Hlt2RD_B0ToPipPimEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, dipions, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -231,7 +231,7 @@ def BuToKpPipPimEE_line(name="Hlt2RD_BuToKstpEE_KstpToKpPipPim_Line", name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -262,7 +262,7 @@ def BuToKpKmKpEE_line(name="Hlt2RD_BuToKstpEE_KstpToKpKpKm_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -292,7 +292,7 @@ def BuToKpEE_SameSign_line(name="Hlt2RD_BuToKpEE_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -320,7 +320,7 @@ def BuToPipEE_SameSign_line(name="Hlt2RD_BuToPipEE_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -356,7 +356,7 @@ def B0ToKpPimEE_SameSign_line(name="Hlt2RD_B0ToKpPimEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, hadron, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -384,7 +384,7 @@ def B0ToKpKmEE_SameSign_line(name="Hlt2RD_B0ToKpKmEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -415,7 +415,7 @@ def B0ToPipPimEE_SameSign_line(name="Hlt2RD_B0ToPipPimEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, dipions, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -454,7 +454,7 @@ def BuToKpPipPimEE_SameSign_line( name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -486,7 +486,7 @@ def BuToKpKmKpEE_SameSign_line( name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -516,7 +516,7 @@ def BuToKpMuMu_line(name="Hlt2RD_BuToKpMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -546,7 +546,7 @@ def BuToPipMuMu_line(name="Hlt2RD_BuToPipMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -583,7 +583,7 @@ def B0ToKpPimMuMu_line(name="Hlt2RD_B0ToKpPimMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, hadron, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -611,7 +611,7 @@ def B0ToKpKmMuMu_line(name="Hlt2RD_B0ToKpKmMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -642,7 +642,7 @@ def B0ToPipPimMuMu_line(name="Hlt2RD_B0ToPipPimMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, dipions, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -683,7 +683,7 @@ def BuToKpPipPimMuMu_line(name="Hlt2RD_BuToKstpMuMu_KstpToKpPipPim_Line", name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -716,7 +716,7 @@ def BuToKpKmKpMuMu_line(name="Hlt2RD_BuToKstpMuMu_KstpToKpKpKm_Line", name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -748,7 +748,7 @@ def BuToKpMuMu_SameSign_line(name="Hlt2RD_BuToKpMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -778,7 +778,7 @@ def BuToPipMuMu_SameSign_line(name="Hlt2RD_BuToPipMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -815,7 +815,7 @@ def B0ToKpPimMuMu_SameSign_line(name="Hlt2RD_B0ToKpPimMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, hadron, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -844,7 +844,7 @@ def B0ToKpKmMuMu_SameSign_line(name="Hlt2RD_B0ToKpKmMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -876,7 +876,7 @@ def B0ToPipPimMuMu_SameSign_line(name="Hlt2RD_B0ToPipPimMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, dipions, B0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -918,7 +918,7 @@ def BuToKpPipPimMuMu_SameSign_line( name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -952,5 +952,5 @@ def BuToKpKmKpMuMu_SameSign_line( name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py index 4f50178bead..67abf75606b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py @@ -27,7 +27,7 @@ from Moore.lines import Hlt2Line from GaudiKernel.SystemOfUnits import GeV, MeV from RecoConf.reconstruction_objects import make_pvs #from Hlt2Conf.algorithms import ParticleContainersMerger -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from .builders.baryonic_builders import ( make_xim_to_lambda_pi_lll, make_xim_to_lambda_pi_ddl, @@ -73,7 +73,7 @@ def Hlt2RD_XibmToXimMuMu_LLL_Line(name="Hlt2RD_XibmToXimMuMu_LLL_Line", name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -109,7 +109,7 @@ def Hlt2RD_XibmToXimMuMu_DDL_Line(name="Hlt2RD_XibmToXimMuMu_DDL_Line", name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -145,7 +145,7 @@ def Hlt2RD_XibmToXimMuMu_DDD_Line(name="Hlt2RD_XibmToXimMuMu_DDD_Line", name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -179,7 +179,7 @@ def Hlt2RD_OmegabmToOmegamMuMu_LLL_Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -215,7 +215,7 @@ def Hlt2RD_OmegabmToOmegamMuMu_DDL_Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -251,7 +251,7 @@ def Hlt2RD_OmegabmToOmegamMuMu_DDD_Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -279,7 +279,7 @@ def Hlt2RD_XibmToXimEE_LLL_Line(name="Hlt2RD_XibmToXimEE_LLL_Line", name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -309,7 +309,7 @@ def Hlt2RD_XibmToXimEE_DDL_Line(name="Hlt2RD_XibmToXimEE_DDL_Line", name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -339,7 +339,7 @@ def Hlt2RD_XibmToXimEE_DDD_Line(name="Hlt2RD_XibmToXimEE_DDD_Line", name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -367,7 +367,7 @@ def Hlt2RD_OmegabmToOmegamEE_LLL_Line(name="Hlt2RD_OmegabmToOmegamEE_LLL_Line", name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -397,7 +397,7 @@ def Hlt2RD_OmegabmToOmegamEE_DDL_Line(name="Hlt2RD_OmegabmToOmegamEE_DDL_Line", name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -427,4 +427,4 @@ def Hlt2RD_OmegabmToOmegamEE_DDD_Line(name="Hlt2RD_OmegabmToOmegamEE_DDD_Line", name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py index e85cccb8b68..c27e970f7e7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py @@ -33,7 +33,7 @@ from Hlt2Conf.lines.rd.builders.baryonic_radiative_builders import ( from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_photons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from Moore.config import register_line_builder from Moore.lines import Hlt2Line @@ -91,7 +91,7 @@ def xibtoxigamma_xitolpi_lll_line( name=name, algs=rd_prefilter() + [xim, xibm], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -143,4 +143,4 @@ def obtoomgamma_omtol0k_omtol0k_lll_line( name=name, algs=rd_prefilter() + [omegam, omegabm], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py index afc70f5de5b..406463ba94d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py @@ -41,7 +41,7 @@ from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_pions, make_rd_detached_kaons, make_rd_detached_protons from Hlt2Conf.lines.rd.builders.bnv_builders import make_BToHMu, make_LzToHMu, make_LbToHMu, make_BToLcMu, make_LcToPKPi, make_LbToDsMu, make_DsToKKPi -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from RecoConf.reconstruction_objects import make_pvs @@ -71,7 +71,7 @@ def BToPMu_line(name="Hlt2RD_BToPpMu_Line", prescale=1 / 2.): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -90,7 +90,7 @@ def BToPMu_SS_line(name="Hlt2RD_BToPpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 2) Lz -> pi mu @@ -110,7 +110,7 @@ def LambdaToPiMu_line(name="Hlt2RD_LambdaToPipMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -129,7 +129,7 @@ def LambdaToPiMu_SS_line(name="Hlt2RD_LambdaToPipMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 3) Lz -> K mu @@ -149,7 +149,7 @@ def LambdaToKMu_line(name="Hlt2RD_LambdaToKpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -168,7 +168,7 @@ def LambdaToKMu_SS_line(name="Hlt2RD_LambdaToKpMu_SS_Line", prescale=1 / 2.): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 4) Lb -> pi mu @@ -188,7 +188,7 @@ def LbToPiMu_line(name="Hlt2RD_LbToPipMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -207,7 +207,7 @@ def LbToPiMu_SS_line(name="Hlt2RD_LbToPipMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 5) Lb -> K mu @@ -227,7 +227,7 @@ def LbToKMu_line(name="Hlt2RD_LbToKpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -246,7 +246,7 @@ def LbToKMu_SS_line(name="Hlt2RD_LbToKpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 6) B -> Lc mu @@ -267,7 +267,7 @@ def BToLcMu_line(name="Hlt2RD_BToLcMu_LcToPpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Lambda_c, B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -287,7 +287,7 @@ def BToLcMu_SS_line(name="Hlt2RD_BToLcMu_SS_LcToPpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Lambda_c, B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 7) Lb -> Ds mu @@ -307,7 +307,7 @@ def LbToDsMu_line(name="Hlt2RD_LbToDsMu_DsToKpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Ds, Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -326,4 +326,4 @@ def LbToDsMu_SS_line(name="Hlt2RD_LbToDsMu_SS_DsToKpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Ds, Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py index a7bb7c8250e..b2c33031d45 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py @@ -56,9 +56,16 @@ def rd_prefilter_noPV(require_GEC=False): return upfront_reconstruction() + gec -def rd_default_monitors(): +def rd_monitors_default(): """ - Returns default list of variables to monitor ["pt","eta","vchi2","ipchi2"] + Returns default list of variables to monitor ["m", "pt","eta","vchi2","ipchi2"] + """ + return + + +def rd_monitors_vrd(): + """ + Returns modified list of variables to monitor ["pt","eta","vchi2","ipchi2"] """ return ["pt", "eta", "vchi2", "ipchi2"] diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py index cdb2cabe418..79c47cb109b 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py @@ -57,7 +57,7 @@ from PyConf import configurable from GaudiKernel.SystemOfUnits import MeV, GeV from Hlt2Conf.lines.rd.builders import beauty2xtaul_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_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default import Functors as F hlt2_lines = {} @@ -103,7 +103,7 @@ def Hlt2_Bd2KstTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -141,7 +141,7 @@ def Hlt2_Bd2KstTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -178,7 +178,7 @@ def Hlt2_Bd2KstTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -215,7 +215,7 @@ def Hlt2_Bd2KstTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -252,7 +252,7 @@ def Hlt2_Bd2KstTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -289,7 +289,7 @@ def Hlt2_Bd2KstTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## B0 -> phi tau l @@ -315,7 +315,7 @@ def Hlt2_Bd2PhiTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -340,7 +340,7 @@ def Hlt2_Bd2PhiTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -365,7 +365,7 @@ def Hlt2_Bd2PhiTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -390,7 +390,7 @@ def Hlt2_Bd2PhiTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -415,7 +415,7 @@ def Hlt2_Bd2PhiTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -440,7 +440,7 @@ def Hlt2_Bd2PhiTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## B0 -> rho tau l @@ -466,7 +466,7 @@ def Hlt2_Bd2RhoTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -491,7 +491,7 @@ def Hlt2_Bd2RhoTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -516,7 +516,7 @@ def Hlt2_Bd2RhoTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -541,7 +541,7 @@ def Hlt2_Bd2RhoTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -566,7 +566,7 @@ def Hlt2_Bd2RhoTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -591,7 +591,7 @@ def Hlt2_Bd2RhoTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## B0 -> eta' tau l @@ -617,7 +617,7 @@ def Hlt2_Bd2EtapTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -642,7 +642,7 @@ def Hlt2_Bd2EtapTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -667,7 +667,7 @@ def Hlt2_Bd2EtapTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -692,7 +692,7 @@ def Hlt2_Bd2EtapTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -717,7 +717,7 @@ def Hlt2_Bd2EtapTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -742,7 +742,7 @@ def Hlt2_Bd2EtapTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## Bu -> K+ tau l @@ -769,7 +769,7 @@ def Hlt2_Bu2KplusTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -795,7 +795,7 @@ def Hlt2_Bu2KplusTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -820,7 +820,7 @@ def Hlt2_Bu2KplusTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -845,7 +845,7 @@ def Hlt2_Bu2KplusTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -870,7 +870,7 @@ def Hlt2_Bu2KplusTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -895,7 +895,7 @@ def Hlt2_Bu2KplusTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## Bu -> K1(1270)+ tau l @@ -921,7 +921,7 @@ def Hlt2_Bu2K1plusTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -946,7 +946,7 @@ def Hlt2_Bu2K1plusTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -971,7 +971,7 @@ def Hlt2_Bu2K1plusTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -996,7 +996,7 @@ def Hlt2_Bu2K1plusTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1021,7 +1021,7 @@ def Hlt2_Bu2K1plusTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1046,7 +1046,7 @@ def Hlt2_Bu2K1plusTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## Bs -> phi tau l @@ -1072,7 +1072,7 @@ def Hlt2_Bs2PhiTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1097,7 +1097,7 @@ def Hlt2_Bs2PhiTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1122,7 +1122,7 @@ def Hlt2_Bs2PhiTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1147,7 +1147,7 @@ def Hlt2_Bs2PhiTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1172,7 +1172,7 @@ def Hlt2_Bs2PhiTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1197,7 +1197,7 @@ def Hlt2_Bs2PhiTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## Bs -> eta' tau l @@ -1223,7 +1223,7 @@ def Hlt2_Bs2EtapTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1248,7 +1248,7 @@ def Hlt2_Bs2EtapTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1273,7 +1273,7 @@ def Hlt2_Bs2EtapTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1298,7 +1298,7 @@ def Hlt2_Bs2EtapTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1323,7 +1323,7 @@ def Hlt2_Bs2EtapTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1348,7 +1348,7 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## Lb -> K p tau l @@ -1373,7 +1373,7 @@ def Hlt2_Lambdab2KpTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1397,7 +1397,7 @@ def Hlt2_Lambdab2KpTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1421,7 +1421,7 @@ def Hlt2_Lambdab2KpTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1445,7 +1445,7 @@ def Hlt2_Lambdab2KpTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1469,7 +1469,7 @@ def Hlt2_Lambdab2KpTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1493,7 +1493,7 @@ def Hlt2_Lambdab2KpTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) ## Lambda_b -> Lambda tau l @@ -1520,7 +1520,7 @@ def Hlt2_Lambdab2LambdaTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1546,7 +1546,7 @@ def Hlt2_Lambdab2LambdaTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1572,7 +1572,7 @@ def Hlt2_Lambdab2LambdaTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1598,7 +1598,7 @@ def Hlt2_Lambdab2LambdaTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1624,7 +1624,7 @@ def Hlt2_Lambdab2LambdaTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(hlt2_lines) @@ -1650,4 +1650,4 @@ def Hlt2_Lambdab2LambdaTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py index b78b9530181..33b296cba22 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py @@ -61,7 +61,7 @@ from Hlt2Conf.algorithms_thor import require_all from Hlt2Conf.lines.rd.builders import rdbuilder_thor from Hlt2Conf.lines.rd.builders import btosmutau_exclusive -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default all_lines = {} @@ -189,7 +189,7 @@ def bstophimutau_tautomu_line(name='Hlt2RD_BsToKKTauMu_TauToMu_Line', name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -217,7 +217,7 @@ def bstophimutau_tautomu_same_sign_kaons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -245,7 +245,7 @@ def bstophimutau_tautomu_same_sign_kaons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -269,7 +269,7 @@ def bstophimutau_tautomu_same_sign_muons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -291,7 +291,7 @@ def bstophimutau_tautomu_fakemuon_from_tau_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -319,7 +319,7 @@ def bstophimutau_tautomu_fakemuon_from_b_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -345,7 +345,7 @@ def bstophimutau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -366,7 +366,7 @@ def lbtopkmutau_tautomu_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -387,7 +387,7 @@ def lbtopkmutau_tautomu_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -417,7 +417,7 @@ def lbtopkmutau_tautomu_same_sign_pk_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -447,7 +447,7 @@ def lbtopkmutau_tautomu_same_sign_pk_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -472,7 +472,7 @@ def lbtopkmutau_tautomu_same_sign_muons_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -497,7 +497,7 @@ def lbtopkmutau_tautomu_same_sign_muons_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -523,7 +523,7 @@ def lbtopkmutau_tautomu_fakemuon_from_tau_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -549,7 +549,7 @@ def lbtopkmutau_tautomu_fakemuon_from_tau_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -581,7 +581,7 @@ def lbtopkmutau_tautomu_fakemuon_from_b_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -613,7 +613,7 @@ def lbtopkmutau_tautomu_fakemuon_from_b_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -644,7 +644,7 @@ def lbtopkmutau_tautomu_fakeproton_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -675,7 +675,7 @@ def lbtopkmutau_tautomu_fakeproton_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -705,7 +705,7 @@ def lbtopkmutau_tautomu_fakekaon_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -735,7 +735,7 @@ def lbtopkmutau_tautomu_fakekaon_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -756,7 +756,7 @@ def bdtokstmutau_tautomu_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -777,7 +777,7 @@ def bdtokstmutau_tautomu_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -807,7 +807,7 @@ def bdtokstmutau_tautomu_same_sign_kpi_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -837,7 +837,7 @@ def bdtokstmutau_tautomu_same_sign_kpi_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -862,7 +862,7 @@ def bdtokstmutau_tautomu_same_sign_muons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -887,7 +887,7 @@ def bdtokstmutau_tautomu_same_sign_muons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -913,7 +913,7 @@ def bdtokstmutau_tautomu_fakemuon_from_tau_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -939,7 +939,7 @@ def bdtokstmutau_tautomu_fakemuon_from_tau_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -971,7 +971,7 @@ def bdtokstmutau_tautomu_fakemuon_from_b_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1003,7 +1003,7 @@ def bdtokstmutau_tautomu_fakemuon_from_b_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1034,7 +1034,7 @@ def bdtokstmutau_tautomu_fakekaon_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1065,7 +1065,7 @@ def bdtokstmutau_tautomu_fakekaon_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1095,7 +1095,7 @@ def bdtokstmutau_tautomu_fakepion_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1125,7 +1125,7 @@ def bdtokstmutau_tautomu_fakepion_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1144,7 +1144,7 @@ def butokmutau_tautomu_oskmu_line(name='Hlt2RD_BuToKTauMu_TauToMu_OSKmu_Line', name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1163,7 +1163,7 @@ def butokmutau_tautomu_sskmu_line(name='Hlt2RD_BuToKTauMu_TauToMu_SSKmu_Line', name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1186,7 +1186,7 @@ def butokmutau_tautomu_same_sign_muons_oskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1209,7 +1209,7 @@ def butokmutau_tautomu_same_sign_muons_sskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1234,7 +1234,7 @@ def butokmutau_tautomu_fakemuon_from_tau_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1259,7 +1259,7 @@ def butokmutau_tautomu_fakemuon_from_tau_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1289,7 +1289,7 @@ def butokmutau_tautomu_fakemuon_from_b_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1319,7 +1319,7 @@ def butokmutau_tautomu_fakemuon_from_b_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1347,7 +1347,7 @@ def butokmutau_tautomu_fakekaon_oskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -1375,4 +1375,4 @@ def butokmutau_tautomu_fakekaon_sskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py index f4d284bf4d3..232c8c27ade 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py @@ -59,7 +59,7 @@ from Hlt2Conf.algorithms_thor import require_all from Hlt2Conf.lines.rd.builders import rdbuilder_thor from Hlt2Conf.lines.rd.builders import btostautau_exclusive -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default all_lines = {} @@ -160,7 +160,7 @@ def bstophitautau_tautomu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -183,7 +183,7 @@ def bstophitautau_tautomu_same_sign_kaons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -206,7 +206,7 @@ def bstophitautau_tautomu_same_sign_muons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -228,7 +228,7 @@ def bstophitautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -250,7 +250,7 @@ def bstophitautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -268,7 +268,7 @@ def lbtopktautau_tautomu_line(name='Hlt2RD_LbToPKTauTau_TauToMu_Line', name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -292,7 +292,7 @@ def lbtopktautau_tautomu_same_sign_pK_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -316,7 +316,7 @@ def lbtopktautau_tautomu_same_sign_muons_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -340,7 +340,7 @@ def lbtopktautau_tautomu_same_sign_muons_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -362,7 +362,7 @@ def lbtopktautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -383,7 +383,7 @@ def lbtopktautau_tautomu_fakeproton_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -403,7 +403,7 @@ def lbtopktautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -421,7 +421,7 @@ def bdtoksttautau_tautomu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -445,7 +445,7 @@ def bdtoksttautau_tautomu_same_sign_Kpi_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -470,7 +470,7 @@ def bdtoksttautau_tautomu_same_sign_muons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -495,7 +495,7 @@ def bdtoksttautau_tautomu_same_sign_muons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -518,7 +518,7 @@ def bdtoksttautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -540,7 +540,7 @@ def bdtoksttautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -561,7 +561,7 @@ def bdtoksttautau_tautomu_fakepion_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -584,7 +584,7 @@ def bstokstksttautau_tautomu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -613,7 +613,7 @@ def bstokstksttautau_tautomu_same_sign_kstar_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -646,7 +646,7 @@ def bstokstksttautau_tautomu_same_sign_muons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -674,7 +674,7 @@ def bstokstksttautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -690,7 +690,7 @@ def butoktautau_tautomu_line(name='Hlt2RD_BuToKTauTau_TauToMu_Line', name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -712,7 +712,7 @@ def butoktautau_tautomu_same_sign_muons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -734,7 +734,7 @@ def butoktautau_tautomu_same_sign_muons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -754,7 +754,7 @@ def butoktautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) @register_line_builder(all_lines) @@ -772,4 +772,4 @@ def butoktautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_default()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py index 7ad7a4f9a1f..4b0caef54f7 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py @@ -38,7 +38,7 @@ from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_pions, make_rd_detached_kaons, make_rd_detached_protons from Hlt2Conf.lines.rd.builders.bnv_builders import make_BToHMu, make_LzToHMu, make_LbToHMu -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from RecoConf.reconstruction_objects import make_pvs @@ -68,7 +68,7 @@ def BToPiMu_line(name="Hlt2RD_BToPipMu_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -87,7 +87,7 @@ def BToPiMu_SS_line(name="Hlt2RD_BToPipMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 2) Bs -> K mu @@ -107,7 +107,7 @@ def BToKMu_line(name="Hlt2RD_BToKpMu_Line", prescale=1 / 2.): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -126,7 +126,7 @@ def BToKMu_SS_line(name="Hlt2RD_BToKpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 3) Lz -> p mu @@ -146,7 +146,7 @@ def LzToPMu_line(name="Hlt2RD_LambdaToPpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -165,7 +165,7 @@ def LzToPMu_SS_line(name="Hlt2RD_LambdaToPpMu_SS_Line", prescale=1 / 3.): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) # 4) Lb -> p mu @@ -185,7 +185,7 @@ def LbToPMu_line(name="Hlt2RD_LbToPpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -204,4 +204,4 @@ def LbToPMu_SS_line(name="Hlt2RD_LbToPpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py index d451dea1bf0..5c44ab0bbdb 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py @@ -27,7 +27,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from GaudiKernel.SystemOfUnits import MeV from RecoConf.reconstruction_objects import make_pvs -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from .builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_electrons, make_rd_detached_pions, make_rd_photons from .builders.omega_rare_decay_builder import make_xim_to_lambda_pim_lll, make_omega_to_xi_dip, make_omega_to_xi_gamma @@ -54,7 +54,7 @@ def omega_to_ximumu_lll_line(name="Hlt2RD_OmegamToXimMuMu_LLL_Line", name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -76,7 +76,7 @@ def omega_to_xiee_lll_line(name="Hlt2RD_OmegamToXimEE_LLL_Line", prescale=1): name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -99,7 +99,7 @@ def omega_to_xipipi_lll_line(name="Hlt2RD_OmegamToXimPiPi_LLL_Line", name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -120,4 +120,4 @@ def omega_to_xigamma_lll_line(name="Hlt2RD_OmegamToXimGamma_LLL_Line", name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py index 3102db411fd..db5cf264112 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py @@ -36,7 +36,7 @@ from Moore.config import HltLine, register_line_builder from Hlt2Conf.algorithms_thor import require_all import Functors as F from .builders.prompt_multilepton_builders import make_prompt_four_muon, make_prompt_3mue, make_prompt_2mu2e, make_prompt_2muSS2eSS, make_prompt_mue2e, make_prompt_2e2e, make_psi2S_tag -from .builders.rd_prefilters import rd_prefilter_noPV, rd_prefilter +from .builders.rd_prefilters import rd_prefilter_noPV, rd_prefilter, rd_monitors_vrd all_lines = {} @@ -64,6 +64,7 @@ def Hlt2RD_JpsiTo4Mu_Line(name="Hlt2RD_JpsiTo4Mu_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -94,6 +95,7 @@ def Hlt2RD_UpsilonTo4Mu_Line(name="Hlt2RD_UpsilonTo4Mu_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -126,6 +128,7 @@ def Hlt2RD_LowMassTo4Mu_Line(name="Hlt2RD_LowMassTo4Mu_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -156,6 +159,7 @@ def Hlt2RD_JpsiTo3MuE_Line(name="Hlt2RD_JpsiTo3MuE_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -187,6 +191,7 @@ def Hlt2RD_UpsilonTo3MuE_Line(name="Hlt2RD_UpsilonTo3MuE_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -215,6 +220,7 @@ def Hlt2RD_LowMassTo3MuE_Line(name="Hlt2RD_LowMassTo3MuE_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -245,6 +251,7 @@ def Hlt2RD_JpsiTo2Mu2E_Line(name="Hlt2RD_JpsiTo2Mu2E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -273,6 +280,7 @@ def Hlt2RD_UpsilonTo2Mu2E_Line(name="Hlt2RD_UpsilonTo2Mu2E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -301,6 +309,7 @@ def Hlt2RD_LowMassTo2Mu2E_Line(name="Hlt2RD_LowMassTo2Mu2E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -331,6 +340,7 @@ def Hlt2RD_JpsiTo2Mup2Em_Line(name="Hlt2RD_JpsiTo2Mup2Em_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -359,6 +369,7 @@ def Hlt2RD_UpsilonTo2Mup2Em_Line(name="Hlt2RD_UpsilonTo2Mup2Em_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -389,6 +400,7 @@ def Hlt2RD_LowMassTo2Mup2Em_Line(name="Hlt2RD_LowMassTo2Mup2Em_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -421,6 +433,7 @@ def Hlt2RD_JpsiToMu3E_Line(name="Hlt2RD_JpsiToMu3E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -450,6 +463,7 @@ def Hlt2RD_UpsilonToMu3E_Line(name="Hlt2RD_UpsilonToMu3E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -481,6 +495,7 @@ def Hlt2RD_LowMassToMu3E_Line(name="Hlt2RD_LowMassToMu3E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -514,6 +529,7 @@ def Hlt2RD_JpsiTo4E_Line(name="Hlt2RD_JpsiTo4E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -543,6 +559,7 @@ def Hlt2RD_UpsilonTo4E_Line(name="Hlt2RD_UpsilonTo4E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -576,6 +593,7 @@ def Hlt2RD_LowMassTo4E_Line(name="Hlt2RD_LowMassTo4E_Line", algs=rd_prefilter() + [fourlepton], #here we do require a PV persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -611,6 +629,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo4Mu_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -642,6 +661,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo2Mu2E_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -668,6 +688,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo3MuE_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -693,6 +714,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo2Mup2Em_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -717,6 +739,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiToMu3E_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) @@ -741,4 +764,5 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo4E_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, + monitoring_variables=rd_monitors_vrd(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py index ecaace2ebbe..55373dd0e5f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py @@ -31,7 +31,7 @@ from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_mue, make_rd_prompt_mue, make_rd_prompt_dielectrons #make_rd_prompt_dimuons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from Hlt2Conf.algorithms_thor import require_all import Functors as F @@ -60,7 +60,7 @@ def phi_to_mue_line(name="Hlt2RD_PhiToMuE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -80,7 +80,7 @@ def phi_to_mue_ss_line(name="Hlt2RD_PhiToMuE_SS_Line", algs=rd_prefilter() + [emu_SS], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -102,7 +102,7 @@ def jpsi_to_mue_line(name="Hlt2RD_JpsiToMuE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -125,7 +125,7 @@ def jpsi_to_mue_ss_line(name="Hlt2RD_JpsiToMuE_SS_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -148,7 +148,7 @@ def upsilon_to_mue_line(name="Hlt2RD_UpsilonToMuE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -171,7 +171,7 @@ def upsilon_to_mue_ss_line(name="Hlt2RD_UpsilonToMuE_SS_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) ##### DETACHED LINES ##### @@ -202,7 +202,7 @@ def phi_to_mue_detached_line(name="Hlt2RD_PhiToMuE_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -230,7 +230,7 @@ def phi_to_mue_ss_detached_line(name="Hlt2RD_PhiToMuE_SS_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -258,7 +258,7 @@ def jpsi_to_mue_detached_line(name="Hlt2RD_JpsiToMuE_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -286,7 +286,7 @@ def jpsi_to_mue_ss_detached_line(name="Hlt2RD_JpsiToMuE_SS_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) ##### CONTROL ee LINES ##### @@ -310,7 +310,7 @@ def phi_to_ee_line(name="Hlt2RD_PhiToEE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -331,7 +331,7 @@ def jpsi_to_ee_line(name="Hlt2RD_JpsiToEE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -352,7 +352,7 @@ def upsilon_to_ee_line(name="Hlt2RD_UpsilonToEE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) ################# diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py index 85920c94eca..5be47d1bf4a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py @@ -116,6 +116,7 @@ def BToHHGamma_Incl_line(name="Hlt2RD_BToHHGamma_Incl_Line", algs=rd_prefilters.rd_prefilter() + [kstars, b], prescale=prescale, persistreco=persistreco, + monitoring_variables=rd_prefilters.rd_monitors_default(), ) @@ -202,6 +203,7 @@ def BToHHHGamma_Incl_line(name="Hlt2RD_BToHHHGamma_Incl_Line", algs=rd_prefilters.rd_prefilter() + [kstars, dstars, b], prescale=prescale, persistreco=persistreco, + monitoring_variables=rd_prefilters.rd_monitors_default(), ) @@ -258,6 +260,7 @@ def BToHHGamma_GammaToEE_Incl_line( algs=rd_prefilters.rd_prefilter() + [kstars, b], prescale=prescale, persistreco=persistreco, + monitoring_variables=rd_prefilters.rd_monitors_default(), ) @@ -350,4 +353,5 @@ def BToHHHGamma_GammaToEE_Incl_line( algs=rd_prefilters.rd_prefilter() + [kstars, dstars, b], prescale=prescale, persistreco=persistreco, + monitoring_variables=rd_prefilters.rd_monitors_default(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py index ae0047c6cb2..2923b2f0c81 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py @@ -34,7 +34,7 @@ from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line from Hlt2Conf.algorithms import ParticleContainersMerger -from .builders.rd_prefilters import rd_prefilter, rd_default_monitors +from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd from .builders.rdbuilder_thor import ( make_rd_detached_muons, make_rd_detached_electrons, make_rd_detached_pions, make_rd_has_rich_detached_protons, make_rd_detached_phis, @@ -61,7 +61,7 @@ def tau_to_mumumu_line(name="Hlt2RD_TauToMuMuMu_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -91,7 +91,7 @@ def tau_to_mumue_line(name="Hlt2RD_TauToMuMuE_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -121,7 +121,7 @@ def tau_to_muee_line(name="Hlt2RD_TauToMuEE_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -141,7 +141,7 @@ def tau_to_eee_line(name="Hlt2RD_TauToEEE_Line", prescale=1, algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -171,7 +171,7 @@ def tau_to_pmumu_line(name="Hlt2RD_TauToPMuMu_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -195,7 +195,7 @@ def tau_to_phimu_line(name="Hlt2RD_TauToPhiMu_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -216,7 +216,7 @@ def tau_to_5mu_line(name="Hlt2RD_TauTo5Mu_Line", prescale=1, algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -237,7 +237,7 @@ def tau_to_7mu_line(name="Hlt2RD_TauTo7Mu_Line", prescale=1, algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -265,7 +265,7 @@ def ds_to_phipi_mumu_line(name="Hlt2RD_DsToPhiPi_PhiToMuMu_Line", algs=rd_prefilter() + [ds], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) @register_line_builder(all_lines) @@ -293,4 +293,4 @@ def ds_to_phipi_ee_line(name="Hlt2RD_DsToPhiPi_PhiToEE_Line", algs=rd_prefilter() + [ds], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_default_monitors()) + monitoring_variables=rd_monitors_vrd()) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py index 0a65cc43e9e..9fdb03b7b08 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py @@ -19,7 +19,7 @@ TODO: - Replace PID variables by ProbNN once we have a proper tuning """ from GaudiKernel.SystemOfUnits import MeV -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_default_monitors +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default from Hlt2Conf.lines.rd.builders import strange_builders from Moore.config import register_line_builder from Moore.lines import Hlt2Line @@ -44,7 +44,7 @@ def ks02pipi_line(name="Hlt2RD_KS0ToPiPi_Line", prescale=1e-4): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -61,7 +61,7 @@ def ks02mumu_line(name="Hlt2RD_KS0ToMuMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -91,7 +91,7 @@ def ks02mumu_sb_line(name="Hlt2RD_KS0ToMuMu_SB_Line", prescale=1e-4): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -113,7 +113,7 @@ def ks02mumu_ss_line(name="Hlt2RD_KS0ToMuMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -132,7 +132,7 @@ def ks02emu_line(name="Hlt2RD_KS0ToEMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -155,7 +155,7 @@ def ks02emu_ss_line(name="Hlt2RD_KS0ToEMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -178,7 +178,7 @@ def ks02ee_line(name="Hlt2RD_KS0ToEE_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -205,7 +205,7 @@ def ks02ee_ss_line(name="Hlt2RD_KS0ToEE_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -224,7 +224,7 @@ def lambda02ppi_line(name="Hlt2RD_Lambda0ToPPi_Line", prescale=1e-3): name=name, algs=rd_prefilter() + [l0], prescale=prescale, - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -242,7 +242,7 @@ def lambda02pmu_line(name="Hlt2RD_Lambda0ToPMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [l0], - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) @@ -260,5 +260,5 @@ def lambda02pe_line(name="Hlt2RD_Lambda0ToPE_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [l0], - monitoring_variables=rd_default_monitors(), + monitoring_variables=rd_monitors_default(), ) -- GitLab From 3a938913c4b8949a39c1ca13e3781e8cd92bf9b7 Mon Sep 17 00:00:00 2001 From: Miroslav Saur <Miroslav Saur miroslav.saur@cern.ch> Date: Mon, 5 Sep 2022 15:26:15 +0200 Subject: [PATCH 3/4] [line monitoring] RD monitoring: passing all variables explicitly for now --- Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py index b2c33031d45..9452b49417e 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py @@ -60,7 +60,7 @@ def rd_monitors_default(): """ Returns default list of variables to monitor ["m", "pt","eta","vchi2","ipchi2"] """ - return + return ["m", "pt", "eta", "vchi2", "ipchi2"] def rd_monitors_vrd(): -- GitLab From 1fab1dc4ecc9eecca1c8b8b39a31b83fa9f00711 Mon Sep 17 00:00:00 2001 From: mstahl <marian.stahl@cern.ch> Date: Mon, 12 Sep 2022 18:31:45 +0200 Subject: [PATCH 4/4] [default monitoring] list to tuple --- .../Hlt2Conf/lines/charm/rare_charm_makers.py | 2 +- .../lines/generic_lines_thor/generic_lines.py | 2 +- .../Hlt2Conf/lines/monitoring/pi0_line.py | 2 +- .../python/Hlt2Conf/lines/rd/RpK_lines.py | 10 +- .../lines/rd/b_to_Xdilepton_detached.py | 14 +- .../python/Hlt2Conf/lines/rd/b_to_hemu.py | 22 ++-- .../lines/rd/b_to_hemu_control_modes.py | 22 ++-- .../Hlt2Conf/lines/rd/b_to_kstarmumu.py | 4 +- .../python/Hlt2Conf/lines/rd/b_to_ll_LFV.py | 6 +- .../python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py | 24 ++-- .../lines/rd/b_to_majolep_majo_to_leppi.py | 22 ++-- .../Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py | 20 +-- .../lines/rd/b_to_xgamma_exclusive_hlt2.py | 6 +- .../python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py | 58 ++++----- .../python/Hlt2Conf/lines/rd/baryonic.py | 26 ++-- .../Hlt2Conf/lines/rd/baryonic_radiative.py | 6 +- .../Hlt2Conf/lines/rd/bnv_lines_hlt2.py | 30 ++--- .../lines/rd/builders/rd_prefilters.py | 15 +-- .../Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py | 122 +++++++++--------- .../lines/rd/hlt2_btosmutau_exclusive.py | 92 ++++++------- .../lines/rd/hlt2_btostautau_exclusive.py | 58 ++++----- .../Hlt2Conf/lines/rd/lfv_lines_hlt2.py | 18 +-- .../lines/rd/omega_rare_decay_lines.py | 10 +- .../Hlt2Conf/lines/rd/prompt_multilepton.py | 50 +++---- .../python/Hlt2Conf/lines/rd/qqbar_to_ll.py | 28 ++-- .../python/Hlt2Conf/lines/rd/rad_incl.py | 8 +- .../Hlt2Conf/lines/rd/rare_tau_decay_lines.py | 22 ++-- .../python/Hlt2Conf/lines/rd/strange.py | 24 ++-- Hlt/Moore/python/Moore/lines.py | 4 +- Hlt/Moore/python/Moore/monitoring.py | 117 +++++++++-------- doc/tutorials/hlt2_line.rst | 6 +- 31 files changed, 422 insertions(+), 428 deletions(-) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py index 844e955698b..74b0c0c2161 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/rare_charm_makers.py @@ -47,7 +47,7 @@ from Functors.math import in_range import Functors as F from .particle_properties import _PION_M, _PI0_M -_MONITORING_VARIABLES = ["pt", "eta", "vchi2", "ipchi2"] +_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2") """****************************************""" """Common cuts""" """****************************************""" diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py index e08cb2c9781..ee9064d98a6 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic_lines_thor/generic_lines.py @@ -332,7 +332,7 @@ def bs2jpsiphi_jpsi2mumu_phi2kk_line( name=name, algs=upfront_reconstruction() + [require_pvs(pvs), phi_mon, jpsi, bs], prescale=prescale, - monitoring_variables=[], + monitoring_variables=(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py index a5b4002d087..36da9e8020d 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/pi0_line.py @@ -41,5 +41,5 @@ def monitoring_pi0_line(name="Hlt2MonitoringPi0Line", prescale=1e-6): name=name, algs=upfront_reconstruction() + pi0_monitoring(name), prescale=prescale, - monitoring_variables=[], + monitoring_variables=(), ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py index 87999190e38..c4167f65d20 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/RpK_lines.py @@ -22,7 +22,7 @@ The following modes are included: from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line -from .builders.rd_prefilters import rd_prefilter, rd_monitors_default +from .builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES from .builders.rdbuilder_thor import (make_rd_detached_dimuon, make_rd_detached_dielectron) from .builders.RpK_builders import (make_lambdab_to_pkll, @@ -42,7 +42,7 @@ def lambdab_to_pkmumu_line(name="Hlt2RD_LambdabToPKMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -57,7 +57,7 @@ def lambdab_to_pkmumu_ss_line(name="Hlt2RD_LambdabToPKMuMu_SS_Line", name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -71,7 +71,7 @@ def lambdab_to_pkee_line(name="Hlt2RD_LambdabToPKEE_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -85,4 +85,4 @@ def lambdab_to_pkee_ss_line(name="Hlt2RD_LambdabToPKEE_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdab], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py index f69488623d0..db75d4b8923 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_Xdilepton_detached.py @@ -19,7 +19,7 @@ Authors: Martin Andersson, Eluned Smith from Moore.config import register_line_builder from Moore.lines import Hlt2Line -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from GaudiKernel.SystemOfUnits import MeV from RecoConf.reconstruction_objects import make_pvs @@ -55,7 +55,7 @@ def bdtokstLLP_LLPtomumu_line(name="Hlt2RD_BdToKstLLP_LLPToMuMu_Line", name=name, algs=rd_prefilter() + [dimuons, kst, bd], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -81,7 +81,7 @@ def butokpLLP_LLPtomumu_line(name="Hlt2RD_BuToKpLLP_LLPToMuMu_Line", name=name, algs=rd_prefilter() + [dimuons, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) ### ee ### @@ -107,7 +107,7 @@ def bdtokstLLP_LLPtoee_line(name="Hlt2RD_BdToKstLLP_LLPToEE_Line", name=name, algs=rd_prefilter() + [dielectrons, kst, bd], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -132,7 +132,7 @@ def butokpLLP_LLPtoee_line(name="Hlt2RD_BuToKpLLP_LLPToEE_Line", name=name, algs=rd_prefilter() + [dielectrons, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) ### mu e ### @@ -158,7 +158,7 @@ def bdtokstLLP_LLPtomue_line(name="Hlt2RD_BdToKstLLP_LLPToMuE_Line", name=name, algs=rd_prefilter() + [mues, kst, bd], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -184,4 +184,4 @@ def butokpLLP_LLPtomue_line(name="Hlt2RD_BuToKpLLP_LLPToMuE_Line", name=name, algs=rd_prefilter() + [mues, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py index f79ca676af1..efbd23eaef1 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu.py @@ -32,7 +32,7 @@ import Functors as F from .builders import b_to_hemu_builders from .builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES all_lines = {} @@ -55,7 +55,7 @@ def butokemu_line(name="Hlt2RD_BuToKpEMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -76,7 +76,7 @@ def butopiemu_line(name="Hlt2RD_BuToPipEMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -105,7 +105,7 @@ def bstophiemu_line(name="Hlt2RD_BsToPhiEMu_PhiToKK_Line", prescale=1): name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -128,7 +128,7 @@ def bdtokstemu_line(name="Hlt2RD_BdToKstEMu_KstToKpPim_Line", prescale=1): name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -158,7 +158,7 @@ def lbtopkemu_line(name="Hlt2RD_LbToPKEMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -179,7 +179,7 @@ def butokemuSS_line(name="Hlt2RD_BuToKpEMu_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -200,7 +200,7 @@ def butopiemuSS_line(name="Hlt2RD_BuToPipEMu_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -230,7 +230,7 @@ def bstophiemuSS_line(name="Hlt2RD_BsToPhiEMu_SameSign_PhiToKK_Line", name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -254,7 +254,7 @@ def bdtokstemuSS_line(name="Hlt2RD_BdToKstEMu_SameSign_KstToKpPim_Line", name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -284,4 +284,4 @@ def lbtopkemuSS_line(name="Hlt2RD_LbToPKEMu_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py index 21d28ade3de..a77dd12a091 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_hemu_control_modes.py @@ -32,7 +32,7 @@ import Functors as F from .builders import b_to_hemu_builders from .builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter, rd_monitors_default +from .builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES all_lines = {} @@ -50,7 +50,7 @@ def butokjpsi_mumu_line(name="Hlt2RD_BuToKpJpsi_JpsiToMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -67,7 +67,7 @@ def butopijpsi_mumu_line(name="Hlt2RD_BuToPipJpsi_JpsiToMuMu_Line", name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -93,7 +93,7 @@ def bstophijpsi_mumu_line(name="Hlt2RD_BsToPhiJpsi_PhiToKK_JpsiToMuMu_Line", name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -113,7 +113,7 @@ def bdtokstjpsi_mumu_line(name="Hlt2RD_BdToKstJpsi_KstToKpPim_JpsiToMuMu_Line", name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -139,7 +139,7 @@ def lbtopkjpsi_mumu_line(name="Hlt2RD_LbToPKJpsi_JpsiToMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -156,7 +156,7 @@ def butokjpsi_ee_line(name="Hlt2RD_BuToKpJpsi_JpsiToEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -173,7 +173,7 @@ def butopijpsi_ee_line(name="Hlt2RD_BuToPipJpsi_JpsiToEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dileptons, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -200,7 +200,7 @@ def bstophijpsi_ee_line(name="Hlt2RD_BsToPhiJpsi_PhiToKK_JpsiToEE_Line", name=name, algs=rd_prefilter() + [dikaons, dileptons, bs], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -221,7 +221,7 @@ def bdtokstjpsi_ee_line(name="Hlt2RD_BdToKstJpsi_KstToKpPim_JpsiToEE_Line", name=name, algs=rd_prefilter() + [kstars, dileptons, bd], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -248,4 +248,4 @@ def lbtopkjpsi_ee_line(name="Hlt2RD_LbToPKJpsi_JpsiToEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dihadron, dileptons, lb], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py index 6b2575e629c..4af439aa3ca 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_kstarmumu.py @@ -17,7 +17,7 @@ from RecoConf.reconstruction_objects import make_pvs from .builders import b0_builder_kstarmumu from Hlt2Conf.lines.rd.builders import rdbuilder_thor -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES all_lines = {} @@ -37,5 +37,5 @@ def BdToKstarMuMu_line(name="Hlt2RD_BdToKstarMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [b], prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py index 4f22219e05a..7ba77871d02 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_LFV.py @@ -27,7 +27,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from PyConf import configurable from Hlt2Conf.lines.rd.builders.b_to_ll_LFV_builder import make_B_from_taumu, make_B_from_taue, make_taus, make_muons, make_electrons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES hlt2_lines = {} @@ -51,7 +51,7 @@ def Hlt2_Bs2TauMu_OS_ExclusiveLine(name='Hlt2RD_BsToTauMu_TauTo3Pi_OS_Line', name=name, prescale=prescale, algs=rd_prefilter() + [taus, B_candidate], - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -73,4 +73,4 @@ def Hlt2_Bs2TauE_OS_ExclusiveLine(name='Hlt2RD_BsToTauE_TauTo3Pi_OS_Line', name=name, prescale=prescale, algs=rd_prefilter() + [taus, B_candidate], - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py index 844662ad79c..b933a9b28f4 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_ll_hlt2.py @@ -9,7 +9,7 @@ # or submit itself to any jurisdiction. # ############################################################################### """ -Registration of B2ll(')(gamma) lines for the RD working group. +Registration of B2ll(')(gamma) lines for the RD working group. It contains also B2HH as this is an important normalisation. - B -> Mu Mu - B -> Mu E @@ -30,7 +30,7 @@ from Moore.config import HltLine, register_line_builder from .builders.rdbuilder_thor import make_rd_detached_dihadron from .builders.b_to_ll_builders import filter_B2MuMu, filter_B2MuE, filter_B2EE, make_B2MuMuGamma, make_B2EEGamma, make_B2MuEGamma -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES all_lines = {} @@ -50,7 +50,7 @@ def Hlt2RD_BToMuMu_Line(name="Hlt2RD_BToMuMu_Line", algs=rd_prefilter() + [dimuons], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -69,7 +69,7 @@ def Hlt2RD_BToMuMu_SameSign_Line(name="Hlt2RD_BToMuMu_SameSign_Line", algs=rd_prefilter() + [dimuons], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -86,7 +86,7 @@ def Hlt2RD_BToEE_Line(name="Hlt2RD_BToEE_Line", prescale=1, persistreco=True): algs=rd_prefilter() + [dielectrons], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -105,7 +105,7 @@ def Hlt2RD_BToEE_SameSign_Line(name="Hlt2RD_BToEE_SameSign_Line", algs=rd_prefilter() + [dielectrons], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -123,7 +123,7 @@ def Hlt2RD_BToMuE_Line(name="Hlt2RD_BToMuE_Line", prescale=1, algs=rd_prefilter() + [emu], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -142,7 +142,7 @@ def Hlt2RD_BToMuE_SameSign_Line(name="Hlt2RD_BToMuE_SameSign_Line", algs=rd_prefilter() + [emu], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -159,7 +159,7 @@ def Hlt2RD_BTohh_Line(name="Hlt2RD_BTohh_Line", prescale=1, persistreco=True): algs=rd_prefilter() + [dihadrons], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -177,7 +177,7 @@ def Hlt2RD_BToMuMuGamma_Line(name="Hlt2RD_BToMuMuGamma_Line", algs=rd_prefilter() + [bs], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -195,7 +195,7 @@ def Hlt2RD_BToEEGamma_Line(name="Hlt2RD_BToEEGamma_Line", algs=rd_prefilter() + [bs], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -213,5 +213,5 @@ def Hlt2RD_BToMuEGamma_Line(name="Hlt2RD_BToMuEGamma_Line", algs=rd_prefilter() + [bs], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py index 351f05a6116..eb196b28ba5 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_majolep_majo_to_leppi.py @@ -49,7 +49,7 @@ from RecoConf.reconstruction_objects import make_pvs from Hlt2Conf.lines.rd.builders import rad_incl_builder from Hlt2Conf.lines.rd.builders.majorana_builder import make_majorana_lepton, make_majorana, make_bhadron_majorana -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES import Functors as F all_lines = {} @@ -98,7 +98,7 @@ def BpToMajoMu_MajoToEPi_LL_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -141,7 +141,7 @@ def BpToMajoE_MajoToMuPi_LL_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -190,7 +190,7 @@ def BpToMajoMu_MajoToEPi_DD_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -241,7 +241,7 @@ def BpToMajoE_MajoToMuPi_DD_Tight_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -287,7 +287,7 @@ def BpToMajoMu_MajoToEPi_LL_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -330,7 +330,7 @@ def BpToMajoE_MajoToMuPi_LL_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -379,7 +379,7 @@ def BpToMajoMu_MajoToEPi_DD_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piE, b2MuN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -430,7 +430,7 @@ def BpToMajoE_MajoToMuPi_DD_Loose_line( name=name, algs=rd_prefilter() + [majoranas2piMu, b2EN], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -464,7 +464,7 @@ def BuToKs0Pi_Ks0ToPiPi_LL_line(name="Hlt2RD_BuToKs0Pi_Ks0ToPiPi_LL_Line", name=name, algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -497,4 +497,4 @@ def BuToKs0Pi_Ks0ToPiPi_DD_line(name="Hlt2RD_BuToKs0Pi_Ks0ToPiPi_DD_Line", name=name, algs=rd_prefilter() + [Ks2pipi, b2Ks0Pi], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py index bd937e9b7b4..4e3f320da5c 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_v0ll_hlt2.py @@ -31,7 +31,7 @@ from Hlt2Conf.lines.rd.builders.rdbuilder_thor import ( make_rd_detached_dimuon, make_rd_detached_dielectron, make_rd_detached_mue, make_rd_ks0_lls, make_rd_lambda_lls, make_rd_detached_pions) -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES from Hlt2Conf.lines.rd.builders.b_to_v0ll_builder import ( make_b2ksll, make_lambdab2lambdall, make_b2kspill, make_ksttokspi) @@ -77,7 +77,7 @@ def b2ksmumull_line(name="Hlt2RD_BdToKSMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsMuMu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -109,7 +109,7 @@ def b2kseell_line(name="Hlt2RD_BdToKSEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsEE], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -143,7 +143,7 @@ def b2ksmuell_line(name="Hlt2RD_BdToKSMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsMuE], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -180,7 +180,7 @@ def lambdab2lambdamumull_line(name="Hlt2RD_LbToLMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LMuMu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -212,7 +212,7 @@ def lambdab2lambdaeell_line(name="Hlt2RD_LbToLEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LEE], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -246,7 +246,7 @@ def lambdab2lambdamuell_line(name="Hlt2RD_LbToLMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [lambdas, Lb2LMuE], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -292,7 +292,7 @@ def b2kspimumull_line(name="Hlt2RD_BuToKSPipMuMu_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiMuMu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -333,7 +333,7 @@ def b2kspieell_line(name="Hlt2RD_BuToKSPipEE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiEE], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -376,5 +376,5 @@ def b2kspimuell_line(name="Hlt2RD_BuToKSPipMuE_LL_Line", prescale=1): name=name, algs=rd_prefilter() + [kshorts, B2KsPiMuE], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py index 2ff3dbc37d6..39c998065be 100755 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xgamma_exclusive_hlt2.py @@ -31,7 +31,7 @@ from Hlt2Conf.lines.rd.builders.rdbuilder_thor import ( from Hlt2Conf.lines.rd.builders.b_to_xgamma_exclusive_builders import ( make_b2xgamma_excl) -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES all_lines = {} @@ -70,7 +70,7 @@ def bs_to_phigamma_line(name="Hlt2RD_BsToPhiGamma_Line", algs=rd_prefilter() + [phis, b_s0], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -116,5 +116,5 @@ def bd_to_kstgamma_line(name="Hlt2RD_BdToKstGamma_Line", algs=rd_prefilter() + [kst, b0], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py index b031186c68d..c4b7c1d82a1 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/b_to_xll_hlt2.py @@ -10,7 +10,7 @@ ############################################################################### from Moore.lines import Hlt2Line from Moore.config import register_line_builder -from .builders.rd_prefilters import rd_prefilter, rd_monitors_default +from .builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES from RecoConf.reconstruction_objects import make_pvs from .builders import rdbuilder_thor from .builders import b_to_xll_builders @@ -70,7 +70,7 @@ def BuToKpEE_line(name="Hlt2RD_BuToKpEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -98,7 +98,7 @@ def BuToPipEE_line(name="Hlt2RD_BuToPipEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -133,7 +133,7 @@ def B0ToKpPimEE_line(name="Hlt2RD_B0ToKpPimEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, hadron, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -160,7 +160,7 @@ def B0ToKpKmEE_line(name="Hlt2RD_B0ToKpKmEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -191,7 +191,7 @@ def B0ToPipPimEE_line(name="Hlt2RD_B0ToPipPimEE_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, dipions, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -231,7 +231,7 @@ def BuToKpPipPimEE_line(name="Hlt2RD_BuToKstpEE_KstpToKpPipPim_Line", name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -262,7 +262,7 @@ def BuToKpKmKpEE_line(name="Hlt2RD_BuToKstpEE_KstpToKpKpKm_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -292,7 +292,7 @@ def BuToKpEE_SameSign_line(name="Hlt2RD_BuToKpEE_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -320,7 +320,7 @@ def BuToPipEE_SameSign_line(name="Hlt2RD_BuToPipEE_SameSign_Line", prescale=1): name=name, algs=rd_prefilter() + [dielectrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -356,7 +356,7 @@ def B0ToKpPimEE_SameSign_line(name="Hlt2RD_B0ToKpPimEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, hadron, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -384,7 +384,7 @@ def B0ToKpKmEE_SameSign_line(name="Hlt2RD_B0ToKpKmEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -415,7 +415,7 @@ def B0ToPipPimEE_SameSign_line(name="Hlt2RD_B0ToPipPimEE_SameSign_Line", name=name, algs=rd_prefilter() + [dielectrons, dipions, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -454,7 +454,7 @@ def BuToKpPipPimEE_SameSign_line( name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -486,7 +486,7 @@ def BuToKpKmKpEE_SameSign_line( name=name, algs=rd_prefilter() + [dielectrons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -516,7 +516,7 @@ def BuToKpMuMu_line(name="Hlt2RD_BuToKpMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -546,7 +546,7 @@ def BuToPipMuMu_line(name="Hlt2RD_BuToPipMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -583,7 +583,7 @@ def B0ToKpPimMuMu_line(name="Hlt2RD_B0ToKpPimMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, hadron, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -611,7 +611,7 @@ def B0ToKpKmMuMu_line(name="Hlt2RD_B0ToKpKmMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -642,7 +642,7 @@ def B0ToPipPimMuMu_line(name="Hlt2RD_B0ToPipPimMuMu_Line", prescale=1): name=name, algs=rd_prefilter() + [dimuons, dipions, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -683,7 +683,7 @@ def BuToKpPipPimMuMu_line(name="Hlt2RD_BuToKstpMuMu_KstpToKpPipPim_Line", name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -716,7 +716,7 @@ def BuToKpKmKpMuMu_line(name="Hlt2RD_BuToKstpMuMu_KstpToKpKpKm_Line", name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -748,7 +748,7 @@ def BuToKpMuMu_SameSign_line(name="Hlt2RD_BuToKpMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -778,7 +778,7 @@ def BuToPipMuMu_SameSign_line(name="Hlt2RD_BuToPipMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -815,7 +815,7 @@ def B0ToKpPimMuMu_SameSign_line(name="Hlt2RD_B0ToKpPimMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, hadron, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -844,7 +844,7 @@ def B0ToKpKmMuMu_SameSign_line(name="Hlt2RD_B0ToKpKmMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, dikaons, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -876,7 +876,7 @@ def B0ToPipPimMuMu_SameSign_line(name="Hlt2RD_B0ToPipPimMuMu_SameSign_Line", name=name, algs=rd_prefilter() + [dimuons, dipions, B0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -918,7 +918,7 @@ def BuToKpPipPimMuMu_SameSign_line( name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -952,5 +952,5 @@ def BuToKpKmKpMuMu_SameSign_line( name=name, algs=rd_prefilter() + [dimuons, hadrons, Bu], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py index 67abf75606b..927e6f2eb17 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic.py @@ -27,7 +27,7 @@ from Moore.lines import Hlt2Line from GaudiKernel.SystemOfUnits import GeV, MeV from RecoConf.reconstruction_objects import make_pvs #from Hlt2Conf.algorithms import ParticleContainersMerger -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from .builders.baryonic_builders import ( make_xim_to_lambda_pi_lll, make_xim_to_lambda_pi_ddl, @@ -73,7 +73,7 @@ def Hlt2RD_XibmToXimMuMu_LLL_Line(name="Hlt2RD_XibmToXimMuMu_LLL_Line", name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -109,7 +109,7 @@ def Hlt2RD_XibmToXimMuMu_DDL_Line(name="Hlt2RD_XibmToXimMuMu_DDL_Line", name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -145,7 +145,7 @@ def Hlt2RD_XibmToXimMuMu_DDD_Line(name="Hlt2RD_XibmToXimMuMu_DDD_Line", name=name, algs=rd_prefilter() + [make_dimuon, xis, xib], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -179,7 +179,7 @@ def Hlt2RD_OmegabmToOmegamMuMu_LLL_Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -215,7 +215,7 @@ def Hlt2RD_OmegabmToOmegamMuMu_DDL_Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -251,7 +251,7 @@ def Hlt2RD_OmegabmToOmegamMuMu_DDD_Line( name=name, algs=rd_prefilter() + [make_dimuon, omegas, omegab], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -279,7 +279,7 @@ def Hlt2RD_XibmToXimEE_LLL_Line(name="Hlt2RD_XibmToXimEE_LLL_Line", name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -309,7 +309,7 @@ def Hlt2RD_XibmToXimEE_DDL_Line(name="Hlt2RD_XibmToXimEE_DDL_Line", name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -339,7 +339,7 @@ def Hlt2RD_XibmToXimEE_DDD_Line(name="Hlt2RD_XibmToXimEE_DDD_Line", name=name, algs=rd_prefilter() + [make_dielectron, xis, xib], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -367,7 +367,7 @@ def Hlt2RD_OmegabmToOmegamEE_LLL_Line(name="Hlt2RD_OmegabmToOmegamEE_LLL_Line", name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -397,7 +397,7 @@ def Hlt2RD_OmegabmToOmegamEE_DDL_Line(name="Hlt2RD_OmegabmToOmegamEE_DDL_Line", name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -427,4 +427,4 @@ def Hlt2RD_OmegabmToOmegamEE_DDD_Line(name="Hlt2RD_OmegabmToOmegamEE_DDD_Line", name=name, algs=rd_prefilter() + [make_dielectron, omegas, omegab], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py index c27e970f7e7..7f2fa4c3d48 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/baryonic_radiative.py @@ -33,7 +33,7 @@ from Hlt2Conf.lines.rd.builders.baryonic_radiative_builders import ( from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_photons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from Moore.config import register_line_builder from Moore.lines import Hlt2Line @@ -91,7 +91,7 @@ def xibtoxigamma_xitolpi_lll_line( name=name, algs=rd_prefilter() + [xim, xibm], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -143,4 +143,4 @@ def obtoomgamma_omtol0k_omtol0k_lll_line( name=name, algs=rd_prefilter() + [omegam, omegabm], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py index 406463ba94d..f4fcf62b846 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/bnv_lines_hlt2.py @@ -41,7 +41,7 @@ from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_pions, make_rd_detached_kaons, make_rd_detached_protons from Hlt2Conf.lines.rd.builders.bnv_builders import make_BToHMu, make_LzToHMu, make_LbToHMu, make_BToLcMu, make_LcToPKPi, make_LbToDsMu, make_DsToKKPi -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from RecoConf.reconstruction_objects import make_pvs @@ -71,7 +71,7 @@ def BToPMu_line(name="Hlt2RD_BToPpMu_Line", prescale=1 / 2.): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -90,7 +90,7 @@ def BToPMu_SS_line(name="Hlt2RD_BToPpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 2) Lz -> pi mu @@ -110,7 +110,7 @@ def LambdaToPiMu_line(name="Hlt2RD_LambdaToPipMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -129,7 +129,7 @@ def LambdaToPiMu_SS_line(name="Hlt2RD_LambdaToPipMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 3) Lz -> K mu @@ -149,7 +149,7 @@ def LambdaToKMu_line(name="Hlt2RD_LambdaToKpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -168,7 +168,7 @@ def LambdaToKMu_SS_line(name="Hlt2RD_LambdaToKpMu_SS_Line", prescale=1 / 2.): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 4) Lb -> pi mu @@ -188,7 +188,7 @@ def LbToPiMu_line(name="Hlt2RD_LbToPipMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -207,7 +207,7 @@ def LbToPiMu_SS_line(name="Hlt2RD_LbToPipMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 5) Lb -> K mu @@ -227,7 +227,7 @@ def LbToKMu_line(name="Hlt2RD_LbToKpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -246,7 +246,7 @@ def LbToKMu_SS_line(name="Hlt2RD_LbToKpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 6) B -> Lc mu @@ -267,7 +267,7 @@ def BToLcMu_line(name="Hlt2RD_BToLcMu_LcToPpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Lambda_c, B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -287,7 +287,7 @@ def BToLcMu_SS_line(name="Hlt2RD_BToLcMu_SS_LcToPpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Lambda_c, B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 7) Lb -> Ds mu @@ -307,7 +307,7 @@ def LbToDsMu_line(name="Hlt2RD_LbToDsMu_DsToKpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Ds, Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -326,4 +326,4 @@ def LbToDsMu_SS_line(name="Hlt2RD_LbToDsMu_SS_DsToKpKmPip_Line", prescale=1): name=name, algs=rd_prefilter() + [Ds, Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py index 9452b49417e..f7894b9f101 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/rd_prefilters.py @@ -56,19 +56,8 @@ def rd_prefilter_noPV(require_GEC=False): return upfront_reconstruction() + gec -def rd_monitors_default(): - """ - Returns default list of variables to monitor ["m", "pt","eta","vchi2","ipchi2"] - """ - return ["m", "pt", "eta", "vchi2", "ipchi2"] - - -def rd_monitors_vrd(): - """ - Returns modified list of variables to monitor ["pt","eta","vchi2","ipchi2"] - """ - return ["pt", "eta", "vchi2", "ipchi2"] - +_RD_MONITORING_VARIABLES = ("m", "pt", "eta", "vchi2", "ipchi2") +_VRD_MONITORING_VARIABLES = ("pt", "eta", "vchi2", "ipchi2") ################# ## END OF FILE ## diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py index 79c47cb109b..5219b3a3a32 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_beauty2xtaul.py @@ -57,7 +57,7 @@ from PyConf import configurable from GaudiKernel.SystemOfUnits import MeV, GeV from Hlt2Conf.lines.rd.builders import beauty2xtaul_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_monitors_default +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES import Functors as F hlt2_lines = {} @@ -103,7 +103,7 @@ def Hlt2_Bd2KstTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -141,7 +141,7 @@ def Hlt2_Bd2KstTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -178,7 +178,7 @@ def Hlt2_Bd2KstTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -215,7 +215,7 @@ def Hlt2_Bd2KstTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -252,7 +252,7 @@ def Hlt2_Bd2KstTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -289,7 +289,7 @@ def Hlt2_Bd2KstTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kst, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## B0 -> phi tau l @@ -315,7 +315,7 @@ def Hlt2_Bd2PhiTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -340,7 +340,7 @@ def Hlt2_Bd2PhiTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -365,7 +365,7 @@ def Hlt2_Bd2PhiTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -390,7 +390,7 @@ def Hlt2_Bd2PhiTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -415,7 +415,7 @@ def Hlt2_Bd2PhiTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -440,7 +440,7 @@ def Hlt2_Bd2PhiTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## B0 -> rho tau l @@ -466,7 +466,7 @@ def Hlt2_Bd2RhoTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -491,7 +491,7 @@ def Hlt2_Bd2RhoTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -516,7 +516,7 @@ def Hlt2_Bd2RhoTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -541,7 +541,7 @@ def Hlt2_Bd2RhoTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -566,7 +566,7 @@ def Hlt2_Bd2RhoTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -591,7 +591,7 @@ def Hlt2_Bd2RhoTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, rho, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## B0 -> eta' tau l @@ -617,7 +617,7 @@ def Hlt2_Bd2EtapTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -642,7 +642,7 @@ def Hlt2_Bd2EtapTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -667,7 +667,7 @@ def Hlt2_Bd2EtapTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -692,7 +692,7 @@ def Hlt2_Bd2EtapTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -717,7 +717,7 @@ def Hlt2_Bd2EtapTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -742,7 +742,7 @@ def Hlt2_Bd2EtapTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## Bu -> K+ tau l @@ -769,7 +769,7 @@ def Hlt2_Bu2KplusTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -795,7 +795,7 @@ def Hlt2_Bu2KplusTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -820,7 +820,7 @@ def Hlt2_Bu2KplusTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -845,7 +845,7 @@ def Hlt2_Bu2KplusTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -870,7 +870,7 @@ def Hlt2_Bu2KplusTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -895,7 +895,7 @@ def Hlt2_Bu2KplusTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, kaon, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## Bu -> K1(1270)+ tau l @@ -921,7 +921,7 @@ def Hlt2_Bu2K1plusTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -946,7 +946,7 @@ def Hlt2_Bu2K1plusTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -971,7 +971,7 @@ def Hlt2_Bu2K1plusTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -996,7 +996,7 @@ def Hlt2_Bu2K1plusTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1021,7 +1021,7 @@ def Hlt2_Bu2K1plusTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1046,7 +1046,7 @@ def Hlt2_Bu2K1plusTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, k1, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## Bs -> phi tau l @@ -1072,7 +1072,7 @@ def Hlt2_Bs2PhiTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1097,7 +1097,7 @@ def Hlt2_Bs2PhiTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1122,7 +1122,7 @@ def Hlt2_Bs2PhiTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1147,7 +1147,7 @@ def Hlt2_Bs2PhiTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1172,7 +1172,7 @@ def Hlt2_Bs2PhiTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1197,7 +1197,7 @@ def Hlt2_Bs2PhiTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, phi, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## Bs -> eta' tau l @@ -1223,7 +1223,7 @@ def Hlt2_Bs2EtapTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1248,7 +1248,7 @@ def Hlt2_Bs2EtapTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1273,7 +1273,7 @@ def Hlt2_Bs2EtapTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1298,7 +1298,7 @@ def Hlt2_Bs2EtapTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1323,7 +1323,7 @@ def Hlt2_Bs2EtapTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1348,7 +1348,7 @@ def Hlt2_Bs2EtapTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, etap, b2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## Lb -> K p tau l @@ -1373,7 +1373,7 @@ def Hlt2_Lambdab2KpTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1397,7 +1397,7 @@ def Hlt2_Lambdab2KpTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1421,7 +1421,7 @@ def Hlt2_Lambdab2KpTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1445,7 +1445,7 @@ def Hlt2_Lambdab2KpTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1469,7 +1469,7 @@ def Hlt2_Lambdab2KpTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1493,7 +1493,7 @@ def Hlt2_Lambdab2KpTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lst, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) ## Lambda_b -> Lambda tau l @@ -1520,7 +1520,7 @@ def Hlt2_Lambdab2LambdaTauTau_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1546,7 +1546,7 @@ def Hlt2_Lambdab2LambdaTauTau_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1572,7 +1572,7 @@ def Hlt2_Lambdab2LambdaTauMu_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1598,7 +1598,7 @@ def Hlt2_Lambdab2LambdaTauMu_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1624,7 +1624,7 @@ def Hlt2_Lambdab2LambdaTauE_OS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(hlt2_lines) @@ -1650,4 +1650,4 @@ def Hlt2_Lambdab2LambdaTauE_SS_ExclusiveLine( prescale=prescale, persistreco=persistreco, algs=rd_prefilter() + [dilepton, lambda0, lb2xtaul], - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py index 33b296cba22..a140671872f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btosmutau_exclusive.py @@ -61,7 +61,7 @@ from Hlt2Conf.algorithms_thor import require_all from Hlt2Conf.lines.rd.builders import rdbuilder_thor from Hlt2Conf.lines.rd.builders import btosmutau_exclusive -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES all_lines = {} @@ -189,7 +189,7 @@ def bstophimutau_tautomu_line(name='Hlt2RD_BsToKKTauMu_TauToMu_Line', name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -217,7 +217,7 @@ def bstophimutau_tautomu_same_sign_kaons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -245,7 +245,7 @@ def bstophimutau_tautomu_same_sign_kaons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -269,7 +269,7 @@ def bstophimutau_tautomu_same_sign_muons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -291,7 +291,7 @@ def bstophimutau_tautomu_fakemuon_from_tau_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -319,7 +319,7 @@ def bstophimutau_tautomu_fakemuon_from_b_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -345,7 +345,7 @@ def bstophimutau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -366,7 +366,7 @@ def lbtopkmutau_tautomu_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -387,7 +387,7 @@ def lbtopkmutau_tautomu_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -417,7 +417,7 @@ def lbtopkmutau_tautomu_same_sign_pk_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -447,7 +447,7 @@ def lbtopkmutau_tautomu_same_sign_pk_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -472,7 +472,7 @@ def lbtopkmutau_tautomu_same_sign_muons_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -497,7 +497,7 @@ def lbtopkmutau_tautomu_same_sign_muons_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -523,7 +523,7 @@ def lbtopkmutau_tautomu_fakemuon_from_tau_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -549,7 +549,7 @@ def lbtopkmutau_tautomu_fakemuon_from_tau_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -581,7 +581,7 @@ def lbtopkmutau_tautomu_fakemuon_from_b_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -613,7 +613,7 @@ def lbtopkmutau_tautomu_fakemuon_from_b_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -644,7 +644,7 @@ def lbtopkmutau_tautomu_fakeproton_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -675,7 +675,7 @@ def lbtopkmutau_tautomu_fakeproton_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -705,7 +705,7 @@ def lbtopkmutau_tautomu_fakekaon_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -735,7 +735,7 @@ def lbtopkmutau_tautomu_fakekaon_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -756,7 +756,7 @@ def bdtokstmutau_tautomu_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -777,7 +777,7 @@ def bdtokstmutau_tautomu_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -807,7 +807,7 @@ def bdtokstmutau_tautomu_same_sign_kpi_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -837,7 +837,7 @@ def bdtokstmutau_tautomu_same_sign_kpi_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -862,7 +862,7 @@ def bdtokstmutau_tautomu_same_sign_muons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -887,7 +887,7 @@ def bdtokstmutau_tautomu_same_sign_muons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -913,7 +913,7 @@ def bdtokstmutau_tautomu_fakemuon_from_tau_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -939,7 +939,7 @@ def bdtokstmutau_tautomu_fakemuon_from_tau_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -971,7 +971,7 @@ def bdtokstmutau_tautomu_fakemuon_from_b_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1003,7 +1003,7 @@ def bdtokstmutau_tautomu_fakemuon_from_b_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1034,7 +1034,7 @@ def bdtokstmutau_tautomu_fakekaon_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1065,7 +1065,7 @@ def bdtokstmutau_tautomu_fakekaon_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1095,7 +1095,7 @@ def bdtokstmutau_tautomu_fakepion_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1125,7 +1125,7 @@ def bdtokstmutau_tautomu_fakepion_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1144,7 +1144,7 @@ def butokmutau_tautomu_oskmu_line(name='Hlt2RD_BuToKTauMu_TauToMu_OSKmu_Line', name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1163,7 +1163,7 @@ def butokmutau_tautomu_sskmu_line(name='Hlt2RD_BuToKTauMu_TauToMu_SSKmu_Line', name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1186,7 +1186,7 @@ def butokmutau_tautomu_same_sign_muons_oskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1209,7 +1209,7 @@ def butokmutau_tautomu_same_sign_muons_sskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1234,7 +1234,7 @@ def butokmutau_tautomu_fakemuon_from_tau_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1259,7 +1259,7 @@ def butokmutau_tautomu_fakemuon_from_tau_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1289,7 +1289,7 @@ def butokmutau_tautomu_fakemuon_from_b_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1319,7 +1319,7 @@ def butokmutau_tautomu_fakemuon_from_b_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1347,7 +1347,7 @@ def butokmutau_tautomu_fakekaon_oskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -1375,4 +1375,4 @@ def butokmutau_tautomu_fakekaon_sskmu_line( name=name, algs=rd_prefilter() + [kmus, bu], prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py index 232c8c27ade..6a7528caec9 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/hlt2_btostautau_exclusive.py @@ -59,7 +59,7 @@ from Hlt2Conf.algorithms_thor import require_all from Hlt2Conf.lines.rd.builders import rdbuilder_thor from Hlt2Conf.lines.rd.builders import btostautau_exclusive -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES all_lines = {} @@ -160,7 +160,7 @@ def bstophitautau_tautomu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -183,7 +183,7 @@ def bstophitautau_tautomu_same_sign_kaons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -206,7 +206,7 @@ def bstophitautau_tautomu_same_sign_muons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -228,7 +228,7 @@ def bstophitautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -250,7 +250,7 @@ def bstophitautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -268,7 +268,7 @@ def lbtopktautau_tautomu_line(name='Hlt2RD_LbToPKTauTau_TauToMu_Line', name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -292,7 +292,7 @@ def lbtopktautau_tautomu_same_sign_pK_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -316,7 +316,7 @@ def lbtopktautau_tautomu_same_sign_muons_sspmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -340,7 +340,7 @@ def lbtopktautau_tautomu_same_sign_muons_ospmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -362,7 +362,7 @@ def lbtopktautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -383,7 +383,7 @@ def lbtopktautau_tautomu_fakeproton_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -403,7 +403,7 @@ def lbtopktautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -421,7 +421,7 @@ def bdtoksttautau_tautomu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -445,7 +445,7 @@ def bdtoksttautau_tautomu_same_sign_Kpi_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -470,7 +470,7 @@ def bdtoksttautau_tautomu_same_sign_muons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -495,7 +495,7 @@ def bdtoksttautau_tautomu_same_sign_muons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -518,7 +518,7 @@ def bdtoksttautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -540,7 +540,7 @@ def bdtoksttautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -561,7 +561,7 @@ def bdtoksttautau_tautomu_fakepion_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -584,7 +584,7 @@ def bstokstksttautau_tautomu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -613,7 +613,7 @@ def bstokstksttautau_tautomu_same_sign_kstar_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -646,7 +646,7 @@ def bstokstksttautau_tautomu_same_sign_muons_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -674,7 +674,7 @@ def bstokstksttautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -690,7 +690,7 @@ def butoktautau_tautomu_line(name='Hlt2RD_BuToKTauTau_TauToMu_Line', name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -712,7 +712,7 @@ def butoktautau_tautomu_same_sign_muons_oskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -734,7 +734,7 @@ def butoktautau_tautomu_same_sign_muons_sskmu_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -754,7 +754,7 @@ def butoktautau_tautomu_fakemuon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -772,4 +772,4 @@ def butoktautau_tautomu_fakekaon_line( name=name, algs=algs, prescale=prescale, - monitoring_variables=rd_monitors_default()) + monitoring_variables=_RD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py index 4b0caef54f7..3bf2202b802 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/lfv_lines_hlt2.py @@ -38,7 +38,7 @@ from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_pions, make_rd_detached_kaons, make_rd_detached_protons from Hlt2Conf.lines.rd.builders.bnv_builders import make_BToHMu, make_LzToHMu, make_LbToHMu -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from RecoConf.reconstruction_objects import make_pvs @@ -68,7 +68,7 @@ def BToPiMu_line(name="Hlt2RD_BToPipMu_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -87,7 +87,7 @@ def BToPiMu_SS_line(name="Hlt2RD_BToPipMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 2) Bs -> K mu @@ -107,7 +107,7 @@ def BToKMu_line(name="Hlt2RD_BToKpMu_Line", prescale=1 / 2.): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -126,7 +126,7 @@ def BToKMu_SS_line(name="Hlt2RD_BToKpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [B], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 3) Lz -> p mu @@ -146,7 +146,7 @@ def LzToPMu_line(name="Hlt2RD_LambdaToPpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -165,7 +165,7 @@ def LzToPMu_SS_line(name="Hlt2RD_LambdaToPpMu_SS_Line", prescale=1 / 3.): name=name, algs=rd_prefilter() + [Lz], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) # 4) Lb -> p mu @@ -185,7 +185,7 @@ def LbToPMu_line(name="Hlt2RD_LbToPpMu_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -204,4 +204,4 @@ def LbToPMu_SS_line(name="Hlt2RD_LbToPpMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [Lb], prescale=prescale, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py index 5c44ab0bbdb..7639da961e2 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/omega_rare_decay_lines.py @@ -27,7 +27,7 @@ from Moore.config import register_line_builder from Moore.lines import Hlt2Line from GaudiKernel.SystemOfUnits import MeV from RecoConf.reconstruction_objects import make_pvs -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from .builders.rdbuilder_thor import make_rd_detached_muons, make_rd_detached_electrons, make_rd_detached_pions, make_rd_photons from .builders.omega_rare_decay_builder import make_xim_to_lambda_pim_lll, make_omega_to_xi_dip, make_omega_to_xi_gamma @@ -54,7 +54,7 @@ def omega_to_ximumu_lll_line(name="Hlt2RD_OmegamToXimMuMu_LLL_Line", name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -76,7 +76,7 @@ def omega_to_xiee_lll_line(name="Hlt2RD_OmegamToXimEE_LLL_Line", prescale=1): name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -99,7 +99,7 @@ def omega_to_xipipi_lll_line(name="Hlt2RD_OmegamToXimPiPi_LLL_Line", name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -120,4 +120,4 @@ def omega_to_xigamma_lll_line(name="Hlt2RD_OmegamToXimGamma_LLL_Line", name=name, prescale=prescale, algs=rd_prefilter() + [xim, omega], - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py index db5cf264112..82658dc43c8 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/prompt_multilepton.py @@ -36,7 +36,7 @@ from Moore.config import HltLine, register_line_builder from Hlt2Conf.algorithms_thor import require_all import Functors as F from .builders.prompt_multilepton_builders import make_prompt_four_muon, make_prompt_3mue, make_prompt_2mu2e, make_prompt_2muSS2eSS, make_prompt_mue2e, make_prompt_2e2e, make_psi2S_tag -from .builders.rd_prefilters import rd_prefilter_noPV, rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter_noPV, rd_prefilter, _VRD_MONITORING_VARIABLES all_lines = {} @@ -64,7 +64,7 @@ def Hlt2RD_JpsiTo4Mu_Line(name="Hlt2RD_JpsiTo4Mu_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -95,7 +95,7 @@ def Hlt2RD_UpsilonTo4Mu_Line(name="Hlt2RD_UpsilonTo4Mu_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -128,7 +128,7 @@ def Hlt2RD_LowMassTo4Mu_Line(name="Hlt2RD_LowMassTo4Mu_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -159,7 +159,7 @@ def Hlt2RD_JpsiTo3MuE_Line(name="Hlt2RD_JpsiTo3MuE_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -191,7 +191,7 @@ def Hlt2RD_UpsilonTo3MuE_Line(name="Hlt2RD_UpsilonTo3MuE_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -220,7 +220,7 @@ def Hlt2RD_LowMassTo3MuE_Line(name="Hlt2RD_LowMassTo3MuE_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -251,7 +251,7 @@ def Hlt2RD_JpsiTo2Mu2E_Line(name="Hlt2RD_JpsiTo2Mu2E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -280,7 +280,7 @@ def Hlt2RD_UpsilonTo2Mu2E_Line(name="Hlt2RD_UpsilonTo2Mu2E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -309,7 +309,7 @@ def Hlt2RD_LowMassTo2Mu2E_Line(name="Hlt2RD_LowMassTo2Mu2E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -340,7 +340,7 @@ def Hlt2RD_JpsiTo2Mup2Em_Line(name="Hlt2RD_JpsiTo2Mup2Em_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -369,7 +369,7 @@ def Hlt2RD_UpsilonTo2Mup2Em_Line(name="Hlt2RD_UpsilonTo2Mup2Em_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -400,7 +400,7 @@ def Hlt2RD_LowMassTo2Mup2Em_Line(name="Hlt2RD_LowMassTo2Mup2Em_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -433,7 +433,7 @@ def Hlt2RD_JpsiToMu3E_Line(name="Hlt2RD_JpsiToMu3E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -463,7 +463,7 @@ def Hlt2RD_UpsilonToMu3E_Line(name="Hlt2RD_UpsilonToMu3E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -495,7 +495,7 @@ def Hlt2RD_LowMassToMu3E_Line(name="Hlt2RD_LowMassToMu3E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -529,7 +529,7 @@ def Hlt2RD_JpsiTo4E_Line(name="Hlt2RD_JpsiTo4E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -559,7 +559,7 @@ def Hlt2RD_UpsilonTo4E_Line(name="Hlt2RD_UpsilonTo4E_Line", algs=rd_prefilter_noPV() + [fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -593,7 +593,7 @@ def Hlt2RD_LowMassTo4E_Line(name="Hlt2RD_LowMassTo4E_Line", algs=rd_prefilter() + [fourlepton], #here we do require a PV persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -629,7 +629,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo4Mu_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -661,7 +661,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo2Mu2E_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -688,7 +688,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo3MuE_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -714,7 +714,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo2Mup2Em_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -739,7 +739,7 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiToMu3E_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) @@ -764,5 +764,5 @@ def Hlt2RD_Psi2SToJpsiPiPi_JpsiTo4E_Line( algs=rd_prefilter_noPV() + [jpsis, fourlepton], persistreco=persistreco, prescale=prescale, - monitoring_variables=rd_monitors_vrd(), + monitoring_variables=_VRD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py index 55373dd0e5f..0137c932b3a 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/qqbar_to_ll.py @@ -31,7 +31,7 @@ from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line from Hlt2Conf.lines.rd.builders.rdbuilder_thor import make_rd_detached_mue, make_rd_prompt_mue, make_rd_prompt_dielectrons #make_rd_prompt_dimuons -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from Hlt2Conf.algorithms_thor import require_all import Functors as F @@ -60,7 +60,7 @@ def phi_to_mue_line(name="Hlt2RD_PhiToMuE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -80,7 +80,7 @@ def phi_to_mue_ss_line(name="Hlt2RD_PhiToMuE_SS_Line", algs=rd_prefilter() + [emu_SS], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -102,7 +102,7 @@ def jpsi_to_mue_line(name="Hlt2RD_JpsiToMuE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -125,7 +125,7 @@ def jpsi_to_mue_ss_line(name="Hlt2RD_JpsiToMuE_SS_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -148,7 +148,7 @@ def upsilon_to_mue_line(name="Hlt2RD_UpsilonToMuE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -171,7 +171,7 @@ def upsilon_to_mue_ss_line(name="Hlt2RD_UpsilonToMuE_SS_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) ##### DETACHED LINES ##### @@ -202,7 +202,7 @@ def phi_to_mue_detached_line(name="Hlt2RD_PhiToMuE_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -230,7 +230,7 @@ def phi_to_mue_ss_detached_line(name="Hlt2RD_PhiToMuE_SS_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -258,7 +258,7 @@ def jpsi_to_mue_detached_line(name="Hlt2RD_JpsiToMuE_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -286,7 +286,7 @@ def jpsi_to_mue_ss_detached_line(name="Hlt2RD_JpsiToMuE_SS_Detached_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) ##### CONTROL ee LINES ##### @@ -310,7 +310,7 @@ def phi_to_ee_line(name="Hlt2RD_PhiToEE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -331,7 +331,7 @@ def jpsi_to_ee_line(name="Hlt2RD_JpsiToEE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -352,7 +352,7 @@ def upsilon_to_ee_line(name="Hlt2RD_UpsilonToEE_Line", algs=rd_prefilter() + [emu], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) ################# diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py index 5be47d1bf4a..e7a7317107f 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rad_incl.py @@ -116,7 +116,7 @@ def BToHHGamma_Incl_line(name="Hlt2RD_BToHHGamma_Incl_Line", algs=rd_prefilters.rd_prefilter() + [kstars, b], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_prefilters.rd_monitors_default(), + monitoring_variables=rd_prefilters._RD_MONITORING_VARIABLES, ) @@ -203,7 +203,7 @@ def BToHHHGamma_Incl_line(name="Hlt2RD_BToHHHGamma_Incl_Line", algs=rd_prefilters.rd_prefilter() + [kstars, dstars, b], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_prefilters.rd_monitors_default(), + monitoring_variables=rd_prefilters._RD_MONITORING_VARIABLES, ) @@ -260,7 +260,7 @@ def BToHHGamma_GammaToEE_Incl_line( algs=rd_prefilters.rd_prefilter() + [kstars, b], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_prefilters.rd_monitors_default(), + monitoring_variables=rd_prefilters._RD_MONITORING_VARIABLES, ) @@ -353,5 +353,5 @@ def BToHHHGamma_GammaToEE_Incl_line( algs=rd_prefilters.rd_prefilter() + [kstars, dstars, b], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_prefilters.rd_monitors_default(), + monitoring_variables=rd_prefilters._RD_MONITORING_VARIABLES, ) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py index 2923b2f0c81..9648cfa3380 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/rare_tau_decay_lines.py @@ -34,7 +34,7 @@ from PyConf import configurable from Moore.config import register_line_builder from Moore.lines import Hlt2Line from Hlt2Conf.algorithms import ParticleContainersMerger -from .builders.rd_prefilters import rd_prefilter, rd_monitors_vrd +from .builders.rd_prefilters import rd_prefilter, _VRD_MONITORING_VARIABLES from .builders.rdbuilder_thor import ( make_rd_detached_muons, make_rd_detached_electrons, make_rd_detached_pions, make_rd_has_rich_detached_protons, make_rd_detached_phis, @@ -61,7 +61,7 @@ def tau_to_mumumu_line(name="Hlt2RD_TauToMuMuMu_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -91,7 +91,7 @@ def tau_to_mumue_line(name="Hlt2RD_TauToMuMuE_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -121,7 +121,7 @@ def tau_to_muee_line(name="Hlt2RD_TauToMuEE_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -141,7 +141,7 @@ def tau_to_eee_line(name="Hlt2RD_TauToEEE_Line", prescale=1, algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -171,7 +171,7 @@ def tau_to_pmumu_line(name="Hlt2RD_TauToPMuMu_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -195,7 +195,7 @@ def tau_to_phimu_line(name="Hlt2RD_TauToPhiMu_Line", algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -216,7 +216,7 @@ def tau_to_5mu_line(name="Hlt2RD_TauTo5Mu_Line", prescale=1, algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -237,7 +237,7 @@ def tau_to_7mu_line(name="Hlt2RD_TauTo7Mu_Line", prescale=1, algs=rd_prefilter() + [tau], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -265,7 +265,7 @@ def ds_to_phipi_mumu_line(name="Hlt2RD_DsToPhiPi_PhiToMuMu_Line", algs=rd_prefilter() + [ds], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) @register_line_builder(all_lines) @@ -293,4 +293,4 @@ def ds_to_phipi_ee_line(name="Hlt2RD_DsToPhiPi_PhiToEE_Line", algs=rd_prefilter() + [ds], prescale=prescale, persistreco=persistreco, - monitoring_variables=rd_monitors_vrd()) + monitoring_variables=_VRD_MONITORING_VARIABLES) diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py index 9fdb03b7b08..7e526dab341 100644 --- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py +++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/strange.py @@ -19,7 +19,7 @@ TODO: - Replace PID variables by ProbNN once we have a proper tuning """ from GaudiKernel.SystemOfUnits import MeV -from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, rd_monitors_default +from Hlt2Conf.lines.rd.builders.rd_prefilters import rd_prefilter, _RD_MONITORING_VARIABLES from Hlt2Conf.lines.rd.builders import strange_builders from Moore.config import register_line_builder from Moore.lines import Hlt2Line @@ -44,7 +44,7 @@ def ks02pipi_line(name="Hlt2RD_KS0ToPiPi_Line", prescale=1e-4): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -61,7 +61,7 @@ def ks02mumu_line(name="Hlt2RD_KS0ToMuMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -91,7 +91,7 @@ def ks02mumu_sb_line(name="Hlt2RD_KS0ToMuMu_SB_Line", prescale=1e-4): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -113,7 +113,7 @@ def ks02mumu_ss_line(name="Hlt2RD_KS0ToMuMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -132,7 +132,7 @@ def ks02emu_line(name="Hlt2RD_KS0ToEMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -155,7 +155,7 @@ def ks02emu_ss_line(name="Hlt2RD_KS0ToEMu_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -178,7 +178,7 @@ def ks02ee_line(name="Hlt2RD_KS0ToEE_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [ks0], - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -205,7 +205,7 @@ def ks02ee_ss_line(name="Hlt2RD_KS0ToEE_SS_Line", prescale=1): name=name, algs=rd_prefilter() + [ks0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -224,7 +224,7 @@ def lambda02ppi_line(name="Hlt2RD_Lambda0ToPPi_Line", prescale=1e-3): name=name, algs=rd_prefilter() + [l0], prescale=prescale, - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -242,7 +242,7 @@ def lambda02pmu_line(name="Hlt2RD_Lambda0ToPMu_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [l0], - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) @@ -260,5 +260,5 @@ def lambda02pe_line(name="Hlt2RD_Lambda0ToPE_Line"): return Hlt2Line( name=name, algs=rd_prefilter() + [l0], - monitoring_variables=rd_monitors_default(), + monitoring_variables=_RD_MONITORING_VARIABLES, ) diff --git a/Hlt/Moore/python/Moore/lines.py b/Hlt/Moore/python/Moore/lines.py index 6c8a1f01870..043e2acd9c9 100644 --- a/Hlt/Moore/python/Moore/lines.py +++ b/Hlt/Moore/python/Moore/lines.py @@ -272,7 +272,7 @@ class Hlt2Line(DecisionLine): HLT1 filter that is prepended to the control flow defined by `algs`. ThOr DECREPORTS_RE_FILTER is used. Note that this parameter should look like "['Hlt1LineADecision', 'Hlt1.*LineDecision']". - monitoring_variables (list(str)): Variables to create default monitoring plots for. + monitoring_variables (tuple(str)): Variables to create default monitoring plots for. These variables need to be implemented in .monitoring.py """ _CLASS_NAME_PREFIX = "Hlt2" @@ -287,7 +287,7 @@ class Hlt2Line(DecisionLine): extra_outputs=None, persistreco=False, hlt1_filter_code="", - monitoring_variables=["pt", "eta", "m", "vchi2", "ipchi2"], + monitoring_variables=("pt", "eta", "m", "vchi2", "ipchi2"), ): self.hlt1_filter_code = hlt1_filter_code if hlt1_filter_code: diff --git a/Hlt/Moore/python/Moore/monitoring.py b/Hlt/Moore/python/Moore/monitoring.py index f54f21331d3..f729f07bb6c 100644 --- a/Hlt/Moore/python/Moore/monitoring.py +++ b/Hlt/Moore/python/Moore/monitoring.py @@ -29,7 +29,7 @@ def monitoring(algs, name, mon_vars): Args: algs (list of Algorithms): Control flow of this line. name (str): Name of the calling line. - monitoring_variables (list(str)): Variables to create default monitoring plots for. + monitoring_variables (tuple(str)): Variables to create default monitoring plots for. These variables need to be implemented in .monitoring.py Returns: @@ -124,60 +124,65 @@ def monitoring(algs, name, mon_vars): mass_functor_dict = {"functor": F.MASS, "regex": r"MASS"} return mass_functor_dict - # pt - if "pt" in mon_vars: - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_pt", - Input=producer_output, - Variable=F.PT, - HistogramName="/" + name + "/pt", - Bins=80, - Range=_parse_all(r"\( RHO_COORDINATE @ THREEMOMENTUM \)", 0., - 40. * GeV))) - # eta - if "eta" in mon_vars: - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_eta", - Input=producer_output, - Variable=F.ETA, - HistogramName="/" + name + "/eta", - Bins=40, - Range=(1.5, 5.5))) - # mass - if "m" in mon_vars: - mass_functor = _parse_mass_functor() - #TODO: parse decay descriptor to set defaults in _parse_all. Might need https://gitlab.cern.ch/lhcb/Moore/-/issues/289 - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_m", - Input=producer_output, - Variable=mass_functor["functor"], - HistogramName="/" + name + "/m", - Bins=100, - Range=_parse_all(mass_functor["regex"], 0., 7. * GeV))) - # vertex chi2 - if "vchi2" in mon_vars: - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_vchi2", - Input=producer_output, - Variable=F.CHI2DOF, - HistogramName="/" + name + "/vchi2", - Bins=64, - Range=_parse_all("CHI2DOF", 0., 32.))) - # ip chi2 - if "ipchi2" in mon_vars: - monitoring_algs.append( - Monitor( - name="Monitor_" + name + "_ipchi2", - Input=producer_output, - Variable=F.BPVIPCHI2(make_pvs()), - HistogramName="/" + name + "/ipchi2", - Bins=64, - # to not spell out BPVIPCHI2.bind( TES(DataHandles=[DataHandle('/Event/TrackBeamLineVertexFinderSoA/OutputVertices')], DataTypes=['LHCb::Event::PV::PrimaryVertexContainer']), FORWARDARGS ) - # *? matches the previous token between zero and unlimited times, as few times as possible, expanding as needed (lazy) - Range=_parse_all(r"BPVIPCHI2.*? FORWARDARGS \)", 0., 1000.))) + for mon_var in mon_vars: + # pt + if mon_var.lower() == "pt": + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_pt", + Input=producer_output, + Variable=F.PT, + HistogramName="/" + name + "/pt", + Bins=80, + Range=_parse_all(r"\( RHO_COORDINATE @ THREEMOMENTUM \)", + 0., 40. * GeV))) + # eta + elif mon_var.lower() == "eta": + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_eta", + Input=producer_output, + Variable=F.ETA, + HistogramName="/" + name + "/eta", + Bins=40, + Range=(1.5, 5.5))) + # mass + elif mon_var.lower() == "m": + mass_functor = _parse_mass_functor() + #TODO: parse decay descriptor to set defaults in _parse_all. Might need https://gitlab.cern.ch/lhcb/Moore/-/issues/289 + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_m", + Input=producer_output, + Variable=mass_functor["functor"], + HistogramName="/" + name + "/m", + Bins=100, + Range=_parse_all(mass_functor["regex"], 0., 7. * GeV))) + # vertex chi2 + elif mon_var.lower() == "vchi2": + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_vchi2", + Input=producer_output, + Variable=F.CHI2DOF, + HistogramName="/" + name + "/vchi2", + Bins=64, + Range=_parse_all("CHI2DOF", 0., 32.))) + # ip chi2 + elif mon_var.lower() == "ipchi2": + monitoring_algs.append( + Monitor( + name="Monitor_" + name + "_ipchi2", + Input=producer_output, + Variable=F.BPVIPCHI2(make_pvs()), + HistogramName="/" + name + "/ipchi2", + Bins=64, + # to not spell out BPVIPCHI2.bind( TES(DataHandles=[DataHandle('/Event/TrackBeamLineVertexFinderSoA/OutputVertices')], DataTypes=['LHCb::Event::PV::PrimaryVertexContainer']), FORWARDARGS ) + # *? matches the previous token between zero and unlimited times, as few times as possible, expanding as needed (lazy) + Range=_parse_all(r"BPVIPCHI2.*? FORWARDARGS \)", 0., + 1000.))) + else: + raise ValueError( + f"{mon_var} is not a supported default monitoring histogram") return monitoring_algs diff --git a/doc/tutorials/hlt2_line.rst b/doc/tutorials/hlt2_line.rst index 9150433ec23..d797c99c5d5 100644 --- a/doc/tutorials/hlt2_line.rst +++ b/doc/tutorials/hlt2_line.rst @@ -865,12 +865,12 @@ If you choose to not configure any monitoring, a set of default monitors will ru This means that every Hlt2 line will fill, currently 5 histograms by default (|pT|, :math:`\eta`, mass, vertex :math:`\chi^2` and |chi2ip| w.r.t. the "best" PV). These default monitors can be configured individually for your line by passing a list -other than `["pt", "eta", "m", "vchi2", "ipchi2"]` as `monitoring_variables` to your +other than `("pt", "eta", "m", "vchi2", "ipchi2")` as `monitoring_variables` to your ``Hlt2Line`` instance. Any new variables need to be defined in `monitoring.py <https://gitlab.cern.ch/lhcb/Moore/-/blob/master/Hlt/Moore/python/Moore/monitoring.py>`_. -For switching off the default monitors for a line entirely, simply pass an empty list: -(``Hlt2Line(name=..., algs=[...], monitoring_variables=[], ...)``). +For switching off the default monitors for a line entirely, simply pass an empty tuple: +(``Hlt2Line(name=..., algs=[...], monitoring_variables=(), ...)``). Default monitoring can also be switched off globally with .. code-block:: python -- GitLab