Skip to content

Commit

Permalink
Merge pull request #14343 from hengne/from-CMSSW_8_1_0_pre3_relval
Browse files Browse the repository at this point in the history 
relval matrix updates
  • Loading branch information
@cmsbuild
cmsbuild committed May 4, 2016
2 parents 234940c + 73e19b3 commit 40be73e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_pileup.py
View file
Expand Up @@ -49,7 +49,7 @@
#workflow[25404]
workflows[25405] = ['ZTT_13',["FS_ZTT_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[25406] = ['ZMM_13',["FS_ZMM_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[25407] = ['NuGen_UP15',["FS_NuGun_UP15_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[25407] = ['NuGun_UP15',["FS_NuGun_UP15_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
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"]]

2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_premix.py
View file
Expand Up @@ -47,6 +47,6 @@
workflows[250403] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[250405] = ['ZTT_13',["FS_ZTT_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[250406] = ['ZMM_13',["FS_ZMM_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
workflows[250407] = ['NUGUN_UP15',["FS_NuGun_UP15_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]]
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"]]
23 changes: 13 additions & 10 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Expand Up @@ -125,8 +125,10 @@
steps['RunPhoton2012D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012D-v1/RAW',label='photon2012D',location='STD',run=Run2012D)}
steps['RunEl2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-v1/RAW',label='electron2012D',location='STD',run=Run2012D)}
steps['RunJet2012D']={'INPUT':InputInfo(dataSet='/JetHT/Run2012D-v1/RAW',label='jet2012D',location='STD',run=Run2012D)}
steps['ZMuSkim2012D']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012D-ZMu-PromptSkim-v1/RAW-RECO',label='zMu2012D',location='STD',run=Run2012Dsk)}
steps['WElSkim2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-WElectron-PromptSkim-v1/USER',label='wEl2012D',location='STD',run=Run2012Dsk)}
# the previous /SingleMu/Run2012D-ZMu-15Apr2014-v1/RAW-RECO is deprecated in DAS
steps['ZMuSkim2012D']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012D-ZMu-15Apr2014-v1/RAW-RECO',label='zMu2012D',location='STD',run=Run2012Dsk)}
# the previous /SingleElectron/Run2012D-WElectron-PromptSkim-v1/USER is deprecated in DAS
steps['WElSkim2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-WElectron-22Jan2013-v1/USER',label='wEl2012D',location='STD',run=Run2012D)}
steps['ZElSkim2012D']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012D-ZElectron-22Jan2013-v1/RAW-RECO',label='zEl2012D',location='STD',run=Run2012Dsk)}

#### run2 2015B ####
Expand Down Expand Up @@ -287,13 +289,14 @@ def identitySim(wf):
# THIS ABOVE IS NOT USED, AT THE MOMENT
'CMSSW_8_1_0_pre2-80X_mcRun2_asymptotic_v10_gs810pre2-v1', # 3 - 13 TeV samples with GEN-SIM from 810_p2; also GEN-SIM-DIGI-RAW-HLTDEBUG for id tests
'CMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1', # 4 - fast sim GEN-SIM-DIGI-RAW-HLTDEBUG for id tests
'CMSSW_8_1_0_pre2-PU25ns_80X_mcRun2_asymptotic_v10_gs810pre2-v1', # 5 - fullSim PU 25ns premix for 810pre2 + Gen-Sim_810pre2
'CMSSW_8_1_0_pre2-PU50ns_80X_mcRun2_startup_v10_gs810pre2-v1', # 6 - fullSim PU 50ns premix for 810pre2 + Gen-Sim_810pre2
'CMSSW_8_1_0_pre2-80X_mcRun2_asymptotic_v10_FastSim-v1', # 7 - fastSim MinBias for mixing for 810pre2
'CMSSW_8_1_0_pre2-PU25ns_80X_mcRun2_asymptotic_v10_FastSim-v1',# 8 - fastSim premixed MinBias for 810pre2
'CMSSW_8_1_0_pre3-PU25ns_80X_mcRun2_asymptotic_v12-v1', # 5 - fullSim PU 25ns premix for 810pre3
'CMSSW_8_1_0_pre3-PU50ns_80X_mcRun2_startup_v12-v1', # 6 - fullSim PU 50ns premix for 810pre3
'CMSSW_8_1_0_pre3-80X_mcRun2_asymptotic_v12_FastSim-v1', # 7 - fastSim MinBias for mixing for 810pre3
'CMSSW_8_1_0_pre3-PU25ns_80X_mcRun2_asymptotic_v12_FastSim-v1',# 8 - fastSim premixed MinBias for 810pre3
'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1', # 9 - Run2 HI GEN-SIM
'CMSSW_7_6_0-76X_mcRun2_asymptotic_v11-v1', # 10 - 13 TeV High Stats GEN-SIM
'CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v9_realBS-v1', # 11 - 13 TeV High Stats MiniBias for mixing GEN-SIM
'CMSSW_8_1_0_pre2-80X_mcRun2cosmics_startup_peak_v10_gs810pre2-v1', # 12 - GEN-SIM input for 1307 cosmics wf from 810_p2
]

# note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available
Expand Down Expand Up @@ -376,7 +379,7 @@ def identitySim(wf):
steps['BuMixing_13']=gen2015('BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(900,10000))

steps['Cosmics_UP15INPUT']={'INPUT':InputInfo(dataSet='/RelValCosmics_UP15/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')}
steps['CosmicsSPLoose_UP15INPUT']={'INPUT':InputInfo(dataSet='/RelValCosmicsSPLoose_UP15/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')}
steps['CosmicsSPLoose_UP15INPUT']={'INPUT':InputInfo(dataSet='/RelValCosmicsSPLoose_UP15/%s/GEN-SIM'%(baseDataSetRelease[12],),location='STD')}
steps['BeamHalo_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBeamHalo_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')}
steps['HSCPstop_M_200_13INPUT']={'INPUT':InputInfo(dataSet='/RelValHSCPstop_M_200_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')}
steps['RSGravitonToGaGa_13INPUT']={'INPUT':InputInfo(dataSet='/RelValRSGravitonToGaGa_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')}
Expand Down Expand Up @@ -982,8 +985,8 @@ def identityFS(wf):

# use --era
steps['RECODR2_50ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_50ns',},dataReco])
steps['RECODR2_25ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_25ns',},dataReco])
steps['RECODR2_2016']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_2016',},dataReco])
steps['RECODR2_25ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_25ns','--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns'},dataReco])
steps['RECODR2_2016']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_2016','--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016'},dataReco])


steps['RECODR2AlCaEle']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--customise':'Configuration/DataProcessing/RecoTLR.customisePromptRun2',},dataRecoAlCaCalo])
Expand Down Expand Up @@ -1491,7 +1494,7 @@ def identityFS(wf):
from Configuration.PyReleaseValidation.upgradeWorkflowComponents import *

defaultDataSets={}
defaultDataSets['2017']='CMSSW_8_1_0_pre2-80X_upgrade2017_realistic_v1_UPG17realGT-v'
defaultDataSets['2017']='CMSSW_8_1_0_pre3-80X_upgrade2017_realistic_v3_UPG17-v'
keys=defaultDataSets.keys()
for key in keys:
defaultDataSets[key+'PU']=defaultDataSets[key]
Expand Down

0 comments on commit 40be73e

Please sign in to comment.