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

Adding PU in 2019 scenario #26463

Merged
merged 7 commits into from
Apr 25, 2019
Merged

Adding PU in 2019 scenario #26463

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc5a4ab
Adding PU in 2019
boudoul Apr 16, 2019
5d1686e
Cleaning my leftover XX
boudoul Apr 16, 2019
d3c8141
Using hlt208 instead of 2017 within the 2019 WF
boudoul Apr 16, 2019
6f5ef4a
back to hlt2017
boudoul Apr 16, 2019
19a8e8e
Keeping WF numbering intact
boudoul Apr 17, 2019
9a60d48
Kevin did all the work ...
boudoul Apr 17, 2019
89b27ae
adding MinBias PU
boudoul Apr 24, 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
6 changes: 4 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2932,8 +2932,8 @@ def gen2018HiMix(fragment,howMuch):
defaultDataSets['2017Design']='CMSSW_10_0_0_pre2-100X_mc2017_design_IdealBS_v1-v'
defaultDataSets['2018']='CMSSW_10_5_0_pre1-103X_upgrade2018_realistic_v8-v'
defaultDataSets['2018Design']='CMSSW_10_5_0_pre1-103X_upgrade2018_design_v4-v'
#defaultDataSets['2019']=''
#defaultDataSets['2019Design']=''
defaultDataSets['2019']=''
defaultDataSets['2019Design']=''
defaultDataSets['2023D17']='CMSSW_10_2_0_pre2-101X_upgrade2023_realistic_v5_2023D17noPU-v'
defaultDataSets['2023D19']=''
defaultDataSets['2023D21']=''
Expand Down Expand Up @@ -2977,6 +2977,8 @@ def gen2018HiMix(fragment,howMuch):
PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
elif '2018' in name:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
elif '2019' in name:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
Copy link
Contributor

Choose a reason for hiding this comment

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

The Run3 GT 105X_postLS2_realistic_v6-v1 does NOT have the string "2019". So these two lines will not work for pileup.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah too bad this is unfortunate that Alca didn't follow the usual pattern, I will make a workaround meanwhile and add the minbias you produced - Thanks for having noticed

elif '2023' in name:
PUDataSets[ds]={'-n':10,'--pileup':'AVE_200_BX_25ns','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)}
else:
Expand Down
12 changes: 9 additions & 3 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
'2018Design',
'2018DesignPU',
'2019',
# '2019PU',
'2019PU',
Copy link
Contributor

Choose a reason for hiding this comment

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

@boudoul I guess this line with the corresponding changed order is the responsible of the visible difference in the standard matrix:

< 12024.0 TTbar_13TeV_TuneCUETP8M1_2019Design_GenSimFull+DigiFull_2019Design+RecoFull_2019Design+HARVESTFull_2019Design 
---
> 12024.0 TTbar_13TeV_TuneCUETP8M1_2019PU_GenSimFull+DigiFullPU_2019PU+RecoFullPU_2019PU+HARVESTFullPU_2019PU+NanoFull_2019PU

Not a problem in itself, just to be aware of it

Copy link
Contributor

@prebello prebello Apr 16, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Hi @boudoul @fabiocos this number is related to TTbar Design in IB as you can see at
https://github.com/cms-sw/cmssw/blob/master/Configuration/PyReleaseValidation/python/relval_2017.py

When you change https://github.com/cms-sw/cmssw/blob/master/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py, moving the comment of line 17, you will change the order of the wfs numbers.

We had a similar problem in the past (when we started 2017 relvals) and to keep all under control @kpedro88 has changed something at
numWFConflict = [[11800,12000],[12200,12400],[20800,21200],[21600,22400],[25000,26000],[50000,51000]]

Maybe increasing the range [11800,12000] would work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok yes I will try to keep the WF numbers unchanged in a next commit later today

Copy link
Contributor

Choose a reason for hiding this comment

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

If you are activating the 2019 PU workflows, you should remove the ranges [11800,12000],[12200,12400] from the conflict list. These were reserved for that purpose.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah you're right- I missed your comment I just re-oreder to preserve but actually what you wrote makes more sense - Let me fix in a next commit

'2019Design',
# '2019DesignPU',
'2019DesignPU',
]

upgradeKeys[2023] = [
Expand Down Expand Up @@ -65,7 +65,7 @@
}
numWFSkip=200
# temporary measure to keep other WF numbers the same
numWFConflict = [[11800,12000],[12200,12400],[20800,21200],[21600,22400],[25000,26000],[50000,51000]]
numWFConflict = [[20800,21200],[21600,22400],[25000,26000],[50000,51000]]
numWFAll={
2017: [],
2023: []
Expand Down Expand Up @@ -299,11 +299,17 @@
upgradeProperties[2017]['2017PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
upgradeProperties[2017]['2017DesignPU'] = deepcopy(upgradeProperties[2017]['2017Design'])
upgradeProperties[2017]['2017DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']

upgradeProperties[2017]['2018PU'] = deepcopy(upgradeProperties[2017]['2018'])
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]['2019PU'] = deepcopy(upgradeProperties[2017]['2019'])
upgradeProperties[2017]['2019PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull']
upgradeProperties[2017]['2019DesignPU'] = deepcopy(upgradeProperties[2017]['2019Design'])
upgradeProperties[2017]['2019DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']

upgradeProperties[2023] = {
'2023D17' : {
'Geom' : 'Extended2023D17',
Expand Down