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.

Sign up for GitHub

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

remove 2022 HLT menu from CMSSW_13_X_Y [13_0_X] #41663

Merged
merged 3 commits into from
May 16, 2023
Merged

remove 2022 HLT menu from CMSSW_13_X_Y [13_0_X] #41663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5c9271
remove frozen 2022-v1.5 HLT menu
missirol Apr 27, 2023
c8a422c
add 12434.7 wf (2023 ttbar mkFit) and improve customizeHLTIter0ToMkFit
missirol Apr 29, 2023
69c657f
use FakeHLT sequences for DQM and Validation in pre-2023 wfs
missirol Apr 29, 2023
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
4 changes: 0 additions & 4 deletions Configuration/HLT/python/autoCondHLT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2023_v1_1_0-v2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-05-02 08:03:44.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2023_v1_1_0-v2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-05-02 08:03:44.000"] ), ),
'2022v15' : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
'2023v11' : ( ','.join( [ 'L1Menu_Collisions2023_v1_1_0-v2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-05-02 08:03:44.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2022_v1_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-10-26 10:46:29.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
Expand All @@ -37,7 +36,6 @@
'run2_mc_Fake2' : ('run2_mc' ,l1Menus['Fake2']),
'run3_mc_FULL' : ('phase1_2023_realistic' ,l1Menus['FULL']),
'run3_mc_GRun' : ('phase1_2023_realistic' ,l1Menus['GRun']),
'run3_mc_2022v15' : ('phase1_2022_realistic' ,l1Menus['2022v15']),
'run3_mc_2023v11' : ('phase1_2023_realistic' ,l1Menus['2023v11']),
'run3_mc_HIon' : ('phase1_2023_realistic_hi',l1Menus['HIon']),
'run3_mc_PIon' : ('phase1_2023_realistic' ,l1Menus['PIon']),
Expand All @@ -49,7 +47,6 @@
'run2_hlt_Fake2' : ('run2_hlt_relval' ,l1Menus['Fake2']),
'run3_hlt_FULL' : ('run3_hlt' ,l1Menus['FULL']),
'run3_hlt_GRun' : ('run3_hlt' ,l1Menus['GRun']),
'run3_hlt_2022v15' : ('run3_hlt' ,l1Menus['2022v15']),
'run3_hlt_2023v11' : ('run3_hlt' ,l1Menus['2023v11']),
'run3_hlt_HIon' : ('run3_hlt' ,l1Menus['HIon']),
'run3_hlt_PIon' : ('run3_hlt' ,l1Menus['PIon']),
Expand All @@ -61,7 +58,6 @@
'run2_data_Fake2' : ('run2_data' ,l1Menus['Fake2']),
'run3_data_FULL' : ('run3_data_prompt' ,l1Menus['FULL']),
'run3_data_GRun' : ('run3_data_prompt' ,l1Menus['GRun']),
'run3_data_2022v15' : ('run3_data_prompt' ,l1Menus['2022v15']),
'run3_data_2023v11' : ('run3_data_prompt' ,l1Menus['2023v11']),
'run3_data_HIon' : ('run3_data_prompt' ,l1Menus['HIon']),
'run3_data_PIon' : ('run3_data_prompt' ,l1Menus['PIon']),
Expand Down
2 changes: 1 addition & 1 deletion Configuration/HLT/python/autoHLT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'relval2016' : 'Fake2',
'relval2017' : 'Fake2',
'relval2018' : 'Fake2',
'relval2022' : '2022v15',
'relval2022' : 'Fake2',
'relval2023' : '2023v11',
'relval2026' : '75e33',
'test' : 'GRun',
Expand Down
6 changes: 2 additions & 4 deletions Configuration/PyReleaseValidation/python/MatrixReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
self.relvalModule.steps,
[(x,refRel) for x in self.relvalModule.baseDataSetRelease]
)


for num, wfInfo in self.relvalModule.workflows.items():
commands=[]
Expand Down Expand Up @@ -248,8 +247,7 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
stepList.pop(0)
#print "\t\tmod",stepList
break



for (stepI,step) in enumerate(stepList):
stepName=step
if self.relvalModule.steps[stepName] is None:
Expand All @@ -258,7 +256,7 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
#cannot put a certain number of things in wm
if stepName in ['SKIMD','SKIMCOSD','SKIMDreHLT']:
continue

#replace stepName is needed
#if stepName in self.replaceStep
if len(name) > 0 : name += '+'
Expand Down
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
# (QCD 1.8TeV DeepCore)
# (TTbar DigiNoHLT)
# 2023 (TTbar, TTbar PU, TTbar PU premix)
# (TTbar trackingMkFit)
# (TTbar FastSim)
# 2024 (TTbar, TTbar PU, TTbar PU premix)
numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
Expand Down Expand Up @@ -82,6 +83,7 @@
11723.17,
11634.601,
12434.0,12634.0,12634.99,
12434.7,
14034.0,
12834.0,13034.0,13034.99,]
for numWF in numWFIB:
Expand Down
1 change: 0 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_standard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,4 +785,3 @@

### pPb Run2 ###
workflows[281]= ['',['EPOS_PPb_8160GeV_MinimumBias','DIGIUP15_PPb','RECOUP15_PPb','HARVESTUP15_PPb']]

54 changes: 35 additions & 19 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3956,7 +3956,7 @@ def gen2021HiMix(fragment,howMuch):
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}

