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

Backport FastSim2017 PU and pmx wfs to 10_2_X #25490

Merged
merged 12 commits into from
Jan 10, 2019
Merged

Backport FastSim2017 PU and pmx wfs to 10_2_X #25490

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32ca681
Test feature
nwickram Oct 8, 2018
24ebff8
cmssw
nwickram Oct 8, 2018
c0286cf
cmssw
nwickram Oct 8, 2018
71a7fdb
cmssw
nwickram Oct 8, 2018
682800c
cmssw
nwickram Oct 8, 2018
dddb97c
cmssw
nwickram Oct 9, 2018
03e1a2e
cmssw
nwickram Oct 9, 2018
36d8989
fix conflict
nwickram Oct 10, 2018
65d206a
added lines mistakenly taken out
ssekmen Dec 13, 2018
c2458c0
convert to gen-sim-digi-raw, fix index
ssekmen Dec 21, 2018
3dbf7e4
further fix index
ssekmen Dec 21, 2018
8ad1b41
changed fastsim minbias sample
ssekmen Jan 9, 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
10 changes: 10 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_pileup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,13 @@
workflows[25408] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[25409] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]

### fastsim 2017 ####
workflows[25400.17] = ['ZEE_13',["FS_ZEE_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[25402.17] = ['TTbar_13',["FS_TTbar_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[25403.17] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
#workflow[25404]
workflows[25405.17] = ['ZTT_13',["FS_ZTT_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[25406.17] = ['ZMM_13',["FS_ZMM_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[25407.17] = ['NuGun_UP17',["FS_NuGun_UP17_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[25408.17] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[25409.17] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
15 changes: 15 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_premix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,18 @@
workflows[250407] = ['NuGun_UP15',["FS_NuGun_UP15_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[250408] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[250409] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]

#fastsim, 2017 PU50####

## premixed minbias
workflows[250399.17]=['',['FS_PREMIXUP17_PU50']]
## signal + PU
workflows[250400.17] = ['ZEE_13',["FS_ZEE_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250402.17] = ['TTbar_13',["FS_TTbar_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250402.171] = ['TTbar_13',["FS_PREMIXUP17_PU50","FS_TTbar_13_PRMXLOCALUP17_PU50","HARVESTUP17FS"]]
workflows[250403.17] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250405.17] = ['ZTT_13',["FS_ZTT_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250406.17] = ['ZMM_13',["FS_ZMM_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250407.17] = ['NuGun_UP17',["FS_NuGun_UP17_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250408.17] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
workflows[250409.17] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]]
2 changes: 1 addition & 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 @@ -400,7 +400,7 @@
workflows[2017.13] = ['TTbar_13_UP17', ['TTbarFS_13_trackingOnlyValidation_UP17','HARVESTUP17FS_trackingOnly']]

### MinBias fastsim_13 TeV for mixing ###
workflows[2017.8] = ['',['MinBiasFS_13_ForMixing']]
workflows[2017.8] = ['',['MinBiasFS_13_UP17_ForMixing']]


### standard set ###
Expand Down
61 changes: 60 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,10 @@ def genS(fragment,howMuch):
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
'--relval':'27000,3000'},
step1Defaults])

step1FastPU17NewMixing =merge([{'-s':'GEN,SIM,RECOBEFMIX',
'--eventcontent':'FASTPU',
'--datatier':'GEN-SIM-RECO'},
step1FastUpg2017Defaults])
step1FastUpg2017_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
step1FastUpg2017Defaults])

Expand Down Expand Up @@ -975,11 +978,19 @@ def genS(fragment,howMuch):
steps['SingleMuPt10FS_UP17']=merge([{'cfg':'SingleMuPt10_pythia8_cfi'},step1FastUpg2017Defaults])
steps['SingleMuPt100FS_UP17']=merge([{'cfg':'SingleMuPt100_pythia8_cfi'},step1FastUpg2017Defaults])

### FastSim: produce sample of minbias events for PU mixing
steps['MinBiasFS_13_UP17_ForMixing']=merge([{'cfg':'MinBias_13TeV_pythia8_TuneCUETP8M1_cfi'},Kby(100,1000),step1FastPU17NewMixing])

### FastSim: template to produce signal and overlay with minbias events
PUFS25={'--pileup':'AVE_35_BX_25ns',
'--pileup_input':'das:/RelValMinBiasFS_13_ForMixing/%s/GEN-SIM-RECO'%(baseDataSetRelease[7],)}
FS_UP15_PU25_OVERLAY = merge([PUFS25,Kby(100,500),steps['TTbarFS_13']] )

### FastSim: template to produce signal and overlay with minbias events #PU50
PUFSAVE50={'--pileup':'AVE_50_BX_25ns',
'--pileup_input':'das:/RelValMinBiasFS_13_UP17_ForMixing/%s/GEN-SIM-RECO'%(baseDataSetRelease[17],)}
Copy link
Contributor

Choose a reason for hiding this comment

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

this line broke the matrix with "list index out of range"
please check on the contents of baseDataSetRelease

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, got it. @zhenhu , perhaps you can help. What would be the correct baseDataSetRelease name for this? I think one needs to add a specific 2017 or 2018 fastsim datasetrelease?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@zhenhu , in the end I set it to CMSSW_10_2_0-PU25ns_102X_mcRun2_asymptotic_v3_gcc7_FastSim-v1

FS_UP17_PU50_OVERLAY = merge([PUFSAVE50,Kby(100,500),steps['TTbarFS_13_UP17']] )

ssekmen marked this conversation as resolved.
Show resolved Hide resolved
### FastSim: produce sample of premixed minbias events
steps["FS_PREMIXUP15_PU25"] = merge([
{"cfg":"SingleNuE10_cfi",
Expand Down Expand Up @@ -1016,6 +1027,53 @@ def genS(fragment,howMuch):
key = "FS_" + x + "_UP15_PU25"
steps[key] = merge([{"cfg":steps[x]["cfg"]},FS_UP15_PU25_OVERLAY])

### FastSim: produce sample of premixed minbias events UP17
steps["FS_PREMIXUP17_PU50"] = merge([
{"cfg":"SingleNuE10_cfi",
"--fast":"",
"--conditions":"auto:phase1_2017_realistic",
"-s":"GEN,SIM,RECOBEFMIX,DIGI",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"-s":"GEN,SIM,RECOBEFMIX,DIGI",
"-s":"GEN,SIM,RECOBEFMIX,DIGI,L1,DIGI2RAW",

because #24184 is not in 10_2_X (see also #25513).

"--eventcontent":"PREMIX",
"--datatier":"PREMIX",
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe it would be better to keep the data tier as GEN-SIM-DIGI-RAW as in <= 2016 setup.

"--procModifiers":"premix_stage1",
"--era":"Run2_2017_FastSim",
},
PUFSAVE50,Kby(100,500)])

### Fastsim: template to produce signal and overlay it with premixed minbias events
FS_PREMIXUP17_PU50_OVERLAY = merge([
# {"-s" : "GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,DATAMIX,L1,DIGI2RAW,L1Reco,RECO,HLT:@relval2016,VALIDATION",
{"-s" : "GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,DATAMIX,L1,DIGI2RAW,L1Reco,RECO,VALIDATION",
"--datamix" : "PreMix",
"--procModifiers": "premix_stage2",
"--pileup_input" : "dbs:/RelValFS_PREMIXUP17_PU50/%s/PREMIX"%(baseDataSetRelease[18],),
Copy link
Contributor

Choose a reason for hiding this comment

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

the index here is also out of bounds

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, fixed.

},
Kby(100,500),step1FastUpg2017Defaults])

# For combined premixing stage1+stage2 workflow
FS_PREMIXUP17_PU50_LOCAL_OVERLAY = merge([
{"--pileup_input": "file:step1.root"
},
FS_PREMIXUP17_PU50_OVERLAY
])

### FastSim: list of processes used in FastSim validation
fs_proclist = ["ZEE_13",'TTbar_13','H125GGgluonfusion_13','ZTT_13','ZMM_13','NuGun_UP17','QCD_FlatPt_15_3000HS_13','SMS-T1tttt_mGl-1500_mLSP-100_13']

### FastSim: produces sample of signal events, overlayed with premixed minbias events
for x in fs_proclist:
key = "FS_" + x + "_PRMXUP17_PU50"
steps[key] = merge([FS_PREMIXUP17_PU50_OVERLAY,{"cfg":steps[x]["cfg"]}])

key = key.replace("PRMXUP17", "PRMXLOCALUP17")
steps[key] = merge([FS_PREMIXUP17_PU50_LOCAL_OVERLAY,{"cfg":steps[x]["cfg"]}])

### FastSim: produce sample of signal events, overlayed with minbias events
for x in fs_proclist:
key = "FS_" + x + "_UP17_PU50"
steps[key] = merge([{"cfg":steps[x]["cfg"]},FS_UP17_PU50_OVERLAY])

###end UP17
###
steps['TTbarSFS']=merge([{'cfg':'TTbar_8TeV_TuneCUETP8M1_cfi'},
{'-s':'GEN,SIM',
Expand Down Expand Up @@ -2930,3 +2988,4 @@ def gen2018HiMix(fragment,howMuch):
k=step+'_'+key
if step in upgradeStepDict and key in upgradeStepDict[step]:
steps[k]=merge([upgradeStepDict[step][key]])
# my-new-feature