Merge branch 'rjhunter-hltefficiencychecker-new-yaml-options' into 'master'

Explicitly specify old CALO raw banks or old muon decoding in HltEfficiencyChecker yaml options

Closes #44

See merge request !134

HltEfficiencyChecker/options/hlt1_and_hlt2_eff_example.yaml

@@ -9,6 +9,8 @@ job:
     hlt1_configuration: hlt1_pp_veloSP
     hlt2_configuration: fastest
     hlt2_lines_from: Hlt2Conf.lines.topological_b
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     options:
         - $HLTEFFICIENCYCHECKERROOT/options/options_template.py.jinja  # first rendered with jinja2
 analysis:

HltEfficiencyChecker/options/hlt1_and_hlt2_eff_example_retinacluster.yaml

@@ -9,6 +9,8 @@ job:
     hlt1_configuration: hlt1_pp_default
     hlt2_configuration: fastest
     hlt2_lines_from: Hlt2Conf.lines.topological_b
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     options:
         - $HLTEFFICIENCYCHECKERROOT/options/options_template.py.jinja  # first rendered with jinja2
 analysis:

HltEfficiencyChecker/options/hlt1_and_hlt2_rate_example.yaml

@@ -7,6 +7,8 @@ job:
     hlt1_configuration: hlt1_pp_veloSP
     hlt2_configuration: fastest
     hlt2_lines_from: Hlt2Conf.lines.topological_b
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     options:
         - $HLTEFFICIENCYCHECKERROOT/options/options_template.py.jinja  # first rendered with jinja2
 analysis:

HltEfficiencyChecker/options/hlt1_and_hlt2_rate_example_retinacluster.yaml

@@ -6,6 +6,8 @@ job:
     testfiledb_key: upgrade_DC19_01_MinBiasMD_retinacluster
     hlt2_lines_from: Hlt2Conf.lines.topological_b
     hlt2_configuration: fastest
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     options:
         - $HLTEFFICIENCYCHECKERROOT/options/options_template.py.jinja  # first rendered with jinja2
 analysis:

HltEfficiencyChecker/options/hlt1_eff_example_moore.yaml

@@ -7,6 +7,8 @@ job:
     evt_max: 100
     testfiledb_key: upgrade_DC19_01_Bs2JPsiPhi_MD
     use_moore_as_hlt1: True
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     #
     # You can also define the input files and/or the processing conditions:
     #

HltEfficiencyChecker/options/hlt1_rate_example_moore.yaml

@@ -5,6 +5,8 @@ job:
     evt_max: 100
     testfiledb_key: upgrade_DC19_01_MinBiasMD
     use_moore_as_hlt1: True
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     #
     # Rates can only be calculated w.r.t min bias, but you can specify your own min bias files e.g.
     #

HltEfficiencyChecker/options/hlt2_eff_example.yaml

@@ -21,7 +21,8 @@ job:
     dddb_tag: 'dddb-20171126'
     input_raw_format: 4.3
     hlt2_configuration: fastest
-
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     options:
         #- $HLTEFFICIENCYCHECKERROOT/options/hlt2_lines_example.py  # Not needed as the "lines_from" is used instead
         - $HLTEFFICIENCYCHECKERROOT/options/options_template.py.jinja  # first rendered with jinja2

HltEfficiencyChecker/options/hlt2_overlap_example.yaml

@@ -7,6 +7,8 @@ job:
     input_raw_format: 4.3
     lines_from: Hlt2Conf.lines.topological_b
     hlt2_configuration: fastest
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     #
     #
     # input_type: ROOT

HltEfficiencyChecker/options/hlt2_rate_example.yaml

@@ -7,6 +7,8 @@ job:
     input_raw_format: 4.3
     lines_from: Hlt2Conf.lines.starterkit.bs_to_jpsiphi
     hlt2_configuration: fastest
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     #
     # Rates can only be calculated w.r.t min bias, but you can specify your own min bias files e.g.
     #

HltEfficiencyChecker/options/hlt2_rate_example_withGEC.yaml

@@ -7,6 +7,8 @@ job:
     input_raw_format: 0.5
     lines_from: Hlt2Conf.lines.starterkit.bs_to_jpsiphi
     hlt2_configuration: fastest
+    use_old_calo_raw_banks: True
+    muon_decoding_version: 2
     #
     # Rates can only be calculated w.r.t min bias, but you can specify your own min bias files e.g.
     #

HltEfficiencyChecker/options/options_template.py.jinja

@@ -44,11 +44,7 @@ make_velo_full_clusters.global_bind(
 {% endif %}
 
 {% if job.testfiledb_key is defined %}
-options.set_input_from_testfiledb("{{ job.testfiledb_key }}")
-{% endif %}
-
-{% if job.testfiledb_key is defined %}
-options.set_conds_from_testfiledb("{{ job.testfiledb_key }}")
+options.set_input_and_conds_from_testfiledb("{{ job.testfiledb_key }}")
 {% endif %}
 
 {% if job.lines_from is defined %}
@@ -111,11 +107,16 @@ if {{ job.debug_mode }}:
     options.output_level = DEBUG
 {% endif %}
 
-from RecoConf.calorimeter_reconstruction import make_digits
-make_digits.global_bind(calo_raw_bank=False)
+{% if job.use_old_calo_raw_banks is defined %}
+if {{ job.use_old_calo_raw_banks }}:
+    from RecoConf.calorimeter_reconstruction import make_digits
+    make_digits.global_bind(calo_raw_bank=False)
+{% endif %}
 
+{% if job.muon_decoding_version is defined %}
 from RecoConf.hlt1_muonid import make_muon_hits
-make_muon_hits.global_bind(geometry_version=2)
+make_muon_hits.global_bind(geometry_version={{job.muon_decoding_version}})
+{% endif %}
 
 from RecoConf.global_tools import stateProvider_with_simplified_geom
 if level == "2":