Skip to content

Commit 08ef9cc

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47639 from AdrianoDee/offlinegt_2024_eras_bcde
Using Offline GT for 2024 Data RelVals Eras B,C,D,E
2 parents 7c06f31 + f920a78 commit 08ef9cc

File tree

4 files changed

+36
-33
lines changed

4 files changed

+36
-33
lines changed

‎Configuration/PyReleaseValidation/python/relval_data_highstats.py‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,72 @@
44
# here only define the workflows as a combination of the steps defined above:
55
workflows = Matrix()
66

7-
## Here we define higher (>50k events) stats data workflows
8-
## not to be run as default. 150k, 250k, 500k or 1M events each
7+
## Here we define fixed high stats data workflows
8+
## not to be run as default. 10k, 50k, 150k, 250k, 500k or 1M events each
99

1010
offset_era = 0.1 # less than 10 eras per year
1111
offset_pd = 0.001 # less than 100 pds per year
12-
offset_events = 0.0001 # less than 10 event setups (50k,150k,250k,500k)
12+
offset_events = 0.0001 # less than 10 event setups (10k,50k,150k,250k,500k,1M)
1313

1414
## 2024
1515
base_wf = 2024.0
1616
for e_n,era in enumerate(eras_2024):
1717
for p_n,pd in enumerate(pds_2024):
18-
for e_key,evs in event_steps_dict.items():
19-
if "10k" == e_key: # already defined in relval_standard
20-
continue
18+
for e_key,evs in event_steps_dict.items():
2119
wf_number = base_wf
2220
wf_number = wf_number + offset_era * e_n
2321
wf_number = wf_number + offset_pd * p_n
2422
wf_number = wf_number + offset_events * evs
2523
wf_number = round(wf_number,6)
26-
27-
step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key
24+
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1] + '_' + e_key
2825
y = str(int(base_wf))
29-
suff = "ZB_" if "ZeroBias" in step_name else ""
26+
suff = 'ZB_' if 'ZeroBias' in step_name else ''
27+
# Running C,D,E with the offline GT.
28+
# Could be removed once 2025 wfs are in and we'll test the online GT with them
29+
recosetup = 'RECONANORUN3_' + suff + 'reHLT_2024'
30+
recosetup = recosetup if era[-1] > 'E' else recosetup + '_Offline'
3031
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]
3132

3233
## 2023
3334
base_wf = 2023.0
3435
for e_n,era in enumerate(eras_2023):
3536
for p_n,pd in enumerate(pds_2023):
36-
for e_key,evs in event_steps_dict.items():
37-
if "10k" == e_key: # already defined in relval_standard
38-
continue
37+
for e_key,evs in event_steps_dict.items():
3938
wf_number = base_wf
4039
wf_number = wf_number + offset_era * e_n
4140
wf_number = wf_number + offset_pd * p_n
4241
wf_number = wf_number + offset_events * evs
4342
wf_number = round(wf_number,6)
44-
45-
step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_" + e_key
46-
y = str(int(base_wf)) + "B" if "2023B" in era else str(int(base_wf))
47-
suff = "ZB_" if "ZeroBias" in step_name else ""
43+
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1] + '_' + e_key
44+
y = str(int(base_wf)) + 'B' if '2023B' in era else str(int(base_wf))
45+
suff = 'ZB_' if 'ZeroBias' in step_name else ''
4846
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]
4947

5048
## 2022
5149
base_wf = 2022.0
5250
for e_n,era in enumerate(eras_2022_1):
5351
for p_n,pd in enumerate(pds_2022_1):
54-
for e_key,evs in event_steps_dict.items():
55-
if "10k" == e_key: # already defined in relval_standard
56-
continue
52+
for e_key,evs in event_steps_dict.items():
5753
wf_number = base_wf
5854
wf_number = wf_number + offset_era * e_n
5955
wf_number = wf_number + offset_pd * p_n
6056
wf_number = wf_number + offset_events * evs
6157
wf_number = round(wf_number,6)
62-
step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key
58+
step_name = 'Run' + pd + era.split('Run')[1] + '_' + e_key
6359
y = str(int(base_wf))
64-
suff = "ZB_" if "ZeroBias" in step_name else ""
60+
suff = 'ZB_' if 'ZeroBias' in step_name else ''
6561
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]
6662

6763
# PD names changed during 2022
6864
for e_n,era in enumerate(eras_2022_2):
6965
for p_n,pd in enumerate(pds_2022_2):
70-
for e_key,evs in event_steps_dict.items():
71-
if "10k" == e_key: # already defined in relval_standard
72-
continue
66+
for e_key,evs in event_steps_dict.items():
7367
wf_number = base_wf
7468
wf_number = wf_number + offset_era * (e_n + len(eras_2022_1))
7569
wf_number = wf_number + offset_pd * (p_n + len(pds_2022_1))
7670
wf_number = wf_number + offset_events * evs
7771
wf_number = round(wf_number,6)
78-
step_name = "Run" + pd + era.split("Run")[1] + "_" + e_key
72+
step_name = 'Run' + pd + era.split('Run')[1] + '_' + e_key
7973
y = str(int(base_wf))
80-
suff = "ZB_" if "ZeroBias" in step_name else ""
74+
suff = 'ZB_' if 'ZeroBias' in step_name else ''
8175
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]

