Skip to content

Commit a39a672

Browse files
GiacomoXTGiacomoXT
committed
Merge pull request #1161 in B2/basf2 from bugfix/BIIDP-5686-fix-dimuon-skim-name-for-proc13 to release/06-00
* commit '124e8e67f1f4319d44d666905a2ef0285e957b09': Reverting to mumutight_calib skim, just for proc13
2 parents 471c128 + 124e8e6 commit a39a672

File tree

12 files changed

+31
-32
lines changed

12 files changed

+31
-32
lines changed

‎calibration/scripts/prompt/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"gamma_gamma_calib": "gamma_gamma_calib",
3434
"hadron_calib": "hadron_calib",
3535
"btocharm_calib": "btocharm_calib",
36-
"mumutight_or_highm_calib": "mumutight_or_highm_calib",
36+
"mumutight_calib": "mumutight_calib",
3737
"offip_calib": "offip_calib",
3838
"radmumu_calib": "radmumu_calib",
3939
"random_calib": "random_calib",
@@ -83,7 +83,7 @@ class CalibrationSettings(namedtuple('CalSet_Factory',
8383
input_data_filters dictionary e.g. from prompt import input_data_filters with details about data tags and run quality
8484
tags found at: https://calibration.belle2.org/belle2/data_tags/list/.
8585
To exclude specific filters, pre-append with *NOT* e.g.
86-
{"all_events": ["mumutight_or_highm_calib", "hadron_calib", "Good", "On"],
86+
{"all_events": ["mumutight_calib", "hadron_calib", "Good", "On"],
8787
"offres_photon_events": ["gamma_gamma_calib", "Good", "NOT On"]}.
8888
Not selecting a specfic filters (e.g. Magnet) is equivalent to not having any requirements, e.g. (Either)
8989

‎calibration/scripts/prompt/calibrations/caf_beamspot.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
expert_username="zlebcr",
2121
description=__doc__,
2222
input_data_formats=["cdst"],
23-
input_data_names=["mumutight_or_highm_calib"],
23+
input_data_names=["mumutight_calib"],
2424
input_data_filters={
25-
"mumutight_or_highm_calib": [
26-
INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
25+
"mumutight_calib": [
26+
INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
2727
INPUT_DATA_FILTERS["Run Type"]["physics"],
2828
INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
2929
INPUT_DATA_FILTERS["Magnet"]["On"]]},
@@ -57,7 +57,7 @@ def get_calibrations(input_data, **kwargs):
5757

5858
# In this script we want to use one sources of input data.
5959
# Get the input files from the input_data variable
60-
file_to_iov_physics = input_data["mumutight_or_highm_calib"]
60+
file_to_iov_physics = input_data["mumutight_calib"]
6161

6262
# We might have requested an enormous amount of data across a run range.
6363
# There's a LOT more files than runs!

‎calibration/scripts/prompt/calibrations/caf_boostvector.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
expert_username="zlebcr",
2222
description=__doc__,
2323
input_data_formats=["cdst"],
24-
input_data_names=["mumutight_or_highm_calib"],
24+
input_data_names=["mumutight_calib"],
2525
input_data_filters={
26-
"mumutight_or_highm_calib": [
27-
INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
26+
"mumutight_calib": [
27+
INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
2828
INPUT_DATA_FILTERS["Run Type"]["physics"],
2929
INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
3030
INPUT_DATA_FILTERS["Magnet"]["On"]]},
@@ -58,7 +58,7 @@ def get_calibrations(input_data, **kwargs):
5858

5959
# In this script we want to use one sources of input data.
6060
# Get the input files from the input_data variable
61-
file_to_iov_physics = input_data["mumutight_or_highm_calib"]
61+
file_to_iov_physics = input_data["mumutight_calib"]
6262

6363
# We might have requested an enormous amount of data across a run range.
6464
# There's a LOT more files than runs!

‎calibration/scripts/prompt/calibrations/caf_cdc.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
expert_username="eberthol",
2222
description=__doc__,
2323
input_data_formats=["raw"],
24-
input_data_names=["mumutight_or_highm_calib", "hadron_calib", "cosmic_calib"],
25-
input_data_filters={"mumutight_or_highm_calib":
26-
[INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
24+
input_data_names=["mumutight_calib", "hadron_calib", "cosmic_calib"],
25+
input_data_filters={"mumutight_calib":
26+
[INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
2727
INPUT_DATA_FILTERS["Data Quality Tag"]["Good"],
2828
INPUT_DATA_FILTERS["Magnet"]["On"]],
2929
"hadron_calib":
@@ -170,7 +170,7 @@ def get_calibrations(input_data, **kwargs):
170170
max_mumu_events_for_xt_sr = fraction_of_event_for_types[0] * max_events_for_xt_sr
171171
min_mumu_events_for_tz_tw = fraction_of_event_for_types[0] * min_events_for_tz_tw
172172
max_mumu_events_for_tz_tw = fraction_of_event_for_types[0] * max_events_for_tz_tw
173-
file_to_iov_mumu = input_data["mumutight_or_highm_calib"]
173+
file_to_iov_mumu = input_data["mumutight_calib"]
174174
basf2.B2INFO("----> For T0 and Time walk correction")
175175
chosen_files_mumu_for_tz_tw = select_files(list(file_to_iov_mumu.keys()),
176176
min_mumu_events_for_tz_tw,
@@ -189,8 +189,8 @@ def get_calibrations(input_data, **kwargs):
189189
max_jobs[0],
190190
min_events_per_file)
191191

192-
files_for_xt_sr_dict["mumutight_or_highm_calib"] = chosen_files_mumu_for_xt_sr
193-
files_for_tz_tw_dict["mumutight_or_highm_calib"] = chosen_files_mumu_for_tz_tw
192+
files_for_xt_sr_dict["mumutight_calib"] = chosen_files_mumu_for_xt_sr
193+
files_for_tz_tw_dict["mumutight_calib"] = chosen_files_mumu_for_tz_tw
194194

195195
''' For cosmic data '''
196196
if fraction_of_event_for_types[2] > 0:

‎calibration/scripts/prompt/calibrations/caf_ecl_E.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
input_data_names=[
2323
"bhabha_all_calib",
2424
"gamma_gamma_calib",
25-
"mumutight_or_highm_calib"],
25+
"mumutight_calib"],
2626
input_data_filters={
2727
"bhabha_all_calib": [
2828
INPUT_DATA_FILTERS["Data Tag"]["bhabha_all_calib"],
@@ -32,8 +32,8 @@
3232
INPUT_DATA_FILTERS["Data Tag"]["gamma_gamma_calib"],
3333
INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
3434
INPUT_DATA_FILTERS["Magnet"]["On"]],
35-
"mumutight_or_highm_calib": [
36-
INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
35+
"mumutight_calib": [
36+
INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
3737
INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
3838
INPUT_DATA_FILTERS["Magnet"]["On"]]},
3939
depends_on=[],
@@ -194,7 +194,7 @@ def get_calibrations(input_data, **kwargs):
194194
# ..muon pair
195195

196196
# ..Input data
197-
file_to_iov_mu_mu = input_data["mumutight_or_highm_calib"]
197+
file_to_iov_mu_mu = input_data["mumutight_calib"]
198198
input_files_mu_mu = list(file_to_iov_mu_mu.keys())
199199

200200
# ..Algorithm

‎calibration/scripts/prompt/calibrations/caf_ecl_edge.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
expert_username="hearty",
2020
description=__doc__,
2121
input_data_formats=["cdst"],
22-
input_data_names=["mumutight_or_highm_calib"],
22+
input_data_names=["mumutight_calib"],
2323
input_data_filters={
24-
"mumutight_or_highm_calib": [
25-
INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
24+
"mumutight_calib": [
25+
INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
2626
INPUT_DATA_FILTERS["Data Quality Tag"]["Good"]]},
2727
depends_on=[])
2828

@@ -38,7 +38,7 @@ def get_calibrations(input_data, **kwargs):
3838

3939
# --------------------------------------------------------------
4040
# ..Input data
41-
file_to_iov_mu_mu = input_data["mumutight_or_highm_calib"]
41+
file_to_iov_mu_mu = input_data["mumutight_calib"]
4242
input_files_mu_mu = list(file_to_iov_mu_mu.keys())
4343

4444
# ..Algorithm

‎calibration/scripts/prompt/calibrations/caf_ecms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
3939
INPUT_DATA_FILTERS["Magnet"]["On"]],
4040
"mumu4S": [
41-
INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
41+
INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
4242
INPUT_DATA_FILTERS["Run Type"]["physics"],
4343
INPUT_DATA_FILTERS["Beam Energy"]["4S"],
4444
INPUT_DATA_FILTERS["Data Quality Tag"]["Good Or Recoverable"],
4545
INPUT_DATA_FILTERS["Magnet"]["On"]],
4646
"mumuOff": [
47-
INPUT_DATA_FILTERS["Data Tag"]["mumutight_or_highm_calib"],
47+
INPUT_DATA_FILTERS["Data Tag"]["mumutight_calib"],
4848
INPUT_DATA_FILTERS["Run Type"]["physics"],
4949
INPUT_DATA_FILTERS["Beam Energy"]["Continuum"],
5050
INPUT_DATA_FILTERS['Beam Energy']['Scan'],

‎calibration/scripts/prompt/calibrations/caf_klm_alignment.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
input_data_names=["raw_physics", "raw_cosmic"],
4646
input_data_filters={
4747
'raw_physics': [INPUT_DATA_FILTERS['Run Type']['physics'],
48-
INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
48+
INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
4949
INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']],
5050
'raw_cosmic': [INPUT_DATA_FILTERS['Run Type']['physics'],
5151
INPUT_DATA_FILTERS['Data Tag']['cosmic_calib'],

‎calibration/scripts/prompt/calibrations/caf_klm_channel_status.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
INPUT_DATA_FILTERS['Data Tag']['bhabha_all_calib'],
4646
INPUT_DATA_FILTERS['Data Tag']['gamma_gamma_calib'],
4747
INPUT_DATA_FILTERS['Data Tag']['hadron_calib'],
48-
INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
48+
INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
4949
INPUT_DATA_FILTERS['Data Tag']['radmumu_calib'],
5050
INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']]
5151
},

‎calibration/scripts/prompt/calibrations/caf_klm_strip_efficiency.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
input_data_names=['hlt_mumu'],
3434
input_data_filters={
3535
'hlt_mumu': [INPUT_DATA_FILTERS['Run Type']['physics'],
36-
INPUT_DATA_FILTERS['Data Tag']['mumutight_or_highm_calib'],
36+
INPUT_DATA_FILTERS['Data Tag']['mumutight_calib'],
3737
INPUT_DATA_FILTERS['Data Quality Tag']['Good Or Recoverable']]
3838
},
3939
depends_on=[])

0 commit comments

Comments
 (0)