upgradeStepDict['HLTRun3'][k] = {'-s':'HLT:%s'%(hltversion),
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
Expand All @@ -3965,7 +3965,7 @@ def gen2021HiMix(fragment,howMuch):
'--geometry' : geom,
'--outputCommands' : '"drop *_*_*_GEN,drop *_*_*_DIGI2RAW"'
}

upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:@relval2026',
'--processName':'HLTX',
'--conditions':gt,
Expand All @@ -3974,7 +3974,7 @@ def gen2021HiMix(fragment,howMuch):
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}

upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
Expand Down Expand Up @@ -4023,21 +4023,29 @@ def gen2021HiMix(fragment,howMuch):
'--filetype':'DQM',
}

upgradeStepDict['HARVESTNano'][k]={'-s':'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
upgradeStepDict['HARVESTFakeHLT'][k]={'-s':'HARVESTING:@standardValidationNoHLT+@standardDQMFakeHLT+@miniAODValidation+@miniAODDQM',
'--conditions':gt,
'--mc':'',
'--geometry' : geom,
'--scenario' : 'pp',
'--filetype':'DQM',
}

upgradeStepDict['HARVESTFakeHLT'][k]={'-s':'HARVESTING:@standardValidationNoHLT+@standardDQMFakeHLT+@miniAODValidation+@miniAODDQM',
'--conditions':gt,
'--mc':'',
'--geometry' : geom,
'--scenario' : 'pp',
'--filetype':'DQM',
}
}

upgradeStepDict['HARVESTNano'][k]={'-s': 'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
'--conditions': gt,
'--mc': '',
'--geometry': geom,
'--scenario': 'pp',
'--filetype': 'DQM',
}

upgradeStepDict['HARVESTNanoFakeHLT'][k]={'-s': 'HARVESTING:@standardValidationNoHLT+@standardDQMFakeHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
'--conditions': gt,
'--mc': '',
'--geometry': geom,
'--scenario': 'pp',
'--filetype': 'DQM',
}

upgradeStepDict['HARVESTGlobal'][k] = merge([{'-s': 'HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM'}, upgradeStepDict['HARVEST'][k]])

Expand All @@ -4059,7 +4067,7 @@ def gen2021HiMix(fragment,howMuch):
'--fast':'',
'--geometry' : geom,
'--relval':'27000,3000'}

upgradeStepDict['HARVESTFast'][k]={'-s':'HARVESTING:validationHarvesting',
'--conditions':gt,
'--mc':'',
Expand All @@ -4076,7 +4084,7 @@ def gen2021HiMix(fragment,howMuch):
'--eventcontent':'FEVTDEBUGHLT,MINIAODSIM,NANOEDMAODSIM,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,MINIAODSIM,NANOAODSIM,DQMIO',
}

upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--mc':'',
Expand All @@ -4085,7 +4093,7 @@ def gen2021HiMix(fragment,howMuch):
'--scenario':'pp',
'--filetype':'DQM',
'--filein':'file:step2_inDQM.root'}

upgradeStepDict['Nano'][k] = {'-s':'NANO,DQM:@nanoAODDQM',
'--conditions':gt,
'--datatier':'NANOAODSIM,DQMIO',
Expand All @@ -4094,15 +4102,23 @@ def gen2021HiMix(fragment,howMuch):
'--filein':'file:step3_inMINIAODSIM.root',
'--geometry' : geom
}

upgradeStepDict['RecoNano'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO,MINIAODSIM,NANOAODSIM,DQMIO',
'-n':'10',
'--eventcontent':'RECOSIM,MINIAODSIM,NANOEDMAODSIM,DQM',
'--geometry' : geom
'--geometry' : geom,
}


upgradeStepDict['RecoNanoFakeHLT'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,NANO,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO,MINIAODSIM,NANOAODSIM,DQMIO',
'-n':'10',
'--eventcontent':'RECOSIM,MINIAODSIM,NANOEDMAODSIM,DQM',
'--geometry' : geom,
}

# setup baseline and variations
for specialType,specialWF in upgradeWFs.items():
specialWF.setup(upgradeStepDict, k, upgradeProperties[year][k])
Expand Down
9 changes: 5 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ def makeStepName(key,frag,step,suffix):
stepList[specialType].append(stepMaker(key,frag[:-4],step,specialWF.suffix))
# hack to add an extra step
if 'ProdLike' in specialType:
if 'Reco' in step: # handles both Reco and RecoGlobal
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('RecoNano','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
if 'RecoNano' in step:
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoNano','Nano'),specialWF.suffix))
if 'Reco' in step: # handles both Reco, RecoFakeHLT and RecoGlobal
stepWoFakeHLT = step.replace('FakeHLT','') # ignore "FakeHLT" from step
stepList[specialType].append(stepMaker(key,frag[:-4],stepWoFakeHLT.replace('RecoGlobal','MiniAOD').replace('RecoNano','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
if 'RecoNano' in stepWoFakeHLT:
stepList[specialType].append(stepMaker(key,frag[:-4],stepWoFakeHLT.replace('RecoNano','Nano'),specialWF.suffix))
# hack to add extra HLT75e33 step for Phase-2
if 'HLT75e33' in specialType:
if 'RecoGlobal' in step:
Expand Down
Loading