diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py index 07e01a0a94460..42445bcc158b8 100644 --- a/Configuration/PyReleaseValidation/python/relval_production.py +++ b/Configuration/PyReleaseValidation/python/relval_production.py @@ -5,7 +5,7 @@ # here only define the workflows as a combination of the steps defined above: workflows = Matrix() -# each workflow defines a name and a list of steps to be done. +# each workflow defines a name and a list of steps to be done. # if no explicit name/label given for the workflow (first arg), # the name of step1 will be used @@ -16,6 +16,11 @@ workflows[1003]=['', ['RunMinBias2012A','RECODDQM','HARVESTDDQM']] workflows[1004] = [ '',['RunHI2011','TIER0EXPHI','ALCAEXPHI','ALCAHARVD1HI','ALCAHARVD2HI','ALCAHARVD3HI','ALCAHARVD5HI']] +workflows[1010] = ['',['TestEnableEcalHCAL2016H','TIER0EXPTE', 'ALCAEXPTE', 'ALCAHARVDTE']] +workflows[1020] = ['',['AlCaLumiPixels2016H','TIER0PROMPTLP']] + + + ## MC production test #workflows[1100] = [ '',[]] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index cb9c300a6c482..d6fe96b7af552 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -58,11 +58,16 @@ steps['RunCosmics2011A']={'INPUT':InputInfo(dataSet='/Cosmics/Run2011A-v1/RAW',label='cos2011A',run=[160960],events=100000,location='STD')} Run2011A=[165121] +Run2016HTE=[281014, 281040, 281110, 281007] +Run2016HALP=[283383] steps['RunMinBias2011A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011A-v1/RAW',label='mb2011A',run=Run2011A,events=100000,location='STD')} steps['RunMu2011A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011A-v1/RAW',label='mu2011A',run=Run2011A,events=100000)} steps['RunElectron2011A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011A-v1/RAW',label='electron2011A',run=Run2011A,events=100000)} steps['RunPhoton2011A']={'INPUT':InputInfo(dataSet='/Photon/Run2011A-v1/RAW',label='photon2011A',run=Run2011A,events=100000)} steps['RunJet2011A']={'INPUT':InputInfo(dataSet='/Jet/Run2011A-v1/RAW',label='jet2011A',run=Run2011A,events=100000)} +steps['TestEnableEcalHCAL2016H']={'INPUT':InputInfo(dataSet='/TestEnablesEcalHcal/Run2016H-v1/RAW',label='te2016H',run=Run2016HTE,events=100000,location='STD')} +steps['AlCaLumiPixels2016H']={'INPUT':InputInfo(dataSet='/AlCaLumiPixels1/Run2016H-v1/RAW',label='alcalp2016H',run=Run2016HALP,events=100000,location='STD')} + Run2011B=[177719] Run2011BSk=[177719,177790,177096,175874] @@ -169,7 +174,7 @@ #### run2 2015D #### -# Run2015D, 25ns: 256677 +# Run2015D, 25ns: 256677 Run2015D=selectedLS([256677]) steps['RunHLTPhy2015D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='hltPhy2015D',events=100000,location='STD', ls=Run2015D)} steps['RunDoubleEG2015D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015D-v1/RAW',label='doubEG2015D',events=100000,location='STD', ls=Run2015D)} @@ -261,10 +266,10 @@ steps['RunMuOnia2016H']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016H-v1/RAW',label='muOnia2016H',events=100000,location='STD', ls=Run2016H)} -# Highstat HLTPhysics +# Highstat HLTPhysics Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891]) steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='hltPhy2015DHS',events=100000,location='STD', ls=Run2015DHS)} - + #### run2 2015 HighLumi High Stat workflows ## # Run2015HLHS, 25ns, run 260627, JetHT: 2.9M, SingleMuon: 5.7M, ZeroBias: 1.6M @@ -368,16 +373,16 @@ def identitySim(wf): baseDataSetRelease=[ 'CMSSW_7_1_0_pre7-PRE_STA71_V3-v1', # 0 run1 samples; keep GEN-SIM fixed to 710_pre7, for samples not routinely produced - 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1', # 1 Run1 HI GEN-SIM + 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1', # 1 Run1 HI GEN-SIM 'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1', # 2 for fastsim id test # 'CMSSW_7_1_0_pre5-START71_V1-v2', # 3 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2) # THIS ABOVE IS NOT USED, AT THE MOMENT 'CMSSW_9_0_0_pre4-90X_mcRun2_asymptotic_v1-v1', # 3 - 13 TeV samples with GEN-SIM from 810_p9 G4 10.2; 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_9_0_0_pre4-PU25ns_90X_mcRun2_asymptotic_v1-v1', # 5 - fullSim PU 25ns premix - 'CMSSW_8_1_0_pre15-PU50ns_81X_mcRun2_startup_v12-v1', # 6 - fullSim PU 50ns premix - 'CMSSW_9_0_0_pre4-90X_mcRun2_asymptotic_v1_FastSim-v1', # 7 - fastSim MinBias for mixing - 'CMSSW_9_0_0_pre4-PU25ns_90X_mcRun2_asymptotic_v1_FastSim-v1',# 8 - fastSim premixed MinBias + 'CMSSW_9_0_0_pre4-PU25ns_90X_mcRun2_asymptotic_v1-v1', # 5 - fullSim PU 25ns premix + 'CMSSW_8_1_0_pre15-PU50ns_81X_mcRun2_startup_v12-v1', # 6 - fullSim PU 50ns premix + 'CMSSW_9_0_0_pre4-90X_mcRun2_asymptotic_v1_FastSim-v1', # 7 - fastSim MinBias for mixing + 'CMSSW_9_0_0_pre4-PU25ns_90X_mcRun2_asymptotic_v1_FastSim-v1',# 8 - fastSim premixed MinBias '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 @@ -385,8 +390,8 @@ def identitySim(wf): ] -# note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available -steps['MinBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #was [0] +# note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available +steps['MinBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #was [0] steps['QCD_Pt_3000_3500INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_3000_3500/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['QCD_Pt_600_800INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_600_800/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['QCD_Pt_80_120INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_Pt_80_120/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} @@ -424,10 +429,10 @@ def identitySim(wf): steps['TTbar_13INPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['TTbarLepton_13INPUT']={'INPUT':InputInfo(dataSet='/RelValTTbarLepton_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['ZEE_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} -#steps['ZEE_13_DBLMINIAODINPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13_DBLMINIAOD/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} +#steps['ZEE_13_DBLMINIAODINPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13_DBLMINIAOD/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['Wjet_Pt_80_120_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWjet_Pt_80_120_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['Wjet_Pt_3000_3500_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWjet_Pt_3000_3500_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} -steps['SMS-T1tttt_mGl-1500_mLSP-100_13INPUT']={'INPUT':InputInfo(dataSet='/RelValSMS-T1tttt_mGl-1500_mLSP-100_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} +steps['SMS-T1tttt_mGl-1500_mLSP-100_13INPUT']={'INPUT':InputInfo(dataSet='/RelValSMS-T1tttt_mGl-1500_mLSP-100_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['QCD_FlatPt_15_3000_13INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_FlatPt_15_3000_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['QCD_FlatPt_15_3000HS_13INPUT']={'INPUT':InputInfo(dataSet='/RelValQCD_FlatPt_15_3000HS_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['ZpMM_2250_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZpMM_2250_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} @@ -439,7 +444,7 @@ def identitySim(wf): steps['Upsilon1SToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValUpsilon1SToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['JpsiMuMu_Pt-8INPUT']={'INPUT':InputInfo(dataSet='/RelValJpsiMuMu_Pt-8/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} # new BPH relvals produced for the first time in 810_pre9 -steps['BsToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBsToMuMu_13/CMSSW_8_1_0_pre9-81X_mcRun2_asymptotic_v2-v1/GEN-SIM',location='STD')} +steps['BsToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBsToMuMu_13/CMSSW_8_1_0_pre9-81X_mcRun2_asymptotic_v2-v1/GEN-SIM',location='STD')} steps['BdToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBdToMuMu_13/CMSSW_8_1_0_pre9-81X_mcRun2_asymptotic_v2-v1/GEN-SIM',location='STD')} steps['BuToJpsiK_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuToJpsiK_13/CMSSW_8_1_0_pre9-81X_mcRun2_asymptotic_v2-v1/GEN-SIM',location='STD')} steps['BsToJpsiPhi_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBsToJpsiPhi_13/CMSSW_8_1_0_pre9-81X_mcRun2_asymptotic_v2-v1/GEN-SIM',location='STD')} @@ -491,7 +496,7 @@ def identitySim(wf): #input for fast sim workflows to be added - TODO #input for 13 TeV High Stats samples -steps['ZMM_13_HSINPUT']={'INPUT':InputInfo(dataSet='/RelValZMM_13_HS/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +steps['ZMM_13_HSINPUT']={'INPUT':InputInfo(dataSet='/RelValZMM_13_HS/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['TTbar_13_HSINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13_HS/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} @@ -532,7 +537,7 @@ def genS(fragment,howMuch): steps['ZMM']=genS('ZMM_8TeV_TuneCUETP8M1_cfi',Kby(18,300)) steps['ZpMM']=genS('ZpMM_8TeV_TuneCUETP8M1_cfi',Kby(9,200)) steps['Higgs200ChargedTaus_13']=gen2015('H200ChargedTaus_Tauola_13TeV_cfi',Kby(9,100)) -steps['Upsilon1SToMuMu_13']=gen2015('Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(17,190)) +steps['Upsilon1SToMuMu_13']=gen2015('Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(17,190)) steps['BsToMuMu_13']=gen2015('BsToMuMu_13TeV_SoftQCDnonD_TuneCUEP8M1_cfi.py',Kby(21000,150000)) steps['JpsiMuMu_Pt-8']=gen2015('JpsiMuMu_Pt-8_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(3100,100000)) steps['BdToMuMu_13']=gen2015('BdToMuMu_13TeV_SoftQCDnonD_TuneCUEP8M1_cfi',Kby(6000,60000)) @@ -572,7 +577,7 @@ def genS(fragment,howMuch): steps['ZTTINPUT']={'INPUT':InputInfo(dataSet='/RelValZTT/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['H130GGgluonfusionINPUT']={'INPUT':InputInfo(dataSet='/RelValH130GGgluonfusion/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['PhotonJets_Pt_10INPUT']={'INPUT':InputInfo(dataSet='/RelValPhotonJets_Pt_10/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} -#steps['QQH1352TINPUT']={'INPUT':InputInfo(dataSet='/RelValQQH1352T/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #temporary comment out +#steps['QQH1352TINPUT']={'INPUT':InputInfo(dataSet='/RelValQQH1352T/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #temporary comment out steps['ADDMonoJet_d3MD3INPUT']={'INPUT':InputInfo(dataSet='/RelValADDMonoJet_d3MD3/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['WpMINPUT']={'INPUT':InputInfo(dataSet='/RelValWpM/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['ZpMMINPUT']={'INPUT':InputInfo(dataSet='/RelValZpMM/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} @@ -783,12 +788,12 @@ def identityFS(wf): '--relval':'200000,5000', '--eventcontent':'LHE', '--datatier':'GEN', - '--conditions':'auto:run2_mc_FULL' + '--conditions':'auto:run2_mc_FULL' }, step1Defaults]) # transfer extendedgen step1 LHE to be used in a normal workflow -step1LHENormal = {'--relval' : '9000,50', +step1LHENormal = {'--relval' : '9000,50', '--conditions' : 'auto:run2_mc', '--beamspot' : 'Realistic50ns13TeVCollision', } @@ -801,7 +806,7 @@ def identityFS(wf): '--eventcontent': 'FEVTDEBUG', '--datatier' : 'GEN-SIM', '--era' : 'Run2_2016', - } + } steps['DYToll01234Jets_5f_LO_MLM_Madgraph_LHE_13TeV']=genvalid('Configuration/Generator/python/DYToll01234Jets_5f_LO_MLM_Madgraph_LHE_13TeV_cff.py',step1LHEDefaults) steps['TTbar012Jets_5f_NLO_FXFX_Madgraph_LHE_13TeV']=genvalid('Configuration/Generator/python/TTbar012Jets_5f_NLO_FXFX_Madgraph_LHE_13TeV_cff.py',step1LHEDefaults) @@ -945,7 +950,7 @@ def lhegensim(fragment,howMuch): #pu25 for high stats workflows PU25HS={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[11],)} - + # steps['TTbarFSPU']=merge([PUFS,Kby(100,500),steps['TTbarFS']] ) @@ -961,7 +966,7 @@ def lhegensim(fragment,howMuch): steps['FS_TTbar_13_PUAVE10_DRMIX_ITO']=merge([PUFSAVE10_DRMIX_ITO,Kby(100,500),steps['TTbarFS_13']] ) # needs the placeholder steps['FS_TTbar_13_PUAVE35_DRMIX_ITO']=merge([PUFSAVE35_DRMIX_ITO,Kby(100,500),steps['TTbarFS_13']] ) # needs the placeholder -# step2 +# step2 step2Defaults = { '-s' : 'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@fake', '--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG', '--eventcontent': 'FEVTDEBUGHLT', @@ -1007,7 +1012,7 @@ def lhegensim(fragment,howMuch): steps['RESIM']=merge([{'-s':'reGEN,reSIM','-n':10},steps['DIGI']]) #steps['RESIMDIGI']=merge([{'-s':'reGEN,reSIM,DIGI,L1,DIGI2RAW,HLT:@fake,RAW2DIGI,L1Reco','-n':10,'--restoreRNDSeeds':'','--process':'HLT'},steps['DIGI']]) - + steps['DIGIHI']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:HIon'}, hiDefaults, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults]) steps['DIGIHI2011']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:@fake'}, hiDefaults2011, {'--pileup':'HiMixNoPU'}, step2Defaults]) steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi,L1,DIGI2RAW,HLT:HIon', '-n':2}, hiDefaults, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults]) @@ -1030,14 +1035,14 @@ def lhegensim(fragment,howMuch): steps['PREMIXUP15_PU25']=merge([PU25,Kby(100,100),premixUp2015Defaults]) steps['PREMIXUP15_PU50']=merge([PU50,Kby(100,100),premixUp2015Defaults50ns]) -digiPremixUp2015Defaults25ns = { +digiPremixUp2015Defaults25ns = { '--conditions' : 'auto:run2_mc', '-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval2016', '--pileup_input' : 'das:/RelValPREMIXUP15_PU25/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[5], '--eventcontent' : 'FEVTDEBUGHLT', '--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG', '--datamix' : 'PreMix', - '--era' : 'Run2_2016' + '--era' : 'Run2_2016' } digiPremixUp2015Defaults50ns=merge([{'-s':'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns'}, {'--conditions':'auto:run2_mc_50ns'}, @@ -1101,14 +1106,14 @@ def lhegensim(fragment,howMuch): steps['HLTDR2_2016']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2016,},{'--conditions':'auto:run2_hlt_relval'},{'--era' : 'Run2_2016'},steps['HLTD'] ] ) steps['HLTDR2newL1repack_2016']=merge( [ {'-s':'L1REPACK:FullSimTP,HLT:@%s'%hltKey2016,},{'--conditions':'auto:run2_hlt_relval'},{'--era' : 'Run2_2016'},steps['HLTD'] ] ) -# use --era +# 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','--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]) -steps['RECODSplit']=steps['RECOD'] # finer job splitting +steps['RECODSplit']=steps['RECOD'] # finer job splitting steps['RECOSKIMALCA']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"' },steps['RECOD']]) steps['RECOSKIMALCAR1']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"' @@ -1135,7 +1140,7 @@ def lhegensim(fragment,howMuch): '--eventcontent':'RECO,AOD,ALCARECO,DQM', '--process':'RECO' },dataReco]) -steps['TIER0EXP']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForExpress,DQM:@express,ENDJOB', +steps['TIER0EXP']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForExpress+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO,DQM:@express,ENDJOB', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', '--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress', @@ -1152,7 +1157,23 @@ def lhegensim(fragment,howMuch): '--repacked':'', '-n':'10' } - +steps['TIER0EXPTE']={'-s': 'ALCAPRODUCER:PromptCalibProdEcalPedestals', + '--conditions': 'auto:run2_data', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--data': '', + '--process': 'RECO', + '--scenario': 'pp', + #'--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress', + } +steps['TIER0PROMPTLP']={'-s': 'ALCA:AlCaPCCZeroBias+AlCaPCCRandom', + '--conditions': 'auto:run2_data', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--data': '', + '--scenario': 'pp', + # '--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress', + } steps['RECOCOSD']=merge([{'--scenario':'cosmics', @@ -1165,13 +1186,13 @@ def lhegensim(fragment,howMuch): steps['RECOCOSDRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016'},steps['RECOCOSD']]) step2HImixDefaults=merge([{'-n':'2', #too slow for 10 events/hour - '--pileup':'HiMix', + '--pileup':'HiMix', },hiDefaults,step1Up2015Defaults]) steps['Pyquen_GammaJet_pt20_2760GeV']=merge([{'cfg':'Pyquen_GammaJet_pt20_2760GeV_cfi','--beamspot':'MatchHI', '--pileup':'HiMixGEN'},PUHI,step2HImixDefaults]) steps['Pyquen_DiJet_pt80to120_2760GeV']=merge([{'cfg':'Pyquen_DiJet_pt80to120_2760GeV_cfi','--beamspot':'MatchHI', '--pileup':'HiMixGEN'},PUHI,step2HImixDefaults]) steps['Pyquen_ZeemumuJets_pt10_2760GeV']=merge([{'cfg':'Pyquen_ZeemumuJets_pt10_2760GeV_cfi','--beamspot':'MatchHI', '--pileup':'HiMixGEN'},PUHI,step2HImixDefaults]) -# step3 +# step3 step3Defaults = { '-s' : 'RAW2DIGI,L1Reco,RECO,EI,VALIDATION:@standardValidationNoHLT,DQM:@standardDQMFakeHLT', '--conditions' : 'auto:run1_mc', @@ -1188,7 +1209,7 @@ def lhegensim(fragment,howMuch): #'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM', '-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@miniAODDQM', '--runUnscheduled':'', - '--conditions':'auto:run2_mc', + '--conditions':'auto:run2_mc', '-n':'10', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', @@ -1201,7 +1222,7 @@ def lhegensim(fragment,howMuch): step3Up2015DefaultsAlCaCalo50ns = merge([{'--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015DefaultsAlCaCalo]) step3Up2015Hal = {'-s' :'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM', - '--conditions' :'auto:run2_mc', + '--conditions' :'auto:run2_mc', '--datatier' :'GEN-SIM-RECO,DQMIO', '--eventcontent':'RECOSIM,DQM', '-n' :'10', @@ -1300,7 +1321,7 @@ def lhegensim(fragment,howMuch): steps['RECOMIN']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},stCond,step3Defaults]) steps['RECOMINUP15']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},step3Up2015Defaults]) -steps['RECOAODUP15']=merge([{'--datatier':'AODSIM,MINIAODSIM,DQMIO','--eventcontent':'AODSIM,MINIAODSIM,DQM'},step3Up2015Defaults]) +steps['RECOAODUP15']=merge([{'--datatier':'AODSIM,MINIAODSIM,DQMIO','--eventcontent':'AODSIM,MINIAODSIM,DQM'},step3Up2015Defaults]) steps['RECODDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,DQM:@common+@muon+@hcal+@jetmet+@ecal'},steps['RECOD']]) @@ -1329,7 +1350,7 @@ def lhegensim(fragment,howMuch): recoPremixUp15prod = merge([ #{'-s':'RAW2DIGI,L1Reco,RECO,EI'}, # tmp {'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,DQM:DQMOfflinePOGMC'}, - {'--datatier' : 'AODSIM,MINIAODSIM,DQMIO'}, + {'--datatier' : 'AODSIM,MINIAODSIM,DQMIO'}, {'--eventcontent' : 'AODSIM,MINIAODSIM,DQMIO'}, {'--era':'Run2_2016'}, # temporary replacement for premix; to be brought back to customisePostLS1 step3Up2015Defaults]) @@ -1377,12 +1398,19 @@ def lhegensim(fragment,howMuch): '--conditions':'auto:run1_data', '--datatier':'ALCARECO', '--eventcontent':'ALCARECO'} -steps['ALCAEXP']={'-s':'ALCA:SiStripCalZeroBias+TkAlMinBias+DtCalib+Hotline+LumiPixelsMinBias+PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiPixelAli', +steps['ALCAEXP']={'-s':'ALCAOUTPUT:SiStripCalZeroBias+TkAlMinBias+DtCalib+Hotline+LumiPixelsMinBias+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO,ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG+PromptCalibProdSiPixelAli', '--conditions':'auto:run1_data', '--datatier':'ALCARECO', - '--eventcontent':'ALCARECO'} + '--eventcontent':'ALCARECO', + '--triggerResultsProcess': 'RECO'} steps['ALCAEXPHI']=merge([{'-s':'ALCA:PromptCalibProd+PromptCalibProdSiStrip+PromptCalibProdSiStripGains+PromptCalibProdSiStripGainsAAG', '--scenario':'HeavyIons'},steps['ALCAEXP']]) +steps['ALCAEXPTE']={'-s':'ALCAOUTPUT:PromptCalibProdEcalPedestals', + '--conditions':'auto:run2_data', + '--datatier':'ALCARECO', + '--eventcontent':'ALCARECO', + '--triggerResultsProcess': 'RECO'} + # step4 step4Defaults = { '-s' : 'ALCA:TkAlMuonIsolated+TkAlMinBias+EcalCalZElectron+EcalCalWElectron+HcalCalIsoTrk+MuAlCalIsolatedMu+MuAlZMuMu+MuAlOverlaps', @@ -1391,7 +1419,7 @@ def lhegensim(fragment,howMuch): '--datatier' : 'ALCARECO', '--eventcontent': 'ALCARECO', } -step4Up2015Defaults = { +step4Up2015Defaults = { '-s' : 'ALCA:TkAlMuonIsolated+TkAlMinBias+MuAlOverlaps+EcalESAlign+EcalTrg', '-n' : 1000, '--conditions' : 'auto:run2_mc', @@ -1455,7 +1483,11 @@ def lhegensim(fragment,howMuch): '--filein':'file:PromptCalibProdSiStripGainsAAG.root'} steps['ALCAHARVD5HI']=merge([{'--scenario':'HeavyIons'},steps['ALCAHARVD5']]) - +steps['ALCAHARVDTE']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdEcalPedestals']), + '--conditions':'auto:run2_data', + '--scenario':'pp', + '--data':'', + '--filein':'file:PromptCalibProdEcalPedestals.root'} steps['RECOHISt4']=steps['RECOHI'] steps['RECOHIMIX']=merge([steps['RECOHI'],{'--pileup':'HiMix','--pileup_input':'das:/RelValHydjetQ_MinBias_5020GeV/%s/GEN-SIM'%(baseDataSetRelease[9])}]) @@ -1470,7 +1502,7 @@ def lhegensim(fragment,howMuch): '--filein':'file:step1_inDQM.root' } -steps['HARVESTGEN2']=merge([{'--filein':'file:step2_inDQM.root'},steps['HARVESTGEN']]) +steps['HARVESTGEN2']=merge([{'--filein':'file:step2_inDQM.root'},steps['HARVESTGEN']]) #data @@ -1552,7 +1584,7 @@ def lhegensim(fragment,howMuch): '--era' : 'Run2_2017' } - + steps['HARVESTFS']={'-s':'HARVESTING:validationHarvesting', '--conditions':'auto:run1_mc', '--mc':'', @@ -1570,7 +1602,7 @@ def lhegensim(fragment,howMuch): steps['HARVESTUP15']={ # '-s':'HARVESTING:validationHarvesting+dqmHarvesting', # todo: remove UP from label '-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM', # todo: remove UP from label - '--conditions':'auto:run2_mc', + '--conditions':'auto:run2_mc', '--mc':'', '--era' : 'Run2_2016', '--filetype':'DQM', @@ -1627,7 +1659,7 @@ def lhegensim(fragment,howMuch): '--scenario':'cosmics', '--filein':'file:step2.root', '--secondfilein':'filelist:step1_dasquery.log'} - + steps['RECOFROMRECO']=merge([{'-s':'RECO,EI', '--filtername':'RECOfromRECO', '--process':'reRECO', @@ -1697,12 +1729,12 @@ def lhegensim(fragment,howMuch): ################################################################################# ####From this line till the end of the file : -####UPGRADE WORKFLOWS IN PREPARATION - Gaelle's sandbox - +####UPGRADE WORKFLOWS IN PREPARATION - Gaelle's sandbox - #####Accessible only through the option --what upgrade #####(unless specifically added to relval_2023.py) #####Transparent for any of the standard workflows -#### list of worflows defined (not necessarly running though): runTheMatrix.py --what upgrade -n -#### +#### list of worflows defined (not necessarly running though): runTheMatrix.py --what upgrade -n +#### ### ################################################################################# @@ -1724,14 +1756,14 @@ def lhegensim(fragment,howMuch): keys=defaultDataSets.keys() for key in keys: defaultDataSets[key+'PU']=defaultDataSets[key] - + # sometimes v1 won't be used - override it here - the dictionary key is gen fragment + '_' + geometry versionOverrides={} baseDataSetReleaseBetter={} for gen in upgradeFragments: - for ds in defaultDataSets: - key=gen[:-4]+'_'+ds + for ds in defaultDataSets: + key=gen[:-4]+'_'+ds version='1' if key in versionOverrides: version = versionOverrides[key] @@ -1745,7 +1777,7 @@ def lhegensim(fragment,howMuch): PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} else: PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)} - + #PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} #PUDataSets[ds]={'-n':10,'--pileup':'AVE_70_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} @@ -1800,7 +1832,7 @@ def lhegensim(fragment,howMuch): '--eventcontent': 'FEVTDEBUG', '--geometry' : geom } - + upgradeStepDict['DigiFull'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:%s'%(hltversion), '--conditions':gt, '--datatier':'GEN-SIM-DIGI-RAW', @@ -1809,7 +1841,7 @@ def lhegensim(fragment,howMuch): '--geometry' : geom } - # Adding Track trigger step in step2 + # Adding Track trigger step in step2 upgradeStepDict['DigiFullTrigger'][k] = {'-s':'DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:%s'%(hltversion), '--conditions':gt, '--datatier':'GEN-SIM-DIGI-RAW', @@ -1924,18 +1956,18 @@ def lhegensim(fragment,howMuch): howMuch=howMuches[frag] for key in [key for year in upgradeKeys for key in upgradeKeys[year]]: k=frag[:-4]+'_'+key+'_'+step - if step in upgradeStepDict and key in upgradeStepDict[step]: + if step in upgradeStepDict and key in upgradeStepDict[step]: steps[k]=merge([ {'cfg':frag},howMuch,upgradeStepDict[step][key]]) #get inputs in case of -i...but no need to specify in great detail #however, there can be a conflict of beam spots but this is lost in the dataset name - #so please be careful + #so please be careful s=frag[:-4]+'_'+key if 'FastSim' not in k and s+'INPUT' not in steps and s in baseDataSetReleaseBetter and defaultDataSets[key] != '': # exclude upgradeKeys without input dataset steps[k+'INPUT']={'INPUT':InputInfo(dataSet='/RelVal'+upgradeDatasetFromFragment[frag]+'/%s/GEN-SIM'%(baseDataSetReleaseBetter[s],),location='STD')} else: for key in [key for year in upgradeKeys for key in upgradeKeys[year]]: k=step+'_'+key - if step in upgradeStepDict and key in upgradeStepDict[step]: + if step in upgradeStepDict and key in upgradeStepDict[step]: steps[k]=merge([upgradeStepDict[step][key]]) # 2017 tracking specific eras