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

Jump to bottom

Add stuck tbm as special workflows #1

Closed
wants to merge 2 commits into from
Closed

Add stuck tbm as special workflows #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5785dd
revert new WF
kpedro88 Jan 11, 2019
fd91d3a
add special killStuckTBM workflows
kpedro88 Jan 11, 2019
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
3 changes: 1 addition & 2 deletions Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
10801.0,10802.0,10803.0,10804.0,10805.0,10806.0,10807.0,10808.0,10809.0,10859.0,10871.0,
10842.0,10824.0,10825.0,10826.0,10823.0,11024.0,11025.0,11224.0,
10824.1,10824.5,
12424.0,12442.0,
10824.6,11024.6,11224.6,
10824.7,10842.7,
11642.0,11624.0,11625.0,11626.0,11623.0,11824.0,11825.0,12024.0]

for numWF in numWFIB:
if not numWF in _upgrade_workflows: continue
workflows[numWF] = _upgrade_workflows[numWF]
13 changes: 4 additions & 9 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2894,15 +2894,6 @@ def gen2018HiMix(fragment,howMuch):
'--geometry' : geom
}

upgradeStepDict['DigiKillPixelStuckTBM'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:%s'%(hltversion),
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom,
'--customise': 'SimTracker/SiPixelDigitizer/customiseStuckTBMSimulation.activateStuckTBMSimulation2018NoPU'
}

# Adding Track trigger step in step2
upgradeStepDict['DigiFullTrigger'][k] = {'-s':'DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:%s'%(hltversion),
'--conditions':gt,
Expand Down Expand Up @@ -3038,6 +3029,10 @@ def gen2018HiMix(fragment,howMuch):
stepName = step + upgradeSteps['heCollapse']['suffix']
upgradeStepDict[stepName][k] = merge([{'--procModifiers': 'run2_HECollapse_2018'}, upgradeStepDict[step][k]])

for step in upgradeSteps['killStuckTBM']['steps']:
stepName = step + upgradeSteps['killStuckTBM']['suffix']
upgradeStepDict[stepName][k] = merge([{'--customise': 'SimTracker/SiPixelDigitizer/customiseStuckTBMSimulation.activateStuckTBMSimulation2018NoPU'}, upgradeStepDict[step][k]])

# setup PU
if k2 in PUDataSets:
# Setup premixing stage1
Expand Down
6 changes: 6 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ def makeStepName(key,frag,step,suffix):
neutronKeys = ['2023D17','2023D19','2023D21','2023D22','2023D23','2023D24','2023D25','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35','2023D36','2023D37']
neutronFrags = ['ZMM_14','MinBias_14TeV']

tbmFrags = ['TTbar_13','ZMM_13']

#just define all of them

for year in upgradeKeys:
Expand Down Expand Up @@ -88,6 +90,10 @@ def makeStepName(key,frag,step,suffix):
if upgradeDatasetFromFragment[frag]=="TTbar_13" and '2018' in key:
workflows[numWF+upgradeSteps['heCollapse']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['heCollapse']]

# special workflows for stuck TBM
if any(upgradeDatasetFromFragment[frag]==nfrag for nfrag in tbmFrags) and '2018' in key:
workflows[numWF+upgradeSteps['killStuckTBM']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['killStuckTBM']]

# premixing stage1, only for NuGun
if upgradeDatasetFromFragment[frag]=="NuGun" and 'PU' in key and '2023' in key:
workflows[numWF+upgradeSteps['Premix']['offset']] = [upgradeDatasetFromFragment[frag], stepList['Premix']]
Expand Down
14 changes: 10 additions & 4 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
# '2019PU',
'2019Design',
# '2019DesignPU',
'2018KillStuckTBM'
]

upgradeKeys[2023] = [
Expand Down Expand Up @@ -85,7 +84,6 @@
'GenSimHLBeamSpotFull',
'GenSimHLBeamSpotFull14',
'DigiFull',
'DigiKillPixelStuckTBM',
'DigiFullTrigger',
'RecoFullLocal',
'RecoFull',
Expand Down Expand Up @@ -193,6 +191,16 @@
'suffix' : '_heCollapse',
'offset' : 0.6,
}
upgradeSteps['killStuckTBM'] = {
'steps' : [
'DigiFull',
],
'PU' : [
'DigiFull',
],
'suffix' : '_killStuckTBM',
'offset' : 0.7,
}
upgradeSteps['Premix'] = {
'steps' : [],
'PU': [
Expand Down Expand Up @@ -267,8 +275,6 @@
upgradeProperties[2017]['2018PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull']
upgradeProperties[2017]['2018DesignPU'] = deepcopy(upgradeProperties[2017]['2018Design'])
upgradeProperties[2017]['2018DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
upgradeProperties[2017]['2018KillStuckTBM'] = deepcopy(upgradeProperties[2017]['2018'])
upgradeProperties[2017]['2018KillStuckTBM']['ScenToRun'] = ['GenSimFull','DigiKillPixelStuckTBM','RecoFull','HARVESTFull']

upgradeProperties[2023] = {
'2023D17' : {
Expand Down