Skip to content

Commit

Permalink
Synchronise with CMSSW_11_2_0_pre8
Browse files Browse the repository at this point in the history
  • Loading branch information
@fwyzard
fwyzard committed Oct 23, 2020
1 parent d63405e commit 71731b3
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 86 deletions.
45 changes: 35 additions & 10 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Expand Up @@ -604,7 +604,6 @@ def gen2021hiprod(fragment,howMuch):
steps['WpToENu_M-2000_13']=gen2015('WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff',Kby(9,100))
steps['DisplacedSUSY_stopToBottom_M_300_1000mm_13']=gen2015('DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff',Kby(9,100))


### 2017 wf: only the ones for premixing (for the moment)
steps['NuGun_UP17']=gen2017('SingleNuE10_cfi.py',Kby(9,50))
steps['TTbar_13UP17']=gen2017('TTbar_13TeV_TuneCUETP8M1_cfi',Kby(9,50))
Expand Down Expand Up @@ -1955,6 +1954,7 @@ def lhegensim2018ml(fragment,howMuch):
'--datatier':'MINIAOD,DQMIO',
'--eventcontent':'MINIAOD,DQM',
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'run2_miniAOD_pp_on_AA_103X',
'--data':'',
'--processName':'PAT',
'-n':'100'
Expand Down Expand Up @@ -2094,7 +2094,7 @@ def lhegensim2018ml(fragment,howMuch):

steps['ALCAHARVDHPBS']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdBeamSpotHP']),
#'--conditions':'auto:run2_data_promptlike',
'--conditions':'92X_dataRun2_Express_v2_snapshotted', # to replaced with line above once run2_data_promptlike will contain DropBoxMetadata
'--conditions':'auto:run3_data_express', # to replaced with line above once run2_data_promptlike will contain DropBoxMetadata
'--scenario':'pp',
'--data':'',
'--era':'Run2_2017',
Expand All @@ -2103,7 +2103,7 @@ def lhegensim2018ml(fragment,howMuch):

steps['ALCAHARVDHPBSLOWPU']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdBeamSpotHPLowPU']),
#'--conditions':'auto:run2_data_promptlike',
'--conditions':'92X_dataRun2_Express_v2_snapshotted', # to replaced with line above once run2_data_promptlike will contain DropBoxMetadata
'--conditions':'auto:run3_data_express', # to replaced with line above once run2_data_promptlike will contain DropBoxMetadata
'--scenario':'pp',
'--data':'',
'--era':'Run2_2017',
Expand All @@ -2112,7 +2112,7 @@ def lhegensim2018ml(fragment,howMuch):


steps['ALCAHARVDSIPIXELCAL']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdSiPixel']),
'--conditions':'100X_dataRun2_Express_v2',
'--conditions':'auto:run3_data_express',
'--scenario':'pp',
'--data':'',
'--era':'Run2_2017',
Expand Down Expand Up @@ -2480,6 +2480,12 @@ def gen2021HiMix(fragment,howMuch):
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
},step3Up2015Defaults])
steps['RECOHI2021PPRECOMB']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
'--era':'Run3_pp_on_PbPb',
'--procModifiers':'genJetSubEvent',
},step3Up2015Defaults])

steps['ALCARECOHI2021PPRECO']=merge([hiDefaults2021_ppReco,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias',
'--datatier':'ALCARECO',
Expand All @@ -2490,14 +2496,28 @@ def gen2021HiMix(fragment,howMuch):
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO,ALCARECO',
'--eventcontent':'RECOSIM,MINIAODSIM,DQM,ALCARECO',
},step3Up2015Defaults])
steps['RECOHI2018PPRECOml']=merge([concurrentLumis,steps['RECOHI2018PPRECO']])
steps['RECOHI2018PPRECOMB']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO,ALCARECO',
'--eventcontent':'RECOSIM,MINIAODSIM,DQM,ALCARECO',
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'genJetSubEvent',
},step3Up2015Defaults])
steps['RECOHI2018PPRECOml']=merge([concurrentLumis,steps['RECOHI2018PPRECOMB']])

steps['REMINIAODHI2018PPRECO']=merge([{'-s':'PAT,VALIDATION:@miniAODValidation,DQM:@miniAODDQM',
'--datatier':'MINIAODSIM,DQMIO',
'--eventcontent':'MINIAODSIM,DQM',
'-n':100,
},hiDefaults2018_ppReco,step3Up2015Defaults])

