Merge pull request #1161 in B2/basf2 from bugfix/BIIDP-5686-fix-dimuo…

…n-skim-name-for-proc13 to release/06-00 * commit '124e8e67f1f4319d44d666905a2ef0285e957b09': Reverting to mumutight_calib skim, just for proc13
belle2 · Jul 12, 2022 · a39a672 · a39a672
2 parents 471c128 + 124e8e6
commit a39a672
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 32 deletions.
diff --git a/calibration/scripts/prompt/__init__.py b/calibration/scripts/prompt/__init__.py
@@ -33,7 +33,7 @@
                                    "gamma_gamma_calib": "gamma_gamma_calib",
                                    "hadron_calib": "hadron_calib",
                                    "btocharm_calib": "btocharm_calib",
-                                   "mumutight_or_highm_calib": "mumutight_or_highm_calib",
+                                   "mumutight_calib": "mumutight_calib",
                                    "offip_calib": "offip_calib",
                                    "radmumu_calib": "radmumu_calib",
                                    "random_calib": "random_calib",
@@ -83,7 +83,7 @@ class CalibrationSettings(namedtuple('CalSet_Factory',
             input_data_filters dictionary e.g. from prompt import input_data_filters with details about data tags and run quality
             tags found at: https://calibration.belle2.org/belle2/data_tags/list/.
             To exclude specific filters, pre-append with *NOT* e.g.
-            {"all_events": ["mumutight_or_highm_calib", "hadron_calib", "Good", "On"],
+            {"all_events": ["mumutight_calib", "hadron_calib", "Good", "On"],
             "offres_photon_events": ["gamma_gamma_calib", "Good", "NOT On"]}.
             Not selecting a specfic filters (e.g. Magnet) is equivalent to not having any requirements, e.g. (Either)
 

diff --git a/calibration/scripts/prompt/calibrations/caf_beamspot.py b/calibration/scripts/prompt/calibrations/caf_beamspot.py
@@ -20,10 +20,10 @@
     expert_username="zlebcr",
     description=__doc__,
     input_data_formats=["cdst"],
-    input_data_names=["mumutight_or_highm_calib"],
+    input_data_names=["mumutight_calib"],
     input_data_filters={
-        "mumutight_or_highm_calib": [
-            INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+        "mumutight_calib": [
+            INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
             INPUT_DATA_FILTERS["Run Type"]["physics"],
             INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
             INPUT_DATA_FILTERS["Magnet"]["On"]]},
@@ -57,7 +57,7 @@ def get_calibrations(input_data, **kwargs):
 
     # In this script we want to use one sources of input data.
     # Get the input files  from the input_data variable
-    file_to_iov_physics = input_data["mumutight_or_highm_calib"]
+    file_to_iov_physics = input_data["mumutight_calib"]
 
     # We might have requested an enormous amount of data across a run range.
     # There's a LOT more files than runs!

diff --git a/calibration/scripts/prompt/calibrations/caf_boostvector.py b/calibration/scripts/prompt/calibrations/caf_boostvector.py
@@ -21,10 +21,10 @@
     expert_username="zlebcr",
     description=__doc__,
     input_data_formats=["cdst"],
-    input_data_names=["mumutight_or_highm_calib"],
+    input_data_names=["mumutight_calib"],
     input_data_filters={
-      "mumutight_or_highm_calib": [
-        INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+      "mumutight_calib": [
+        INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
         INPUT_DATA_FILTERS["Run Type"]["physics"],
         INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
         INPUT_DATA_FILTERS["Magnet"]["On"]]},
@@ -58,7 +58,7 @@ def get_calibrations(input_data, **kwargs):
 
     # In this script we want to use one sources of input data.
     # Get the input files  from the input_data variable
-    file_to_iov_physics = input_data["mumutight_or_highm_calib"]
+    file_to_iov_physics = input_data["mumutight_calib"]
 
     # We might have requested an enormous amount of data across a run range.
     # There's a LOT more files than runs!

diff --git a/calibration/scripts/prompt/calibrations/caf_cdc.py b/calibration/scripts/prompt/calibrations/caf_cdc.py
@@ -21,9 +21,9 @@
                                expert_username="eberthol",
                                description=__doc__,
                                input_data_formats=["raw"],
-                               input_data_names=["mumutight_or_highm_calib", "hadron_calib", "cosmic_calib"],
-                               input_data_filters={"mumutight_or_highm_calib":
-                                                   [INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+                               input_data_names=["mumutight_calib", "hadron_calib", "cosmic_calib"],
+                               input_data_filters={"mumutight_calib":
+                                                   [INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
                                                     INPUT_DATA_FILTERS["Data Quality Tag"]["Good"],
                                                     INPUT_DATA_FILTERS["Magnet"]["On"]],
                                                    "hadron_calib":
@@ -170,7 +170,7 @@ def get_calibrations(input_data, **kwargs):
         max_mumu_events_for_xt_sr = fraction_of_event_for_types[0] * max_events_for_xt_sr
         min_mumu_events_for_tz_tw = fraction_of_event_for_types[0] * min_events_for_tz_tw
         max_mumu_events_for_tz_tw = fraction_of_event_for_types[0] * max_events_for_tz_tw
-        file_to_iov_mumu = input_data["mumutight_or_highm_calib"]
+        file_to_iov_mumu = input_data["mumutight_calib"]
         basf2.B2INFO("----> For T0 and Time walk correction")
         chosen_files_mumu_for_tz_tw = select_files(list(file_to_iov_mumu.keys()),
                                                    min_mumu_events_for_tz_tw,
@@ -189,8 +189,8 @@ def get_calibrations(input_data, **kwargs):
                                                    max_jobs[0],
                                                    min_events_per_file)
 
-        files_for_xt_sr_dict["mumutight_or_highm_calib"] = chosen_files_mumu_for_xt_sr
-        files_for_tz_tw_dict["mumutight_or_highm_calib"] = chosen_files_mumu_for_tz_tw
+        files_for_xt_sr_dict["mumutight_calib"] = chosen_files_mumu_for_xt_sr
+        files_for_tz_tw_dict["mumutight_calib"] = chosen_files_mumu_for_tz_tw
 
         '''    For cosmic data '''
     if fraction_of_event_for_types[2] > 0:

diff --git a/calibration/scripts/prompt/calibrations/caf_ecl_E.py b/calibration/scripts/prompt/calibrations/caf_ecl_E.py
@@ -22,7 +22,7 @@
     input_data_names=[
         "bhabha_all_calib",
         "gamma_gamma_calib",
-        "mumutight_or_highm_calib"],
+        "mumutight_calib"],
     input_data_filters={
         "bhabha_all_calib": [
             INPUT_DATA_FILTERS["Data Tag"]["bhabha_all_calib"],
@@ -32,8 +32,8 @@
             INPUT_DATA_FILTERS["Data Tag"]["gamma_gamma_calib"],
             INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
             INPUT_DATA_FILTERS["Magnet"]["On"]],
-        "mumutight_or_highm_calib": [
-            INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+        "mumutight_calib": [
+            INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
             INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
             INPUT_DATA_FILTERS["Magnet"]["On"]]},
     depends_on=[],
@@ -194,7 +194,7 @@ def get_calibrations(input_data, **kwargs):
     # ..muon pair
 
     # ..Input data
-    file_to_iov_mu_mu = input_data["mumutight_or_highm_calib"]
+    file_to_iov_mu_mu = input_data["mumutight_calib"]
     input_files_mu_mu = list(file_to_iov_mu_mu.keys())
 
     # ..Algorithm

diff --git a/calibration/scripts/prompt/calibrations/caf_ecl_edge.py b/calibration/scripts/prompt/calibrations/caf_ecl_edge.py
@@ -19,10 +19,10 @@
     expert_username="hearty",
     description=__doc__,
     input_data_formats=["cdst"],
-    input_data_names=["mumutight_or_highm_calib"],
+    input_data_names=["mumutight_calib"],
     input_data_filters={
-        "mumutight_or_highm_calib": [
-            INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+        "mumutight_calib": [
+            INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
             INPUT_DATA_FILTERS["Data Quality Tag"]["Good"]]},
     depends_on=[])
 
@@ -38,7 +38,7 @@ def get_calibrations(input_data, **kwargs):
 
     # --------------------------------------------------------------
     # ..Input data
-    file_to_iov_mu_mu = input_data["mumutight_or_highm_calib"]
+    file_to_iov_mu_mu = input_data["mumutight_calib"]
     input_files_mu_mu = list(file_to_iov_mu_mu.keys())
 
     # ..Algorithm

diff --git a/calibration/scripts/prompt/calibrations/caf_ecms.py b/calibration/scripts/prompt/calibrations/caf_ecms.py
@@ -38,13 +38,13 @@
             INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
             INPUT_DATA_FILTERS["Magnet"]["On"]],
         "mumu4S": [
-            INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+            INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
             INPUT_DATA_FILTERS["Run Type"]["physics"],
             INPUT_DATA_FILTERS["Beam Energy"]["4S"],
             INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
             INPUT_DATA_FILTERS["Magnet"]["On"]],
         "mumuOff": [
-            INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
+            INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
             INPUT_DATA_FILTERS["Run Type"]["physics"],
             INPUT_DATA_FILTERS["Beam Energy"]["Continuum"],
             INPUT_DATA_FILTERS['Beam Energy']['Scan'],

diff --git a/calibration/scripts/prompt/calibrations/caf_klm_alignment.py b/calibration/scripts/prompt/calibrations/caf_klm_alignment.py
@@ -45,7 +45,7 @@
                                input_data_names=["raw_physics", "raw_cosmic"],
                                input_data_filters={
                                    'raw_physics': [INPUT_DATA_FILTERS['Run Type']['physics'],
-                                                   INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
+                                                   INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
                                                    INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']],
                                    'raw_cosmic': [INPUT_DATA_FILTERS['Run Type']['physics'],
                                                   INPUT_DATA_FILTERS['Data Tag']['cosmic_calib'],

diff --git a/calibration/scripts/prompt/calibrations/caf_klm_channel_status.py b/calibration/scripts/prompt/calibrations/caf_klm_channel_status.py
@@ -45,7 +45,7 @@
                         INPUT_DATA_FILTERS['Data Tag']['bhabha_all_calib'],
                         INPUT_DATA_FILTERS['Data Tag']['gamma_gamma_calib'],
                         INPUT_DATA_FILTERS['Data Tag']['hadron_calib'],
-                        INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
+                        INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
                         INPUT_DATA_FILTERS['Data Tag']['radmumu_calib'],
                         INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']]
     },

diff --git a/calibration/scripts/prompt/calibrations/caf_klm_strip_efficiency.py b/calibration/scripts/prompt/calibrations/caf_klm_strip_efficiency.py
@@ -33,7 +33,7 @@
     input_data_names=['hlt_mumu'],
     input_data_filters={
         'hlt_mumu': [INPUT_DATA_FILTERS['Run Type']['physics'],
-                     INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
+                     INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
                      INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']]
     },
     depends_on=[])

diff --git a/calibration/scripts/prompt/calibrations/caf_klm_time.py b/calibration/scripts/prompt/calibrations/caf_klm_time.py
@@ -32,7 +32,7 @@
                                input_data_names=['hlt_mumu'],
                                input_data_filters={
                                    'hlt_mumu': [INPUT_DATA_FILTERS['Run Type']['physics'],
-                                                INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
+                                                INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
                                                 INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']]
                                },
                                depends_on=[])

diff --git a/calibration/scripts/prompt/calibrations/caf_vxdcdc_alignment.py b/calibration/scripts/prompt/calibrations/caf_vxdcdc_alignment.py
@@ -14,7 +14,6 @@
 
 import basf2
 import ROOT
-from ROOT import Belle2
 
 from prompt import CalibrationSettings, INPUT_DATA_FILTERS
 from prompt.calibrations.caf_cdc import settings as cdc_calibration
@@ -58,7 +57,7 @@
                                input_data_names=collection_names,
                                input_data_filters={
                                    "cosmic": [INPUT_DATA_FILTERS["Data Tag"]["cosmic_calib"]] + quality_flags,
-                                   "mumu": [INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"]] + quality_flags,
+                                   "mumu": [INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"]] + quality_flags,
                                    "hadron": [INPUT_DATA_FILTERS["Data Tag"]["hadron_calib"]] + quality_flags,
                                    "offip": [INPUT_DATA_FILTERS["Data Tag"]["offip_calib"]] + quality_flags
                                },