‎Configuration/PyReleaseValidation/python/relval_standard.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,12 @@
582582
for e_n,era in enumerate(era_mask_2024):
583583
for p_n,pd in enumerate(pds_2024):
584584
wf_number = round(base_wf + offset_era * e_n + offset_pd * p_n,3)
585-
dataset = "/" + pd + "/" + era + "-v1/RAW"
586-
step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1]
587-
suff = "ZB_" if "ZeroBias" in step_name else ""
588-
workflows[wf_number] = ['',[step_name,'HLTDR3_2024','RECONANORUN3_' + suff + 'reHLT_2024','HARVESTRUN3_' + suff + '2024']]
585+
dataset = '/' + pd + '/' + era + '-v1/RAW'
586+
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1]
587+
suff = 'ZB_' if 'ZeroBias' in step_name else ''
588+
recosetup = 'RECONANORUN3_' + suff + 'reHLT_2024'
589+
recosetup = recosetup if era[-1] > 'E' else recosetup + '_Offline'
590+
workflows[wf_number] = ['',[step_name,'HLTDR3_2024',recosetup,'HARVESTRUN3_' + suff + '2024']]
589591

590592
## special HLT scouting workflow (with hardcoded private input file from ScoutingPFMonitor skimmed to remove all events without scouting)
591593
workflows[145.415] = ['',['HLTDR3_ScoutingPFMonitor_2024','RECONANORUN3_ScoutingPFMonitor_reHLT_2024','HARVESTRUN3_ScoutingPFMonitor_2024']]

‎Configuration/PyReleaseValidation/python/relval_steps.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2852,6 +2852,9 @@ def lhegensim2018ml(fragment,howMuch):
28522852
steps['RECODR3_reHLT_2023']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3_2023']])
28532853
steps['RECODR3_reHLT_2023B']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3']])
28542854
steps['RECODR3_reHLT_2024']=merge([{'--conditions':'auto:run3_data_prompt_relval', '--hltProcess':'reHLT'},steps['RECODR3']])
2855+
# Added to run with the offline GT on few 2024 Eras.
2856+
# Could be removed once 2025 wfs are in and we'll test the online GT with them
2857+
steps['RECODR3_reHLT_2024_Offline']=merge([{'--conditions':'auto:run3_data_relval', '--hltProcess':'reHLT'},steps['RECODR3']])
28552858

28562859
steps['RECODR2_2016_UPC']=merge([{'--conditions':'auto:run2_data', '--era':'Run2_2016_UPC', '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--repacked':''},steps['RECODR2_2016']])
28572860
steps['RECODR3_2023_HIN']=merge([{'--conditions':'auto:run3_data_prompt', '-s':'RAW2DIGI,L1Reco,RECO,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--repacked':'', '-n':1000},steps['RECODR3_2023']])
@@ -3257,6 +3260,10 @@ def gen2024HiMix(fragment,howMuch):
32573260

32583261
steps['RECONANORUN3_reHLT_2024']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM','--datatier':'RECO,MINIAOD,NANOAOD,DQMIO','--eventcontent':'RECO,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2024']])
32593262
steps['RECONANORUN3_ZB_reHLT_2024']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT_2024']])
3263+
3264+
steps['RECONANORUN3_reHLT_2024_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM','--datatier':'RECO,MINIAOD,NANOAOD,DQMIO','--eventcontent':'RECO,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2024_Offline']])
3265+
steps['RECONANORUN3_ZB_reHLT_2024_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT_2024_Offline']])
3266+
32603267
steps['RECONANORUN3_ScoutingPFMonitor_reHLT_2024']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM+@hltScouting'},steps['RECONANORUN3_reHLT_2024']])
32613268

32623269
steps['AODNANORUN3_reHLT_2024']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM','--datatier':'AOD,MINIAOD,NANOAOD,DQMIO','--eventcontent':'AOD,MINIAOD,NANOEDMAOD,DQM'},steps['RECODR3_reHLT_2024']])

‎Configuration/PyReleaseValidation/scripts/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,9 @@ pp Data reRECO workflows:
372372
| 2023.002001 | Run2023D ZeroBias | run3_hlt_relval + run3_data_relval| Run3_2023 | HLT:@relval2023 |
373373
| 2023.000001 | Run2023D MuonEG | run3_hlt_relval + run3_data_relval| Run3_2023 | HLT:@relval2023 |
374374
| 2024 | | | | |
375-
| 145.014 | Run2024B ZeroBias | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
376-
| 145.104 | Run2024C JetMet0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
377-
| 145.202 | Run2024D EGamma0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
375+
| 145.014 | Run2024B ZeroBias | run3_hlt_relval + run3_data_relval| Run3_2024 | HLT:@relval2025 |
376+
| 145.104 | Run2024C JetMet0 | run3_hlt_relval + run3_data_relval| Run3_2024 | HLT:@relval2025 |
377+
| 145.202 | Run2024D EGamma0 | run3_hlt_relval + run3_data_relval| Run3_2024 | HLT:@relval2025 |
378378
| 145.301 | Run2024E DisplacedJet | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
379379
| 145.408 | Run2024B ParkingDoubleMuonLowMass0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
380380
| 145.500 | Run2024B BTagMu | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |

0 commit comments

Comments
 (0)