'--datatier':'MINIAODSIM,DQMIO',
'--eventcontent':'MINIAODSIM,DQM',
'-n':100,
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'run2_miniAOD_pp_on_AA_103X',
},hiDefaults2018_ppReco,step3Up2015Defaults])
steps['REMINIAODHI2018PPRECOMB']=merge([{'-s':'PAT,VALIDATION:@miniAODValidation,DQM:@miniAODDQM',
'--datatier':'MINIAODSIM,DQMIO',
'--eventcontent':'MINIAODSIM,DQM',
'-n':100,
'--era':'Run2_2018_pp_on_AA',
'--procModifiers':'genJetSubEvent,run2_miniAOD_pp_on_AA_103X',
},hiDefaults2018_ppReco,step3Up2015Defaults])
steps['ALCARECOHI2018PPRECO']=merge([hiDefaults2018_ppReco,{'-s':'ALCA:TkAlMinBias+SiStripCalMinBias',
'--datatier':'ALCARECO',
'--eventcontent':'ALCARECO'
Expand Down Expand Up @@ -3107,11 +3127,16 @@ def gen2021HiMix(fragment,howMuch):
steps['MINIAODMCUP18ml'] =merge([concurrentLumis,steps['MINIAODMCUP18']])

stepNanoAODDefaults = { '-s': 'NANO,DQM:@nanoAODDQM', '-n': 1000 }
stepNanoGenDefaults = { '-s': 'NANOGEN,DQM:@nanogenDQM', '-n': 1000 }
stepNanoAODData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD,DQM' ,'--datatier': 'NANOAOD,DQMIO' }, stepNanoAODDefaults ])
stepNanoAODMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOAODSIM,DQM','--datatier': 'NANOAODSIM,DQMIO' }, stepNanoAODDefaults ])
stepNanoEDMData = merge([{ '--data':'', '--eventcontent' : 'NANOEDMAOD,DQM' ,'--datatier': 'NANOAOD,DQMIO' }, stepNanoAODDefaults ])
stepNanoEDMMC = merge([{ '--mc':'' , '--eventcontent' : 'NANOEDMAODSIM,DQM','--datatier': 'NANOAODSIM,DQMIO' }, stepNanoAODDefaults ])
stepNanoEDMMCProd = merge([{ '--mc':'', '-s': 'NANO', '--eventcontent' : 'NANOEDMAODSIM','--datatier': 'NANOAODSIM' }, stepNanoAODDefaults ])
stepNanoGen = merge([{ '--mc':'' , '--eventcontent' : 'NANOAODGEN,DQM','--datatier': 'NANOAODSIM,DQMIO' }, stepNanoGenDefaults ])

steps['NANOGENFromGen'] = merge([{'--conditions': 'auto:run2_mc', '--customise' : 'PhysicsTools/NanoAOD/nanogen_cff.customizeNanoGEN'}, stepNanoGen ])
steps['NANOGENFromMini'] = merge([{'--conditions': 'auto:run2_mc'}, stepNanoGen ])

steps['NANOAOD2016'] = merge([{'--conditions': 'auto:run2_data_relval', '--era': 'Run2_2016'}, stepNanoAODData ])
steps['NANOAOD2017'] = merge([{'--conditions': 'auto:run2_data_relval', '--era': 'Run2_2017'}, stepNanoAODData ])
Expand Down
151 changes: 75 additions & 76 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Expand Up @@ -30,34 +30,30 @@
upgradeKeys[2026] = [
'2026D49',
'2026D49PU',
'2026D51',
'2026D51PU',
'2026D53',
'2026D53PU',
'2026D54',
'2026D54PU',
'2026D56',
'2026D56PU',
'2026D57',
'2026D57PU',
'2026D58',
'2026D58PU',
'2026D59',
'2026D59PU',
'2026D60',
'2026D60PU',
'2026D61',
'2026D61PU',
'2026D62',
'2026D62PU',
'2026D63',
'2026D63PU',
'2026D64',
'2026D64PU',
'2026D65',
'2026D65PU',
'2026D66',
'2026D66PU',
'2026D67',
'2026D67PU',
'2026D68',
'2026D68PU',
'2026D69',
'2026D69PU',
'2026D70',
'2026D70PU',
'2026D71',
'2026D71PU',
'2026D72',
'2026D72PU',
'2026D73',
'2026D73PU',
'2026D74',
'2026D74PU',
]

# pre-generation of WF numbers
Expand All @@ -67,7 +63,7 @@
}
numWFSkip=200
# temporary measure to keep other WF numbers the same
numWFConflict = [[20000,23200],[24000,24400],[25000,26000],[26200,26600],[50000,51000]]
numWFConflict = [[20000,23200],[23600,28200],[28600,29800],[50000,51000]]
numWFAll={
2017: [],
2026: []
Expand Down Expand Up @@ -306,6 +302,23 @@ def condition_(self, fragment, stepList, key, hasHarvest):
'--procModifiers': 'trackingMkFit'
}

# Vector Hits workflows
class UpgradeWorkflow_vectorHits(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
stepDict[stepName][k] = merge([{'--procModifiers': 'vectorHits'}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return fragment=="TTbar_14TeV" and '2026' in key
upgradeWFs['vectorHits'] = UpgradeWorkflow_vectorHits(
steps = [
'RecoGlobal',
],
PU = [
'RecoGlobal',
],
suffix = '_vectorHits',
offset = 0.9,
)

# Patatrack workflows
class UpgradeWorkflowPatatrack(UpgradeWorkflow):
def condition(self, fragment, stepList, key, hasHarvest):
Expand Down Expand Up @@ -978,104 +991,89 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D51' : {
'Geom' : 'Extended2026D51',
'2026D60' : {
'Geom' : 'Extended2026D60',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C9',
'Era' : 'Phase2C10',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D53' : {
'Geom' : 'Extended2026D53',
'2026D64' : {
'Geom' : 'Extended2026D64', # N.B.: Geometry with square 50x50 um2 pixels in the Inner Tracker.
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C9',
'GT' : 'auto:phase2_realistic_T22',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D54' : {
'Geom' : 'Extended2026D54', # N.B.: Geometry with 3D pixels in the Inner Tracker.
'2026D65' : {
'Geom' : 'Extended2026D65', # N.B.: Geometry with 3D pixels in the Inner Tracker.
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T19', # This symbolic GT has no pixel template / GenError informations.
'GT' : 'auto:phase2_realistic_T23', # This symbolic GT has no pixel template / GenError informations.
'ProcessModifier': 'phase2_PixelCPEGeneric', # This modifier removes all need for IT template information. DO NOT USE for standard planar sensors.
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D56' : {
'Geom' : 'Extended2026D56',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T20',
'Era' : 'Phase2C9',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D57' : {
'Geom' : 'Extended2026D57',
'2026D66' : {
'Geom' : 'Extended2026D66',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T17',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D58' : {
'Geom' : 'Extended2026D58',
'2026D67' : {
'Geom' : 'Extended2026D67',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T17',
'Era' : 'Phase2C12',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D59' : {
'Geom' : 'Extended2026D59',
'2026D68' : {
'Geom' : 'Extended2026D68',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T17',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D60' : {
'Geom' : 'Extended2026D60',
'2026D69' : {
'Geom' : 'Extended2026D69',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C10',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D61' : {
'Geom' : 'Extended2026D61',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T17',
'Era' : 'Phase2C9',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C12',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D62' : {
'Geom' : 'Extended2026D62',
'2026D70' : {
'Geom' : 'Extended2026D70',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T17',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D63' : {
'Geom' : 'Extended2026D63',
'2026D71' : {
'Geom' : 'Extended2026D71',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D64' : {
'Geom' : 'Extended2026D64', # N.B.: Geometry with square 50x50 um2 pixels in the Inner Tracker.
'2026D72' : {
'Geom' : 'Extended2026D72',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T22',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D65' : {
'Geom' : 'Extended2026D65', # N.B.: Geometry with 3D pixels in the Inner Tracker.
'2026D73' : {
'Geom' : 'Extended2026D73',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T23', # This symbolic GT has no pixel template / GenError informations.
'ProcessModifier': 'phase2_PixelCPEGeneric', # This modifier removes all need for IT template information. DO NOT USE for standard planar sensors.
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D66' : {
'Geom' : 'Extended2026D66',
'2026D74' : {
'Geom' : 'Extended2026D74',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11',
'Era' : 'Phase2C11M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
}
Expand Down Expand Up @@ -1183,7 +1181,7 @@ def __init__(self, howMuch, dataset):
('HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'HSCPstop_M_200_13')),
('RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_cfi', UpgradeFragment(Kby(9,50),'RSGravitonToGaGa_13')),
('WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff', UpgradeFragment(Kby(9,50),'WpToENu_M-2000_13')),
('DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'DisplacedSUSY_stopToB_M_300_1000mm_13')),
('DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_13TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'DisplacedSUSY_stopToB_M_800_500mm_13')),
('TenE_E_0_200_pythia8_cfi', UpgradeFragment(Kby(9,100),'TenE_0_200')),
('FlatRandomPtAndDxyGunProducer_cfi', UpgradeFragment(Kby(9,100),'DisplacedMuonsDxy_0_500')),
('TenTau_E_15_500_pythia8_cfi', UpgradeFragment(Kby(9,100),'TenTau_15_500')),
Expand Down Expand Up @@ -1223,4 +1221,5 @@ def __init__(self, howMuch, dataset):
('Upsilon1SToMuMu_forSTEAM_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50),'Upsilon1SToMuMu_14')),
('TenTau_E_15_500_Eta3p1_pythia8_cfi', UpgradeFragment(Kby(9,100),'TenTau_15_500_Eta3p1')),
('QCD_Pt_1800_2400_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50), 'QCD_Pt_1800_2400_14')),
('DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_14TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'DisplacedSUSY_stopToB_M_800_500mm_14')),
])

0 comments on commit 71731b3

Please sign in to comment.