Merge branch 'qee_upgrade' of ssh://gitlab.cern.ch:7999/lhcb/MooreAnalysis into qee_upgrade

HltEfficiencyChecker/options/hlt2_qee_eff_example.py

@@ -16,7 +16,6 @@
 
 from Moore import options
 from RecoConf.reconstruction_objects import reconstruction
-from RecoConf.protoparticles import make_charged_protoparticles
 from RecoConf.global_tools import stateProvider_with_simplified_geom
 from HltEfficiencyChecker.config import run_moore_with_tuples
 from Hlt2Conf.lines.qee import all_lines
@@ -66,8 +65,7 @@ from Gaudi.Configuration import DEBUG
 from RecoConf.hlt1_tracking import default_ft_decoding_version
 default_ft_decoding_version.global_bind(value=6)
 
-with reconstruction.bind(from_file=False), make_charged_protoparticles.bind(
-        enable_muon_id=True):
+with reconstruction.bind(from_file=False):
     run_moore_with_tuples(
         options,
         False,

HltEfficiencyChecker/options/hlt2_qee_eff_example.yaml

@@ -40,7 +40,6 @@ analysis:
     script: $HLTEFFICIENCYCHECKERROOT/scripts/hlt_line_efficiencies.py
     args:
         input: *NTUPLE
-        level: Hlt2
         reconstructible_children: mu
         # The parent is automatically deduced from the annotated decay descriptor,
         # which is passed in a file such as eff_ntuple.root.json, but can also be given:

HltEfficiencyChecker/options/hlt2_qee_rate_example.yaml

@@ -14,5 +14,5 @@ analysis:
     script: $HLTEFFICIENCYCHECKERROOT/scripts/hlt_calculate_rates.py
     args:
         input: *NTUPLE
-        level: Hlt2
         json: Hlt2_rates.json
+        using_hlt1_filtered_MC: true

HltEfficiencyChecker/options/hlt2_qee_rates_nothlt1filtered.yaml

@@ -14,6 +14,4 @@ analysis:
     script: $HLTEFFICIENCYCHECKERROOT/scripts/hlt_calculate_rates.py
     args:
         input: *NTUPLE
-        level: Hlt2
         json: Hlt2_rates.json
-        hlt1_output_rate: 30000