Skip to content

Commit 3c3854f

Browse files
committed
Adding support for ScoutingMonitorPF for 2025
1 parent 42a486c commit 3c3854f

File tree

3 files changed

+33
-12
lines changed

3 files changed

+33
-12
lines changed

Configuration/PyReleaseValidation/python/relval_data_highstats.py

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,22 @@
2222
wf_number = wf_number + offset_events * evs
2323
wf_number = round(wf_number,6)
2424

25-
## ZeroBias have their own HARVESTING
26-
suff = 'ZB_' if 'ZeroBias' in pd else ''
27-
28-
recosetup = 'RECONANORUN3_' + suff + 'reHLT_2025'
25+
## ZeroBias has its own RECO and HARVESTING setup
26+
## ScoutingPFMonitor has its own HLT, RECO and HARVESTING setup
27+
recoharv = hlt = ''
28+
if 'ZeroBias' in pd:
29+
recoharv = 'ZB_'
30+
elif 'ScoutingPFMonitor' in pd:
31+
hlt = recoharv = 'ScoutingPFMonitor_'
32+
33+
recosetup = 'RECONANORUN3_' + recoharv + 'reHLT_2025'
2934

3035
y = str(int(base_wf))
31-
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1] + '_' + e_key
32-
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]
36+
37+
## this is because ParkingDouble* PDs would end up with a too long name for the submission infrastructure
38+
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1] + '_' + e_key
39+
40+
workflows[wf_number] = ['',[step_name,'HLTDR3_' + hlt + y,'RECONANORUN3_' + recoharv + 'reHLT_'+y,'HARVESTRUN3_' + recoharv + y]]
3341

3442
## 2024
3543
base_wf = 2024.0
@@ -45,7 +53,7 @@
4553
## Here we use JetMET1 PD to run the TeVJet skims
4654
skim = 'TeVJet' if pd == 'JetMET1' else ''
4755

48-
## ZeroBias have their own HARVESTING
56+
## ZeroBias has its own RECO and HARVESTING setup
4957
suff = 'ZB_' if 'ZeroBias' in pd else ''
5058

5159
# Running C,D,E with the offline GT.
@@ -54,7 +62,10 @@
5462
recosetup = recosetup if era[-1] > 'E' else recosetup + '_Offline'
5563

5664
y = str(int(base_wf))
65+
66+
## this is because ParkingDouble* PDs would end up with a too long name for the submission infrastructure
5767
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1] + skim + '_' + e_key
68+
5869
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]
5970

6071
## 2023
@@ -67,7 +78,10 @@
6778
wf_number = wf_number + offset_pd * p_n
6879
wf_number = wf_number + offset_events * evs
6980
wf_number = round(wf_number,6)
81+
82+
## this is because ParkingDouble* PDs would end up with a too long name for the submission infrastructure
7083
step_name = 'Run' + pd.replace('ParkingDouble','Park2') + era.split('Run')[1] + '_' + e_key
84+
7185
y = str(int(base_wf)) + 'B' if '2023B' in era else str(int(base_wf))
7286
suff = 'ZB_' if 'ZeroBias' in step_name else ''
7387
workflows[wf_number] = ['',[step_name,'HLTDR3_' + y,'RECONANORUN3_' + suff + 'reHLT_'+y,'HARVESTRUN3_' + suff + y]]

Configuration/PyReleaseValidation/python/relval_steps.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
# the files used as input
656656

657657
###2025
658-
pds_2025 = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias','JetMET1']
658+
pds_2025 = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias','JetMET1','ScoutingPFMonitor']
659659
eras_2025 = ['Run2025B', 'Run2025C','Run2025D','Run2025E', 'Run2025F','Run2025G','Run2025H','Run2025I']
660660
for era in eras_2025:
661661
for pd in pds_2025:
@@ -2329,6 +2329,11 @@ def lhegensim2018ml(fragment,howMuch):
23292329
{'--filein' : '/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/Scouting/Run3/ScoutingPFMonitor/300684ed-1a51-474f-8c4f-b3bf1e1f5044_skimmed.root'},
23302330
steps['HLTD'] ] )
23312331

2332+
steps['HLTDR3_ScoutingPFMonitor_2025']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2025,},
2333+
{'--conditions':'auto:run3_hlt_relval'},
2334+
{'--era' : 'Run3_2025'},
2335+
steps['HLTD'] ] )
2336+
23322337
steps['HLTDR3_HI2023ARawprime']=merge([{'-s':'L1REPACK:Full,HLT:HIon'},
23332338
{'--conditions':'auto:run3_hlt_HIon'},
23342339
{'--era' : 'Run3_pp_on_PbPb_approxSiStripClusters_2023'},
@@ -3302,6 +3307,7 @@ def gen2024HiMix(fragment,howMuch):
33023307
steps['RECONANORUN3_ZB_reHLT_2025']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT_2025']])
33033308

33043309
steps['RECONANORUN3_ScoutingPFMonitor_reHLT_2024']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM+@hltScouting'},steps['RECONANORUN3_reHLT_2024']])
3310+
steps['RECONANORUN3_ScoutingPFMonitor_reHLT_2025']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@standardDQM+@miniAODDQM+@nanoAODDQM+@hltScouting'},steps['RECONANORUN3_reHLT_2025']])
33053311

33063312
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']])
33073313

@@ -4116,6 +4122,7 @@ def gen2024HiMix(fragment,howMuch):
41164122
# 2025
41174123
steps['HARVESTRUN3_ZB_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']])
41184124
steps['HARVESTRUN3_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']])
4125+
steps['HARVESTRUN3_ScoutingPFMonitor_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM+@hltScouting'},steps['HARVESTDRUN3']])
41194126
# HI
41204127
steps['HARVESTRUN3_HI2023A']=merge([{'--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM'},steps['HARVESTRUN3_2022']])
41214128

Configuration/PyReleaseValidation/scripts/das-up-to-nevents.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,17 @@ def no_intersection():
149149
if os.path.isdir(cert_path):
150150
json_list = os.listdir(cert_path)
151151
if len(json_list) == 0:
152-
web_fallback == True
153-
json_list = [c for c in json_list if "Golden" in c and "era" not in c]
154-
json_list = [c for c in json_list if c.startswith("Cert_C") and c.endswith("json")]
152+
web_fallback == True
153+
json_list = [c for c in json_list if "golden" in c.lower() and "era" not in c.lower()]
154+
json_list = [c for c in json_list if c.lower().startswith("cert_c") and c.endswith("json")]
155155
else:
156156
web_fallback = True
157157
## ... if not we go to the website
158158
if web_fallback:
159159
cert_url = base_cert_url + cert_type + "/"
160160
json_list = get_url_clean(cert_url).split("\n")
161161
json_list = [c for c in json_list if "golden" in c.lower() and "era" not in c.lower() and "cert_c" in c.lower()]
162-
json_list = [[cc for cc in c.split(" ") if cc.startswith("Cert_C") and cc.endswith("json")][0] for c in json_list]
162+
json_list = [[cc for cc in c.split(" ") if cc.lower().startswith("cert_c") and cc.endswith("json")][0] for c in json_list]
163163

164164
# the larger the better, assuming file naming schema
165165
# Cert_X_RunStart_RunFinish_Type.json

0 commit comments

Comments
 (0)