Skip to content

Commit

Permalink
Merge pull request #46880 from AdrianoDee/rolling_back_2024_wfs
Browse files Browse the repository at this point in the history 
Standard 2024(2022,2023) Wfs For PR Testing
  • Loading branch information
@cmsbuild
cmsbuild authored Dec 19, 2024
2 parents 6162502 + 00f7cd4 commit 2a35b60
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 60 deletions.
56 changes: 9 additions & 47 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,57 +573,19 @@
### run3-2025 (2025 HI OXY data)
workflows[143.911] = ['',['RunUPC2024','RECODR3_2025_OXY','HARVESTDPROMPTR3']]

##################################################################
### Golden Data Wfs
# for a limited set of eras and PDs not to overflow the IB matrices
# the full set in relval_data_highstats.py

offset_era = 0.1 # less than 10 eras per year
## Lumi mask fixed 2024 wfs
base_wf = 145.0
offset_era = 0.1 # less than 10 eras per year (hopefully)
offset_pd = 0.001 # less than 100 pds per year

# 2024
base_wf = 2024
for e_n,era in enumerate(['Run2024B','Run2024C','Run2024D','Run2024E']):
for p_n,pd in enumerate(['ZeroBias','BTagMu','JetMET0','DisplacedJet']):
wf_number = base_wf
wf_number = wf_number + offset_era * e_n
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.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_10k"
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]]

# 2023
base_wf = 2023
for e_n,era in enumerate(['Run2023D']):
for p_n,pd in enumerate(['MuonEG','DisplacedJet','ZeroBias']):
wf_number = base_wf
wf_number = wf_number + offset_era * e_n
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.replace("ParkingDouble","Park2") + era.split("Run")[1] + "_10k"
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
for e_n,era in enumerate(['Run2022C']):
for p_n,pd in enumerate(['JetHT','EGamma','ZeroBias']):
wf_number = base_wf
wf_number = wf_number + offset_era * e_n
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"
y = str(base_wf)
for e_n,era in enumerate(era_mask_2024):
for p_n,pd in enumerate(pds_2024):
wf_number = round(base_wf + offset_era * e_n + offset_pd * p_n,3)
dataset = "/" + pd + "/" + era + "-v1/RAW"
step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1]
suff = "ZB_" if "ZeroBias" in step_name else ""
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]
workflows[wf_number] = ['',[step_name,'HLTDR3_2024','RECONANORUN3_' + suff + 'reHLT_2024','HARVESTRUN3_' + suff + '2024']]

##################################################################

Expand Down
17 changes: 16 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@
###2024

pds_2024 = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias']
eras_2024 = ['Run2024B', 'Run2024C', 'Run2024D', 'Run2024E', 'Run2024F']
eras_2024 = ['Run2024B', 'Run2024C', 'Run2024D', 'Run2024E', 'Run2024F','Run2024G','Run2024H','Run2024I']
for era in eras_2024:
for pd in pds_2024:
dataset = "/" + pd + "/" + era + "-v1/RAW"
Expand Down Expand Up @@ -699,6 +699,21 @@
steps[step_name] = {'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=int(evs*1e6), skimEvents=True, location='STD')}


### 2024 single lumi mask wfs for the limited matrix only
### Mask chosen from golden json away from run start

good_runs_2024 = [379238,379454,380360,381079,382258,383814,385889,386593]
lumi_mask_2024 = [{ r : [[110, 111]]} for r in good_runs_2024]
era_mask_2024 = dict(zip(eras_2024,lumi_mask_2024))

for era in era_mask_2024:
for pd in pds_2024:
dataset = "/" + pd + "/" + era + "-v1/RAW"
lm = era_mask_2024[era]
step_name = "Run" + pd.replace("ParkingDouble","Park2") + era.split("Run")[1]
steps[step_name]={'INPUT':InputInfo(dataSet=dataset,label=era.split("Run")[1],events=100000,location='STD', ls=lm)}


##################################################################

# Highstat HLTPhysics
Expand Down
14 changes: 10 additions & 4 deletions Configuration/PyReleaseValidation/scripts/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,18 @@ pp Data reRECO workflows:
| 2022 | | | | |
| 2022.002001 | Run2022D ZeroBias | run3_hlt_relval + run3_data_relval | Run3 | HLT:@relval2022 |
| 2022.000001 | Run2022D JetHT | run3_hlt_relval + run3_data_relval | Run3 | HLT:@relval2022 |
| 2023 | | | | |
| 2023.002001 | Run2023D ZeroBias | run3_hlt_relval + run3_data_relval| Run3_2023 | HLT:@relval2023 |
| 2023.000001 | Run2023D MuonEG | run3_hlt_relval + run3_data_relval| Run3_2023 | HLT:@relval2023 |
| 2024.000001 | Run2024B ZeroBias | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2023 |
| 2024.101001 | Run2024C BTagMu | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 2024.202001 | Run2024D JetMET0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 2024.303001 | Run2024E RunDisplacedJet | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 2024 | | | | |
| 145.014 | Run2024B ZeroBias | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.104 | Run2024C JetMet0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.202 | Run2024D EGamma0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.301 | Run2024E DisplacedJet | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.408 | Run2024B ParkingDoubleMuonLowMass0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.500 | Run2024B BTagMu | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.604 | Run2024B JetMET0 | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |
| 145.713 | Run2024B Tau | run3_hlt_relval + run3_data_prompt_relval| Run3_2024 | HLT:@relval2025 |

And Heavy Ion workflows:

Expand Down
18 changes: 10 additions & 8 deletions Configuration/PyReleaseValidation/scripts/runTheMatrix.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,20 @@ def runSelected(opt):
139.001, # Run2021 MinimumBias Commissioning2021

# 2022
2022.002001, # Run2022C ZeroBias
2022.000001, # Run2022C JetHT
140.045, # Run2022C JetHT

# 2023
2023.002001, # Run2023D ZeroBias
2023.002001, # Run2023D MuonEG
141.042, # Run2023D ZeroBias

# 2024
2024.000001, # Run2024B ZeroBias
2024.101001, # Run2024C BTagMu
2024.202001, # Run2024D JetMET0
2024.303001, # Run2024E DisplacedJet
145.014, # Run2024B ZeroBias
145.104, # Run2024C JetMet0
145.202, # Run2024D EGamma0
145.301, # Run2024E DisplacedJet
145.408, # Run2024F ParkingDoubleMuonLowMass0
145.500, # Run2024G BTagMu
145.604, # Run2024H JetMET0
145.713, # Run2024I Tau

###### Heavy Ions
## Data
Expand Down

0 comments on commit 2a35b60

Please sign in to comment.