Merge branch 'lugrazet-qee-spruce-cleanup' into 'master'

[QEE] Sprucing lines to filter on relevant hlt2 lines

See merge request !2397

Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/high_mass_dielec.py

@@ -71,9 +71,7 @@ def make_dielec_novxt(input_elecs, decaydescriptor, min_mass=40. * GeV):
 def z_to_e_e_line(name='Hlt2QEE_ZToEE', prescale=1, persistreco=True):
     """Z0 boson decay to two elecs line"""
 
-    elecs = elec_filter_for_Z(
-        make_long_electrons_with_brem(), min_pt=15. * GeV)
-    z02ee = make_dielec_novxt(elecs, "Z0 -> e+ e-", min_mass=40. * GeV)
+    z02ee = make_Zee_cand()
 
     return Hlt2Line(
         name=name,
@@ -91,9 +89,7 @@ def same_sign_dielec_line(name='Hlt2QEE_DiElectronSameSign',
                           persistreco=True):
     """Z0 boson decay to two same-sign elecs line"""
 
-    elecs = elec_filter_for_Z(
-        make_long_electrons_with_brem(), min_pt=15. * GeV)
-    eess = make_dielec_novxt(elecs, "[Z0 -> e- e-]cc", min_mass=40. * GeV)
+    eess = make_Zeess_cand()
 
     return Hlt2Line(
         name=name,

Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/qee_builders.py

@@ -18,7 +18,7 @@ from GaudiKernel.SystemOfUnits import GeV
 from PyConf import configurable
 
 from Hlt2Conf.algorithms_thor import ParticleFilter, ParticleCombiner
-from Hlt2Conf.standard_particles import make_ismuon_long_muon
+from Hlt2Conf.standard_particles import make_ismuon_long_muon, make_long_muons
 from Hlt2Conf.standard_particles import make_long_electrons_with_brem, make_down_electrons_no_brem
 from Hlt2Conf.standard_jets import make_pf_particles, build_jets, tag_jets
 from Hlt2Conf.lines.jets.topobits import make_topo_2body
@@ -28,11 +28,11 @@ from Hlt2Conf.lines.qee.high_mass_dielec import make_dielec_novxt
 
 
 @configurable
-def muon_filter(min_pt=0. * GeV):
+def muon_filter(min_pt=0. * GeV, require_muID=True):
     #A muon filter: PT
 
     code = (F.PT > min_pt)
-    particles = make_ismuon_long_muon()
+    particles = make_ismuon_long_muon() if require_muID else make_long_muons()
 
     return ParticleFilter(particles, F.FILTER(code))
 

Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/single_high_pt_muon.py

@@ -30,11 +30,18 @@ from Hlt2Conf.standard_jets import make_onlytrack_particleflow
 
 all_lines = {}
 
+threshold_map = {
+    "standard": 15. * GeV,
+    "prescale": 10. * GeV,
+    "iso": 12.5 * GeV,
+    "nomuid": 15. * GeV,
+}
+
 
 @configurable
 def make_highpt_muons(name='HighPtMuonMaker_{hash}_{hash}',
                       muons=make_ismuon_long_muon,
-                      min_muon_pt=15. * GeV):
+                      min_muon_pt=threshold_map["standard"]):
 
     code = F.require_all(F.PT > min_muon_pt)
     return ParticleFilter(muons(), F.FILTER(code), name=name)
@@ -43,7 +50,7 @@ def make_highpt_muons(name='HighPtMuonMaker_{hash}_{hash}',
 @configurable
 def make_isolated_muons(high_pt_muons,
                         name='HighPtIsolatedMuonMaker_{hash}',
-                        max_cone_pt=10.0 * GeV,
+                        max_cone_pt=10. * GeV,
                         pflow_output=make_onlytrack_particleflow):
 
     ftAlg = WeightedRelTableAlg(
@@ -70,7 +77,7 @@ def single_muon_highpt_line(name='Hlt2QEE_SingleHighPtMuon',
                             persistreco=True):
     """High PT single muon line"""
 
-    high_pt_muons = make_highpt_muons(min_muon_pt=15. * GeV)
+    high_pt_muons = make_highpt_muons(min_muon_pt=threshold_map["standard"])
 
     return Hlt2Line(
         name=name,
@@ -88,7 +95,7 @@ def single_muon_highpt_prescale_line(name='Hlt2QEE_SingleHighPtMuonPrescale',
                                      persistreco=True):
     """High PT single muon line with lower pT threshold, prescaled to reduce the rate."""
 
-    high_pt_muons = make_highpt_muons(min_muon_pt=10. * GeV)
+    high_pt_muons = make_highpt_muons(min_muon_pt=threshold_map["prescale"])
 
     return Hlt2Line(
         name=name,
@@ -108,7 +115,7 @@ def single_muon_highpt_iso_line(name='Hlt2QEE_SingleHighPtMuonIso',
     Make PT cut first to drastically reduce number of times isolation algorithm is called."""
 
     high_pt_muons = make_highpt_muons(
-        min_muon_pt=12.5 * GeV, name="HighPtMuonMakerForIso")
+        min_muon_pt=threshold_map["iso"], name="HighPtMuonMakerForIso")
     high_pt_isolated_muons = make_isolated_muons(
         high_pt_muons, pflow_output=make_onlytrack_particleflow)
 
@@ -130,7 +137,7 @@ def single_muon_highpt_nomuid_line(name='Hlt2QEE_SingleHighPtMuonNoMuID',
     . Prescale required to control the rate."""
 
     high_pt_nomuid_muons = make_highpt_muons(
-        muons=make_long_muons, min_muon_pt=15. * GeV)
+        muons=make_long_muons, min_muon_pt=threshold_map["nomuid"])
 
     return Hlt2Line(
         name=name,

Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/spruce_qee.py

@@ -18,7 +18,7 @@ from Moore.config import register_line_builder, SpruceLine
 
 from RecoConf.reconstruction_objects import make_pvs, upfront_reconstruction
 from RecoConf.event_filters import require_pvs
-from GaudiKernel.SystemOfUnits import GeV
+from Hlt2Conf.standard_jets import make_onlytrack_particleflow
 
 from Hlt2Conf.lines.qee.high_mass_dimuon import make_Z_cand, make_Z_cand_SingleNoMuID, make_Z_cand_DoubleNoMuID, make_Zss_cand
 from Hlt2Conf.lines.qee.high_mass_dielec import make_Zee_cand, make_Zeess_cand
@@ -28,19 +28,33 @@ from Hlt2Conf.lines.qee.top_muon_elec import make_ttbar_MuE_cand, make_ttbar_MuE
 from Hlt2Conf.lines.qee.diboson import make_WW_emu_cand, make_WZ_Zll_Wlnu_cand, make_ZZ_Zllplusll_cand, make_Wleptgamma_cand, make_Zllgamma_cand
 from Hlt2Conf.lines.qee.wz_boson_rare_decays import make_WZRareDecay_HadronGamma_cand, make_WZRareDecay_DiMuonMeson_cand, make_WRareDecay_DiMuonPhiDsp_cand
 from Hlt2Conf.lines.qee.qee_builders import muon_filter
+from Hlt2Conf.lines.qee.single_high_pt_muon import make_isolated_muons
+
+# Necessary imports to hlt2_filter robustly;
+from inspect import signature
+from Hlt2Conf.lines.qee.high_mass_dimuon import z_to_mu_mu_line, z_to_mu_mu_single_nomuid_line, z_to_mu_mu_double_nomuid_line, same_sign_dimuon_line
+from Hlt2Conf.lines.qee.high_mass_dielec import z_to_e_e_line, same_sign_dielec_line
+from Hlt2Conf.lines.qee.single_high_pt_muon import threshold_map as muon_thresholds
+from Hlt2Conf.lines.qee.single_high_pt_muon import single_muon_highpt_line, single_muon_highpt_prescale_line, single_muon_highpt_iso_line, single_muon_highpt_nomuid_line
 
 sprucing_lines = {}
 
 
+def _hlt2_decision_name(line_defn):
+    line_name = signature(line_defn).parameters['name'].default
+    return f"{line_name}Decision"
+
+
 @register_line_builder(sprucing_lines)
 @configurable
 def z_to_mu_mu_sprucing_line(name='SpruceQEE_ZToMuMu', prescale=1):
-    """Z0 boson decay to two muons line"""
+    """Z0 boson decay to two muons line, both requiring ismuon, passthrough after Hlt2QEE_ZToMuMu"""
 
     line_alg = make_Z_cand()
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(z_to_mu_mu_line),
         prescale=prescale)
 
 
@@ -48,10 +62,13 @@ def z_to_mu_mu_sprucing_line(name='SpruceQEE_ZToMuMu', prescale=1):
 @configurable
 def z_to_mu_mu_single_nomuid_sprucing_line(
         name='SpruceQEE_ZToMuMu_SingleNoMuID', prescale=1):
+    """Z0 boson decay to two muons line, where one requires ismuon, for background studies. passthrough after Hlt2QEE_ZToMuMu_SingleNoMuID"""
+
     line_alg = make_Z_cand_SingleNoMuID()
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(z_to_mu_mu_single_nomuid_line),
         prescale=prescale)
 
 
@@ -59,46 +76,54 @@ def z_to_mu_mu_single_nomuid_sprucing_line(
 @configurable
 def z_to_mu_mu_double_nomuid_sprucing_line(
         name='SpruceQEE_ZToMuMu_DoubleNoMuID', prescale=1):
+    """Z0 boson decay to two muons line, where neither requires ismuon, for background studies, passthrough after Hlt2QEE_ZToMuMu_DoubleNoMuID"""
+
     line_alg = make_Z_cand_DoubleNoMuID()
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(z_to_mu_mu_double_nomuid_line),
         prescale=prescale)
 
 
 @register_line_builder(sprucing_lines)
 @configurable
-def z_to_mu_mu_ss_sprucing_line(name='SpruceQEE_ZToMuMuSS', prescale=1):
-    """Z0 boson decay to two same sign muons line"""
+def same_sign_dimuon_sprucing_line(name='SpruceQEE_DiMuonSameSign',
+                                   prescale=1):
+    """Z0 boson decay to two same sign muons line, passthrough after Hlt2QEE_DiMuonSameSign"""
 
     line_alg = make_Zss_cand()
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(same_sign_dimuon_line),
         prescale=prescale)
 
 
 @register_line_builder(sprucing_lines)
 @configurable
 def z_to_e_e_sprucing_line(name='SpruceQEE_ZToEE', prescale=1):
-    """Z0 boson decay to two electrons line"""
+    """Z0 boson decay to two electrons line, passthrough after Hlt2QEE_ZToEE"""
 
     line_alg = make_Zee_cand()
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(z_to_e_e_line),
         prescale=prescale)
 
 
 @register_line_builder(sprucing_lines)
 @configurable
-def z_to_e_e_ss_sprucing_line(name='SpruceQEE_ZToEESS', prescale=1):
-    """Z0 boson decay to two same sign electrons line"""
+def same_sign_dielec_sprucing_line(name='SpruceQEE_DiElectronSameSign',
+                                   prescale=1):
+    """Z0 boson decay to two same sign electrons line, passthrough after Hlt2QEE_DiElectronSameSign"""
 
     line_alg = make_Zeess_cand()
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(same_sign_dielec_line),
         prescale=prescale)
 
 
@@ -498,11 +523,58 @@ for decay_type in ["JPsiDsp", "DiMuonDsp", "DiMuonPion"]:
 
 @register_line_builder(sprucing_lines)
 @configurable
-def w_to_mu_numu_sprucing_line(name='SpruceQEE_WToMuNuMu', prescale=1):
-    """W -> Mu NuMu, passthrough after Hlt2SingleHighPtMuon"""
+def single_muon_highpt_sprucing_line(name='SpruceQEE_SingleHighPtMuon',
+                                     prescale=1):
+    """High PT Single Muon line, passthrough after Hlt2QEE_SingleHighPtMuon"""
+
+    line_alg = muon_filter(min_pt=muon_thresholds["standard"])
+    return SpruceLine(
+        name=name,
+        algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(single_muon_highpt_line),
+        prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def single_muon_highpt_prescale_sprucing_line(
+        name='SpruceQEE_SingleHighPtMuonPrescale', prescale=1):
+    """High PT single muon line with lower pT threshold, prescaled to reduce the rate, passthrough after Hlt2QEE_SingleHighPtMuonPrescale"""
+
+    line_alg = muon_filter(min_pt=muon_thresholds["prescale"])
+    return SpruceLine(
+        name=name,
+        algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(single_muon_highpt_prescale_line),
+        prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def single_muon_highpt_iso_sprucing_line(name='SpruceQEE_SingleHighPtMuonIso',
+                                         prescale=1):
+    """High PT single muon line with lower pT threshold, using isolation variables to reduce the rate, passthrough after Hlt2QEE_SingleHighPtMuonPrescale"""
+
+    filtered_muons = muon_filter(min_pt=muon_thresholds["iso"])
+    line_alg = make_isolated_muons(
+        filtered_muons, pflow_output=make_onlytrack_particleflow)
+    return SpruceLine(
+        name=name,
+        algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(single_muon_highpt_iso_line),
+        prescale=prescale)
+
+
+@register_line_builder(sprucing_lines)
+@configurable
+def single_muon_highpt_nomuid_sprucing_line(
+        name='SpruceQEE_SingleHighPtMuonNoMuID', prescale=1):
+    """High PT single muon line without ISMUON requirement, for background and MuonID efficiency studies, passthrough after Hlt2QEE_SingleHighPtMuonNoMuID"""
 
-    line_alg = muon_filter(15. * GeV)
+    line_alg = muon_filter(
+        min_pt=muon_thresholds["nomuid"], require_muID=False)
     return SpruceLine(
         name=name,
         algs=upfront_reconstruction() + [line_alg],
+        hlt2_filter_code=_hlt2_decision_name(single_muon_highpt_nomuid_line),
         prescale=prescale)