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

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts) #4207

Merged
merged 17 commits into from Jun 15, 2014
Merged

Forward port CMSSW_7_0_X into CMSSW_7_1_X (Fixed Conflicts) #4207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8c55f21
Merged refs/pull/3973/head from repository cms-sw
May 23, 2014
6fbe8b0
introduced SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixi…
May 23, 2014
cd17279
--geometry Extended2015 as needs be in the 70x (all GT-driven in su…
May 23, 2014
43a944e
fix for correct handling of pathological cases of Pt=0 groomed jets
ferencek May 23, 2014
163027d
process string set to differentiate 25ns/50ns pilep overlaid when don…
May 23, 2014
dee8680
HARVEST in place of HARVESTCOS
May 23, 2014
3debcce
now discarding matches where two jets are too far apart
ferencek May 26, 2014
1afa64f
new premixed dataset as for https://hypernews.cern.ch/HyperNews/CMS/g…
May 26, 2014
46dfd10
RECOPRMXUP15PROD
May 26, 2014
3b77d86
prod premix wf's given different label to avoid dataset collision; as…
May 29, 2014
48d3265
hltGetConfiguration: small clean up in the handling of Services
fwyzard Apr 22, 2014
0499b27
hltGetConfiguration: add the "--prescale" option to force using a giv…
fwyzard Jun 4, 2014
7b6b419
argparse is included in the Python Standard Library since Python 2.7
fwyzard Jun 4, 2014
d27b689
Merge pull request #4110 from fwyzard/hltGetConfiguration_cleanup_70x
davidlange6 Jun 10, 2014
5e8c47d
Merge pull request #4001 from franzoni/from-CMSSW_7_0_X_2014-05-23-02…
davidlange6 Jun 10, 2014
810025a
Merge pull request #3996 from cms-btv-pog/JetFlavourClusteringFix_fro…
davidlange6 Jun 10, 2014
7007c2a
Merge branch 'CMSSW_7_0_X' into CMSSW_7_1_X (fixed conflicts)
nclopezo Jun 11, 2014
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
15 changes: 10 additions & 5 deletions Configuration/PyReleaseValidation/python/MatrixInjector.py
View file
Open in desktop
Expand Up @@ -266,12 +266,17 @@ def prepare(self,mReader, directories, mode='init'):
chainDict['GlobalTag']=chainDict['nowmTasklist'][-1]['nowmIO']['GT'] #set in general to the last one of the chain
if 'pileup' in chainDict['nowmTasklist'][-1]['nowmIO']:
chainDict['nowmTasklist'][-1]['MCPileup']=chainDict['nowmTasklist'][-1]['nowmIO']['pileup']
if '--pileup ' in s[2][index]: # catch --pileup and not --pileup_ => works also w/ PRE-MIXed dataset in input
processStrPrefix='PU_' # FIXME GF: need to take care that dataset names properly includes PU string
if ( s[2][index].split()[ s[2][index].split().index('--pileup')+1 ] ).find('50ns') > 0 :
processStrPrefix='PU50ns_'
elif ( s[2][index].split()[ s[2][index].split().index('--pileup')+1 ] ).find('25ns') > 0 :
if '--pileup ' in s[2][index]: # catch --pileup (scenarion) and not --pileup_ (dataset to be mixed) => works also making PRE-MIXed dataset
processStrPrefix='PU_' # take care of pu overlay done with GEN-SIM mixing
if ( s[2][index].split()[ s[2][index].split().index('--pileup')+1 ] ).find('25ns') > 0 :
processStrPrefix='PU25ns_'
elif ( s[2][index].split()[ s[2][index].split().index('--pileup')+1 ] ).find('50ns') > 0 :
processStrPrefix='PU50ns_'
if 'DIGIPREMIX_S2' in s[2][index] : # take care of pu overlay done with DIGI mixing of premixed events
if s[2][index].split()[ s[2][index].split().index('--pileup_input')+1 ].find('25ns') > 0 :
processStrPrefix='PUpmx25ns_'
elif s[2][index].split()[ s[2][index].split().index('--pileup_input')+1 ].find('50ns') > 0 :
processStrPrefix='PUpmx50ns_'

if acqEra:
#chainDict['AcquisitionEra'][step]=(chainDict['CMSSWVersion']+'-PU_'+chainDict['nowmTasklist'][-1]['GlobalTag']).replace('::All','')+thisLabel
Expand Down
28 changes: 14 additions & 14 deletions Configuration/PyReleaseValidation/python/relval_premix.py
View file
Open in desktop
Expand Up @@ -15,22 +15,22 @@
workflows[500199]=['',['PREMIXUP15_PU50']]

# 25ns pile up overlay using premix
workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTCOS']]
workflows[250201]=['',['ZmumuJets_Pt_20_300_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTCOS']]
workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTCOS']]
workflows[250203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTCOS']]
workflows[250204]=['',['QQH1352T_Tauola_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTCOS']]
workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVESTCOS']]
workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250201]=['',['ZmumuJets_Pt_20_300_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_Tauola_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]
workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']]


# 50ns pile up overlay using premix
workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTCOS']]
workflows[500201]=['',['ZmumuJets_Pt_20_300_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTCOS']]
workflows[500202]=['',['TTbar_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTCOS']]
workflows[500203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTCOS']]
workflows[500204]=['',['QQH1352T_Tauola_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTCOS']]
workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVESTCOS']]
workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500201]=['',['ZmumuJets_Pt_20_300_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_Tauola_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]
workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']]

# develop pile up overlay using premix prod-like!
workflows[250200.1]=['',['ZEE_13','DIGIPRMXUP15_PROD_PU25','RECOPRMXUP15_PU25']]
workflows[500200.1]=['',['ZEE_13','DIGIPRMXUP15_PROD_PU50','RECOPRMXUP15_PU50']]
workflows[250200.1]=['',['ProdZEE_13','DIGIPRMXUP15_PROD_PU25','RECOPRMXUP15PROD_PU25']]
workflows[500200.1]=['',['ProdZEE_13','DIGIPRMXUP15_PROD_PU50','RECOPRMXUP15PROD_PU50']]
59 changes: 59 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -256,6 +256,7 @@ def gen2015(fragment,howMuch):
### Production test: 13 TeV equivalents
steps['ProdMinBias_13']=gen2015('MinBias_13TeV_cfi',Kby(9,100))
steps['ProdTTbar_13']=gen2015('TTbar_Tauola_13TeV_cfi',Kby(9,100))
steps['ProdZEE_13']=gen2015('ZEE_13TeV_cfi',Kby(9,100))
steps['ProdQCD_Pt_3000_3500_13']=gen2015('QCD_Pt_3000_3500_13TeV_cfi',Kby(9,100))
# GF include branched wf comparing relVal and prod

Expand Down Expand Up @@ -999,6 +1000,47 @@ def genvalid(fragment,d,suffix='all',fi=''):
#add this line when testing from an input file that is not strictly GEN-SIM
#addForAll(step2,{'--process':'DIGI'})


# PRE-MIXING : https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideSimulation#Pre_Mixing_Instructions
premixUp2015Defaults = {
'--evt_type' : 'SingleNuE10_cfi',
'-s' : 'GEN,SIM,DIGIPREMIX,L1,DIGI2RAW',
'-n' : '10',
'--conditions' : 'auto:upgradePLS1', # 25ns GT; dedicated dict for 50ns
'--datatier' : 'GEN-SIM-DIGI-RAW',
'--eventcontent': 'PREMIX',
'--magField' : '38T_PostLS1',
'--geometry' : 'Extended2015',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1' # temporary replacement for premix; to be brought back to customisePostLS1
}
premixUp2015Defaults50ns = merge([{'--conditions':'auto:upgradePLS150ns'},premixUp2015Defaults])

steps['PREMIXUP15_PU25']=merge([PU25,Kby(100,100),premixUp2015Defaults])
steps['PREMIXUP15_PU50']=merge([PU50,Kby(100,100),premixUp2015Defaults50ns])

digiPremixUp2015Defaults25ns = {
'--conditions' : 'auto:upgradePLS1',
'-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco',
'--pileup_input' : 'das:/RelValPREMIXUP15_PU25/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[9],
'--eventcontent' : 'FEVTDEBUGHLT',
'--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--datamix' : 'PreMix',
'--customise' : 'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1', # temporary replacement for premix; to be brought back to customisePostLS1
'--geometry' : 'Extended2015',
'--magField' : '38T_PostLS1',
}
digiPremixUp2015Defaults50ns=merge([{'--conditions':'auto:upgradePLS150ns'},
{'--pileup_input' : 'das:/RelValPREMIXUP15_PU50/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[10]},
digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])
premixProd = {'-s' : 'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval,RAW2DIGI,L1Reco',
'--eventcontent' : 'PREMIXRAW',
'--datatier' : 'PREMIXRAW'} #GF: check this datatier name
steps['DIGIPRMXUP15_PROD_PU25']=merge([premixProd,digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PROD_PU50']=merge([premixProd,digiPremixUp2015Defaults50ns])


dataReco={'--conditions':'auto:run1_data',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I left this as it is in CMSSW_7_1_X

'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias,DQM',
'--datatier':'RECO,DQMIO',
Expand Down Expand Up @@ -1124,11 +1166,28 @@ def genvalid(fragment,d,suffix='all',fi=''):
# for premixing: no --pileup_input for replay; GEN-SIM only available for in-time event, from FEVTDEBUGHLT previous step
steps['RECOPRMXUP15_PU25']=merge([
{'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM'},
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1'}, # temporary replacement for premix; to be brought back to customisePostLS1
{'--geometry' : 'Extended2015'},
step3Up2015Defaults])
steps['RECOPRMXUP15_PU50']=merge([
{'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM'},
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1'}, # temporary replacement for premix; to be brought back to customisePostLS1
{'--geometry' : 'Extended2015'},
step3Up2015Defaults50ns])

recoPremixUp15prod = merge([
{'-s':'RAW2DIGI,L1Reco,RECO,EI'},
{'--datatier' : 'GEN-SIM-RECO,AODSIM'},
{'--eventcontent' : 'RECOSIM,AODSIM'},
{'--customise':'SLHCUpgradeSimulations/Configuration/postLS1CustomsPreMixing.customisePostLS1'}, # temporary replacement for premix; to be brought back to customisePostLS1
{'--geometry' : 'Extended2015'},
step3Up2015Defaults])

steps['RECOPRMXUP15PROD_PU25']=merge([
recoPremixUp15prod])
steps['RECOPRMXUP15PROD_PU50']=merge([
{'--conditions':'auto:upgradePLS150ns'},
recoPremixUp15prod])

#wmsplit['RECOPU1']=1
steps['RECOPUDBG']=merge([{'--eventcontent':'RECODEBUG,DQM'},steps['RECOPU1']])
Expand Down