Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introducing DIGInoHLT + HLTOnly Steps #44964

Merged
merged 1 commit into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4180,6 +4180,7 @@ def gen2023HiMix(fragment,howMuch):
defaultDataSets['2023']='CMSSW_13_0_10-130X_mcRun3_2023_realistic_withEarly2023BS_v1_2023-v'
defaultDataSets['2023FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v'
defaultDataSets['2024']='CMSSW_14_0_0_pre3-140X_mcRun3_2024_realistic_v1_STD_2024_noPU-v'
defaultDataSets['2024HLTOnDigi']='CMSSW_14_0_0_pre3-140X_mcRun3_2024_realistic_v1_STD_2024_noPU-v'
defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v'
defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v'
defaultDataSets['2026D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v'
Expand Down Expand Up @@ -4296,7 +4297,22 @@ def gen2023HiMix(fragment,howMuch):
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}


upgradeStepDict['DigiNoHLT'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW',
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}

upgradeStepDict['HLTOnly'][k] = {'-s':'HLT:%s'%(hltversion),
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom,
}
# Adding Track trigger step in step2
upgradeStepDict['DigiTrigger'][k] = {'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:%s'%(hltversion),
'--conditions':gt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
'2022HIRP', #RawPrime
'2023HI',
'2023HIRP', #RawPrime
'2024HLTOnDigi',
'2024HLTOnDigiPU'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need space here? Maybe it can be fixed later when new workflow comes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really, right. Let me fix it in one of the other PRs I have or will open on upgrade wfs.

]

upgradeKeys[2026] = [
Expand Down Expand Up @@ -198,8 +201,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GenSimHLBeamSpot14',
'GenSimHLBeamSpotHGCALCloseBy',
'Digi',
'DigiNoHLT',
'DigiTrigger',
'HLTRun3',
'HLTOnly',
'RecoLocal',
'Reco',
'RecoFakeHLT',
Expand All @@ -226,6 +231,8 @@ def condition(self, fragment, stepList, key, hasHarvest):
'RecoLocal',
'RecoGlobal',
'Digi',
'DigiNoHLT',
'HLTOnly',
'Reco',
'RecoFakeHLT',
'RecoNano',
Expand Down Expand Up @@ -253,7 +260,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
stepDict[stepName][k] = None
if 'RecoNano' in step:
stepDict[stepName][k] = merge([{'--filein': 'file:step3.root', '--secondfilein': 'file:step2.root'}, stepDict[step][k]])
if 'Digi' in step:
if 'Digi' in step and 'NoHLT' not in step:
stepDict[stepName][k] = merge([{'-s': re.sub(',HLT.*', '', stepDict[step][k]['-s'])}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
if ('TTbar_14TeV' in fragment and '2021' == key):
Expand Down Expand Up @@ -428,13 +435,14 @@ def condition_(self, fragment, stepList, key, hasHarvest):

class UpgradeWorkflow_trackingMkFit(UpgradeWorkflowTracking):
def setup__(self, step, stepName, stepDict, k, properties):
if 'Digi' in step: stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
if ('Digi' in step and 'NoHLT' not in step) or ('HLTOnly' in step): stepDict[stepName][k] = merge([self.step2, stepDict[step][k]])
if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]])
def condition_(self, fragment, stepList, key, hasHarvest):
return ('2017' in key or '2021' in key or '2023' in key or '2024' in key) and ('FS' not in key)
upgradeWFs['trackingMkFit'] = UpgradeWorkflow_trackingMkFit(
steps = [
'Digi',
'HLTOnly',
'DigiTrigger',
'Reco',
'RecoFakeHLT',
Expand Down Expand Up @@ -826,6 +834,7 @@ def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs):
super(PatatrackWorkflow, self).__init__(
steps = [
'Digi',
'HLTOnly',
'DigiTrigger',
'Reco',
'RecoFakeHLT',
Expand All @@ -844,6 +853,7 @@ def __init__(self, digi = {}, reco = {}, mini = {}, harvest = {}, **kwargs):
],
PU = [
'Digi',
'HLTOnly',
'DigiTrigger',
'Reco',
'RecoFakeHLT',
Expand Down Expand Up @@ -887,7 +897,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
# skip ALCA and Nano steps (but not RecoNano or HARVESTNano for Run3)
if 'ALCA' in step or 'Nano'==step:
stepDict[stepName][k] = None
elif 'Digi' in step:
elif ('Digi' in step and "NoHLT" not in step) or 'HLTOnly' in step:
if self.__digi is None:
stepDict[stepName][k] = None
else:
Expand Down Expand Up @@ -1922,7 +1932,7 @@ def condition(self, fragment, stepList, key, hasHarvest):

class UpgradeWorkflow_L1Complete(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Digi' in step:
if 'Digi' in step and 'NoHLT' not in step:
stepDict[stepName][k] = merge([{'-s': 'DIGI:pdigi_valid,L1,L1TrackTrigger,L1P2GT,DIGI2RAW,HLT:@relval2026'}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return '2026' in key
Expand Down Expand Up @@ -2087,7 +2097,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
if 'Sim' in step:
if self.__ecalMod is not None:
stepDict[stepName][k] = merge([{'--procModifiers':self.__ecalMod},stepDict[step][k]])
if 'Digi' in step:
if 'Digi' in step and 'NoHLT' not in step:
if self.__ecalMod is not None:
stepDict[stepName][k] = merge([{'--procModifiers':self.__ecalMod},stepDict[step][k]])
if self.__ecalTPPh2 is not None:
Expand Down Expand Up @@ -2858,6 +2868,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
'BeamSpot': 'DBrealistic',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2024HLTOnDigi' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2024_realistic',
'HLTmenu': '@relval2024',
'Era' : 'Run3',
'BeamSpot': 'DBrealistic',
'ScenToRun' : ['GenSim','DigiNoHLT','HLTOnly','RecoNano','HARVESTNano','ALCA'],
},
'2021FS' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2022_realistic',
Expand Down