Add HFlav for ParkingDoubleMu

Author: AdrianoDee

Configuration/PyReleaseValidation/python/relval_data_highstats.py

@@ -12,9 +12,21 @@ def run3NameMod(name):
     # ParkingDouble* PDs would end up with a too long name for the submission infrastructure
     return name.replace('ParkingDouble','Park2') 
 
+def run3HarvMod(pd):
+    ## ZeroBias, ScoutingPFMonitor and ParkingDoubleMuonLowMass 
+    ## have their own HARVESTING setup
+    if 'ZeroBias' in pd:
+        return 'ZB_'
+    elif 'ScoutingPFMonitor' in pd:
+        return 'ScoutingPFMonitor_'
+    elif 'ParkingDoubleMuonLowMass' in pd:
+        return 'HFLAV_'
+    else:
+        return ''
+
 def run3RecoMod(pd):
     ## ZeroBias and ScoutingPFMonitor have 
-    ## their own RECO and HARVESTING setup
+    ## their own RECO setup
     if 'ZeroBias' in pd:
         return 'ZB_'
     elif 'ScoutingPFMonitor' in pd:
@@ -29,36 +41,39 @@ def run3HLTMod(pd):
     else:
         return ''
 
-def addFixedEventsWfs(years, pds, eras, suffreco = None, suffhlt = None, namemod = None):
+def addFixedEventsWfs(years, pds, eras, offset = 0, suffreco = None, suffhlt = None, suffharv = None, namemod = None):
 
     for y in years:
         for era in eras:
             for pd in pds:
                 for e_key,evs in event_steps_dict.items(): 
-                    ## ZeroBias have their own HARVESTING
-                    suff = 'ZB_' if 'ZeroBias' in pd else ''
 
                     wf_number = float(y) + offset_pd * pds.index(pd)
                     wf_number = wf_number + offset_era * eras.index(era)
+                    wf_number = wf_number + offset
                     wf_number = round(wf_number + offset_events * evs, 6)
 
                     # Here we customise the steps depending on the PD name                
-                    recoharv = suffreco(pd) if suffreco is not None else ''
-                    hlt = suffhlt(pd) if suffhlt is not None else ''
+                    reco = suffreco(pd) if suffreco is not None else ''
+                    harv = suffharv(pd) if suffharv is not None else ''
+                    hlt  = suffhlt(pd) if suffhlt is not None else ''
+                    name = namemod(pd) if namemod is not None else ''
 
-                    recosetup = 'RECONANORUN3_' + recoharv + 'reHLT_2025' 
-                    harvsetup = 'HARVESTRUN3_'  + recoharv + y
+                    recosetup = 'RECONANORUN3_' + reco + 'reHLT_2025' 
+                    harvsetup = 'HARVESTRUN3_'  + harv + y
                     hltsetup  = 'HLTDR3_' + hlt + y
 
-                    step_name = 'Run' + pd.replace('ParkingDouble','Park2') + y + era + '_' + e_key 
+                    step_name = 'Run' + name  + y + era + '_' + e_key 
                     if namemod is not None:
                         step_name = namemod(step_name)
 
                     workflows[wf_number] = ['',[step_name, hltsetup, recosetup, harvsetup]]
 
-run3FixedWfs = partial(addFixedEventsWfs,suffreco = run3RecoMod, suffhlt = run3HLTMod, namemod = run3NameMod)
+    return wf_number - float(y) #to concatenate the offset
+
+run3FixedWfs = partial(addFixedEventsWfs,suffreco = run3RecoMod, suffhlt = run3HLTMod, suffharv = run3HarvMod, namemod = run3NameMod)
 run3FixedWfs(['2025'],pds_2025,eras_2025)
 run3FixedWfs(['2024'],pds_2024,eras_2024)
 run3FixedWfs(['2023'],pds_2023,eras_2023)
-run3FixedWfs(['2022'],pds_2022_2,eras_2022_2)
-run3FixedWfs(['2022'],pds_2022_1,eras_2022_1)
+offset_2022 = run3FixedWfs(['2022'],pds_2022_2,eras_2022_2)
+run3FixedWfs(['2022'],pds_2022_1,eras_2022_1,offset = offset_2022)

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -661,7 +661,7 @@
 offset_events = 0.0001 # less than 10 event setups (10k,50k,150k,250k,500k,1M)
 
 #### PDs to run
-pds_2025  = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias','JetMET1','ScoutingPFMonitor']
+pds_2025  = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP0', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias','JetMET1','ScoutingPFMonitor']
 pds_2024  = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleMuonLowMass0', 'ParkingHH', 'ParkingLLP', 'ParkingSingleMuon0', 'ParkingVBF0', 'Tau', 'ZeroBias','JetMET1']
 pds_2023  = ['BTagMu', 'DisplacedJet', 'EGamma0', 'HcalNZS', 'JetMET0', 'Muon0', 'MuonEG', 'NoBPTX', 'ParkingDoubleElectronLowMass', 'ParkingDoubleMuonLowMass0', 'Tau', 'ZeroBias']
 pds_2022_1  = ['BTagMu', 'DisplacedJet', 'DoubleMuon', 'SingleMuon', 'EGamma', 'HcalNZS', 'JetHT', 'MET', 'MinimumBias', 'MuonEG', 'NoBPTX', 'Tau', 'ZeroBias']
@@ -4171,13 +4171,16 @@ def gen2024HiMix(fragment,howMuch):
 steps['HARVESTRUN3_ZB_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@rerecoZeroBiasFakeHLT+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])
 steps['HARVESTRUN3_ZB_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@rerecoZeroBiasFakeHLT+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2023']])
 steps['HARVESTRUN3_COS_2023']=merge([{'--scenario':'cosmics', '--era':'Run3_2023', '-s':'HARVESTING:dqmHarvesting'},steps['HARVESTRUN3_2022']])
+steps['HARVESTRUN3_HFLAV_2023']=merge([{'--era':'Run3_2024', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM+@heavyFlavor'},steps['HARVESTDRUN3']])
 # 2024
 steps['HARVESTRUN3_ZB_2024']=merge([{'--era':'Run3_2024', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']])
 steps['HARVESTRUN3_2024']=merge([{'--era':'Run3_2024', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']])
+steps['HARVESTRUN3_HFLAV_2024']=merge([{'--era':'Run3_2024', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM+@heavyFlavor'},steps['HARVESTDRUN3']])
 steps['HARVESTRUN3_ScoutingPFMonitor_2024']=merge([{'--era':'Run3_2024', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM+@hltScouting'},steps['HARVESTDRUN3']])
 # 2025
 steps['HARVESTRUN3_ZB_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']])
 steps['HARVESTRUN3_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTDRUN3']])
+steps['HARVESTRUN3_HFLAV_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM+@heavyFlavor'},steps['HARVESTDRUN3']])
 steps['HARVESTRUN3_ScoutingPFMonitor_2025']=merge([{'--era':'Run3_2025', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM+@hltScouting'},steps['HARVESTDRUN3']])
 # HI
 steps['HARVESTRUN3_HI2023A']=merge([{'--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM'},steps['HARVESTRUN3_2022']])