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

Premix cleaning - finish proto-era migration #7826

Merged
merged 4 commits into from Feb 18, 2015
Merged

Premix cleaning - finish proto-era migration #7826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fac2ba7
premix: upgradePLS150ns => run2_mc_50ns; same phy processes as classi…
Feb 17, 2015
95fc40f
complete migration to 3 proto-eras using custom; notably add customis…
Feb 17, 2015
8c995bf
remove unnecessary import in postLS1CustomsPreMixing which is now bro…
Feb 17, 2015
1043f3a
premix workflows are correctly built in the matrix. Re-enable their r…
Feb 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/MatrixReader.py
View file
Open in desktop
Expand Up @@ -77,7 +77,7 @@ def reset(self, what='all'):
'relval_identity':False,
'relval_machine':True,
'relval_unsch':True,
'relval_premix':False
'relval_premix':True
}

self.relvalModule = None
Expand Down
24 changes: 14 additions & 10 deletions Configuration/PyReleaseValidation/python/relval_premix.py
View file
Open in desktop
Expand Up @@ -15,19 +15,23 @@
workflows[500199]=['',['PREMIXUP15_PU50']]

# 25ns pile up overlay using premix
workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250204]=['',['QQH1352T_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]
workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]
workflows[250203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]
workflows[250204]=['',['QQH1352T_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]
workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]
workflows[250206]=['',['ZMM_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]
workflows[250207]=['',['NuGun_UP15','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTUP15','MINIAODMCUP15']]


# 50ns pile up overlay using premix
workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500202]=['',['TTbar_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500204]=['',['QQH1352T_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]
workflows[500202]=['',['TTbar_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]
workflows[500203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]
workflows[500204]=['',['QQH1352T_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]
workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]
workflows[500206]=['',['ZMM_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]
workflows[500207]=['',['NuGun_UP15','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTUP15','MINIAODMCUP1550']]

# develop pile up overlay using premix prod-like!
workflows[250200.1]=['',['ProdZEE_13','DIGIPRMXUP15_PROD_PU25','RECOPRMXUP15PROD_PU25']]
Expand Down
12 changes: 8 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -842,7 +842,9 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--magField' : '38T_PostLS1',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1' # temporary replacement for premix; to be brought back to customisePostLS1
}
premixUp2015Defaults50ns = merge([{'--conditions':'auto:upgradePLS150ns'},premixUp2015Defaults])
premixUp2015Defaults50ns = merge([{'--conditions':'auto:run2_mc_50ns'},
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1_50ns'},
premixUp2015Defaults])

steps['PREMIXUP15_PU25']=merge([PU25,Kby(100,100),premixUp2015Defaults])
steps['PREMIXUP15_PU50']=merge([PU50,Kby(100,100),premixUp2015Defaults50ns])
Expand All @@ -857,8 +859,9 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1', # temporary replacement for premix; to be brought back to customisePostLS1
'--magField' : '38T_PostLS1',
}
digiPremixUp2015Defaults50ns=merge([{'--conditions':'auto:upgradePLS150ns'},
digiPremixUp2015Defaults50ns=merge([{'--conditions':'auto:run2_mc_50ns'},
{'--pileup_input' : 'das:/RelValPREMIXUP15_PU50/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[6]},
# {'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1_50ns'}, # FIX FIX here we miss an equivalent versin of postLS1CustomsPreMixing for 50ns; keep the same custom here as in digiPremixUp2015Defaults25ns
digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])
Expand Down Expand Up @@ -1007,7 +1010,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
step3Up2015Defaults])
steps['RECOPRMXUP15_PU50']=merge([
{'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM'},
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1'}, # temporary replacement for premix; to be brought back to customisePostLS1
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1_50ns'},
{'--geometry' : 'Extended2015'},
step3Up2015Defaults50ns])

Expand All @@ -1021,7 +1024,8 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
steps['RECOPRMXUP15PROD_PU25']=merge([
recoPremixUp15prod])
steps['RECOPRMXUP15PROD_PU50']=merge([
{'--conditions':'auto:upgradePLS150ns'},
{'--conditions':'auto:run2_mc_50ns'},
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1_50ns'},
recoPremixUp15prod])


Expand Down
2 changes: 1 addition & 1 deletion SLHCUpgradeSimulations/Configuration/python/postLS1CustomsPreMixing.py
View file
Open in desktop
@@ -1,7 +1,7 @@

import FWCore.ParameterSet.Config as cms

from SLHCUpgradeSimulations.Configuration.muonCustomsPreMixing import customise_csc_PostLS1,customise_csc_hlt
from SLHCUpgradeSimulations.Configuration.muonCustomsPreMixing import customise_csc_PostLS1
import postLS1Customs


Expand Down