diff --git a/Configuration/PyReleaseValidation/python/relval_data_highstats.py b/Configuration/PyReleaseValidation/python/relval_data_highstats.py index 146fd6e7b27fb..940b41270d72d 100644 --- a/Configuration/PyReleaseValidation/python/relval_data_highstats.py +++ b/Configuration/PyReleaseValidation/python/relval_data_highstats.py @@ -23,7 +23,7 @@ wf_number = wf_number + offset_pd * p_n wf_number = wf_number + offset_events * evs wf_number = round(wf_number,6) - step_name = "Run" + pd + era.split("Run")[1] + "_10k" + step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key y = str(base_wf) suff = "ZB_" if "ZeroBias" in step_name else "" workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]] @@ -40,11 +40,13 @@ wf_number = wf_number + offset_pd * p_n wf_number = wf_number + offset_events * evs wf_number = round(wf_number,6) - step_name = "Run" + pd + era.split("Run")[1] + "_10k" + + step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key y = str(base_wf) + "B" if "2023B" in era else str(base_wf) suff = "ZB_" if "ZeroBias" in step_name else "" workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]] + ## 2022 base_wf = 2022.0 for e_n,era in enumerate(eras_2022_1): diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 85eee4d0436bb..26fc9d36e5312 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -579,7 +579,8 @@ wf_number = wf_number + offset_pd * p_n wf_number = wf_number + 0.0001 * 0.01 wf_number = round(wf_number,6) - step_name = "Run" + pd + era.split("Run")[1] + "_10k" + + step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key y = str(base_wf) suff = "ZB_" if "ZeroBias" in step_name else "" workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]] @@ -593,11 +594,11 @@ wf_number = wf_number + offset_pd * p_n wf_number = wf_number + 0.0001 * 0.01 wf_number = round(wf_number,6) - step_name = "Run" + pd + era.split("Run")[1] + "_10k" + + step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key y = str(base_wf) + "B" if "2023B" in era else str(base_wf) suff = "ZB_" if "ZeroBias" in step_name else "" workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]] - # 2022 base_wf = 2022 diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index ef0594eadc985..2a2bb6939c95b 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -653,7 +653,7 @@ for pd in pds_2024: dataset = "/" + pd + "/" + era + "-v1/RAW" for e_key,evs in event_steps_dict.items(): - step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')} ###2023 @@ -665,7 +665,7 @@ for pd in pds_2023: dataset = "/" + pd + "/" + era + "-v1/RAW" for e_key,evs in event_steps_dict.items(): - step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key + step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')} ###2022