From 17c8b28a47908d4a015b6db92e0658331f98a15d Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 10:18:08 +0100 Subject: [PATCH 01/11] Remove EI from relval steps --- .../python/relval_steps.py | 224 +++++++++--------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index bdfca7ad6c077..f4bb01ab2bd1d 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -838,7 +838,7 @@ def identitySim(wf): ## high stat step1 ecalHcal={ - '-s':'GEN,SIM,DIGI,DIGI2RAW,RAW2DIGI,L1Reco,RECO,EI', + '-s':'GEN,SIM,DIGI,DIGI2RAW,RAW2DIGI,L1Reco,RECO', '--datatier':'GEN-SIM-DIGI-RAW-RECO', #'--geometry':'ECALHCAL', '--eventcontent':'FEVTDEBUG', @@ -1010,16 +1010,16 @@ def genS(fragment,howMuch): #### fastsim section #### ##no forseen to do things in two steps GEN-SIM then FASTIM->end: maybe later -#step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM', -step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS', +#step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM', +step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION:@standardValidation,DQM:@standardDQMFS', '--fast':'', '--beamspot' : 'Realistic8TeVCollision', '--eventcontent':'FEVTDEBUGHLT,DQM', '--datatier':'GEN-SIM-DIGI-RECO,DQMIO', '--relval':'27000,3000'}, step1Defaults]) -#step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@relval2016,VALIDATION:@standardValidation,DQM:@standardDQM', -step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS', +#step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,HLT:@relval2016,VALIDATION:@standardValidation,DQM:@standardDQM', +step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION:@standardValidation,DQM:@standardDQMFS', '--fast':'', '--conditions' :'auto:run2_mc', '--beamspot' : 'Realistic25ns13TeV2016Collision', @@ -1035,7 +1035,7 @@ def genS(fragment,howMuch): step1FastUpg2015_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'}, step1FastUpg2015Defaults]) -step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS', +step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION:@standardValidation,DQM:@standardDQMFS', '--fast':'', '--conditions' :'auto:phase1_2017_realistic', '--beamspot' : 'Realistic25ns13TeVEarly2017Collision', @@ -1051,7 +1051,7 @@ def genS(fragment,howMuch): step1FastUpg2017_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'}, step1FastUpg2017Defaults]) -step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS', +step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION:@standardValidation,DQM:@standardDQMFS', '--fast':'', '--conditions' :'auto:phase1_2018_realistic', '--beamspot' :'Realistic25ns13TeVEarly2018Collision', @@ -1301,8 +1301,8 @@ def genS(fragment,howMuch): step1Defaults]) steps['TTbarSFSA']=merge([{'cfg':'TTbar_8TeV_TuneCUETP8M1_cfi', -# '-s':'GEN,SIM,RECO,EI,HLT:@fake,VALIDATION', - '-s':'GEN,SIM,RECO,EI,VALIDATION', +# '-s':'GEN,SIM,RECO,HLT:@fake,VALIDATION', + '-s':'GEN,SIM,RECO,VALIDATION', '--fast':''}, step1FastDefaults]) @@ -1852,7 +1852,7 @@ def lhegensim2018ml(fragment,howMuch): steps['DIGIPRMXUP18_PROD_PU25']=merge([premixProd25ns2018,digiPremixUp2018Defaults25ns]) dataReco={'--conditions':'auto:run1_data', - '-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM', + '-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'RECO,MINIAOD,DQMIO', '--eventcontent':'RECO,MINIAOD,DQM', '--data':'', @@ -1860,7 +1860,7 @@ def lhegensim2018ml(fragment,howMuch): '--scenario':'pp', } -dataRecoAlCaCalo=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+EcalTrg+HcalCalIsoTrk,DQM'}, dataReco]) +dataRecoAlCaCalo=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+EcalTrg+HcalCalIsoTrk,DQM'}, dataReco]) hltKey='fake' @@ -1880,7 +1880,7 @@ def lhegensim2018ml(fragment,howMuch): steps['RECOD']=merge([{'--scenario':'pp',},dataReco]) -steps['RECODR1']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias,DQM:@standardDQMFakeHLT+@miniAODDQM'},dataReco]) +steps['RECODR1']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias,DQM:@standardDQMFakeHLT+@miniAODDQM'},dataReco]) steps['RECODAlCaCalo']=merge([{'--scenario':'pp',},dataRecoAlCaCalo]) hltKey50ns='relval50ns' @@ -1968,7 +1968,7 @@ def lhegensim2018ml(fragment,howMuch): steps['RECOHID18']=merge([{ '--scenario':'pp', '--conditions':'auto:run2_data_promptlike_hi', - '-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,SKIM:PbPbEMu+PbPbZEE+PbPbZMM+PbPbZMu,EI,DQM:@commonFakeHLT+@standardDQMFakeHLT', + '-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,SKIM:PbPbEMu+PbPbZEE+PbPbZMM+PbPbZMu,DQM:@commonFakeHLT+@standardDQMFakeHLT', '--datatier':'AOD,DQMIO', '--eventcontent':'AOD,DQM', '--era':'Run2_2018_pp_on_AA', @@ -1989,18 +1989,18 @@ def lhegensim2018ml(fragment,howMuch): } steps['TIER0']=merge([{'--customise':'Configuration/DataProcessing/RecoTLR.customisePrompt', - '-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForPrompt,DQM:@allForPrompt,ENDJOB', + '-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForPrompt,DQM:@allForPrompt,ENDJOB', '--datatier':'RECO,AOD,ALCARECO,DQMIO', '--eventcontent':'RECO,AOD,ALCARECO,DQM', '--process':'RECO' },dataReco]) -steps['TIER0EXP']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForExpress+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO,DQM:@express,ENDJOB', +steps['TIER0EXP']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpress+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO,DQM:@express,ENDJOB', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', '--customise':'Configuration/DataProcessing/RecoTLR.customiseExpress', },steps['TIER0']]) -steps['TIER0EXPRUN2']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:@allForExpress+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO,DQM:@express,ENDJOB', +steps['TIER0EXPRUN2']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:@allForExpress+AlCaPCCZeroBiasFromRECO+AlCaPCCRandomFromRECO,DQM:@express,ENDJOB', '--process':'RECO', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', @@ -2009,7 +2009,7 @@ def lhegensim2018ml(fragment,howMuch): '--conditions':'auto:run2_data' },steps['TIER0']]) -steps['TIER0EXPRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:SiPixelCalZeroBias+SiStripCalZeroBias+SiStripCalMinBias+SiStripCalMinBiasAAG+TkAlMinBias,DQM:@express,ENDJOB', +steps['TIER0EXPRUN3']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:SiPixelCalZeroBias+SiStripCalZeroBias+SiStripCalMinBias+SiStripCalMinBiasAAG+TkAlMinBias,DQM:@express,ENDJOB', '--process':'RECO', '--datatier':'ALCARECO,DQMIO', '--eventcontent':'ALCARECO,DQM', @@ -2087,7 +2087,7 @@ def lhegensim2018ml(fragment,howMuch): '--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_express_trackingOnly', } -steps['TIER0RAWSIPIXELCAL']={'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCAPRODUCER:SiPixelCalZeroBias,DQM:@express,ENDJOB', +steps['TIER0RAWSIPIXELCAL']={'-s':'RAW2DIGI,L1Reco,RECO,ALCAPRODUCER:SiPixelCalZeroBias,DQM:@express,ENDJOB', '--process':'RECO', '--scenario': 'pp', '--era':'Run2_2017', @@ -2241,7 +2241,7 @@ def lhegensim2018ml(fragment,howMuch): '--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco]) steps['RECODR3Splash']=merge([{'-n': 2, - '-s': 'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM' + '-s': 'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM' },steps['RECODR3']]) steps['RECOCOSDRUN3']=merge([{'--conditions':'auto:run3_data','--era':'Run3'},steps['RECOCOSD']]) @@ -2276,20 +2276,20 @@ def gen2021HiMix(fragment,howMuch): # step3 step3Defaults = { - '-s' : 'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', + '-s' : 'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--conditions' : 'auto:run1_mc', '--no_exec' : '', '--datatier' : 'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent': 'RECOSIM,MINIAODSIM,DQM', } -step3DefaultsAlCaCalo=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+HcalCalIsoTrk,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM'},step3Defaults]) +step3DefaultsAlCaCalo=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+HcalCalIsoTrk,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM'},step3Defaults]) steps['DIGIPU']=merge([{'--process':'REDIGI'},steps['DIGIPU1']]) #for 2015 step3Up2015Defaults = { - #'-s':'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM', - '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', + #'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM', + '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--conditions':'auto:run2_mc', '-n':'10', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', @@ -2297,12 +2297,12 @@ def gen2021HiMix(fragment,howMuch): '--era' : 'Run2_2016' } -step3Up2015Defaults50ns = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015Defaults]) +step3Up2015Defaults50ns = merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015Defaults]) -step3Up2015DefaultsAlCaCalo = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+EcalTrg+HcalCalIsoTrk,VALIDATION:@standardValidationNoHLT,DQM:@standardDQMFakeHLT'},step3Up2015Defaults]) +step3Up2015DefaultsAlCaCalo = merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron+EcalTrg+HcalCalIsoTrk,VALIDATION:@standardValidationNoHLT,DQM:@standardDQMFakeHLT'},step3Up2015Defaults]) step3Up2015DefaultsAlCaCalo50ns = merge([{'--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015DefaultsAlCaCalo]) -step3Up2015Hal = {'-s' :'RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM', +step3Up2015Hal = {'-s' :'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM', '--conditions' :'auto:run2_mc', '--datatier' :'GEN-SIM-RECO,DQMIO', '--eventcontent':'RECOSIM,DQM', @@ -2331,8 +2331,8 @@ def gen2021HiMix(fragment,howMuch): step3Up2015Defaults_trackingOnly = merge([step3_trackingOnly, step3Up2015Defaults]) steps['RECOUP15']=merge([step3Up2015Defaults]) # todo: remove UP from label -steps['RECOUP15_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},step3Up2015Defaults]) # todo: remove UP from label -steps['RECOUP15_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},step3Up2015Defaults]) # todo: remove UP from label +steps['RECOUP15_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},step3Up2015Defaults]) # todo: remove UP from label +steps['RECOUP15_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},step3Up2015Defaults]) # todo: remove UP from label steps['RECOUP15AlCaCalo']=merge([step3Up2015DefaultsAlCaCalo]) # todo: remove UP from label steps['RECOUP15_trackingOnly']=merge([step3Up2015Defaults_trackingOnly]) # todo: remove UP from label @@ -2347,12 +2347,12 @@ def gen2021HiMix(fragment,howMuch): steps['RECOUP18_PU25']=merge([PU25UP18,steps['RECOUP18']]) # for Run1 PPb data workflow -steps['RECO_PPbData']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:TkAlMinBias+TkAlMuonIsolatedPA+TkAlUpsilonMuMuPA+TkAlZMuMuPA,SKIM:PAZMM+PAZEE+PAMinBias,EI,DQM','--scenario':'pp','--conditions':'auto:run1_data','--era':'Run1_pA','--datatier':'AOD,DQMIO','--eventcontent':'AOD,DQM'}, dataReco]) +steps['RECO_PPbData']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:TkAlMinBias+TkAlMuonIsolatedPA+TkAlUpsilonMuMuPA+TkAlZMuMuPA,SKIM:PAZMM+PAZEE+PAMinBias,DQM','--scenario':'pp','--conditions':'auto:run1_data','--era':'Run1_pA','--datatier':'AOD,DQMIO','--eventcontent':'AOD,DQM'}, dataReco]) # for Run2 PPb MC workflow -steps['RECOUP15_PPb']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:TkAlMinBias+TkAlMuonIsolatedPA+TkAlUpsilonMuMuPA+TkAlZMuMuPA,EI,VALIDATION,DQM','--conditions':'auto:run2_mc_pa','--era':'Run2_2016_pA','--datatier':'AODSIM,DQMIO','--eventcontent':'AODSIM,DQM'}, steps['RECOUP15']]) +steps['RECOUP15_PPb']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:TkAlMinBias+TkAlMuonIsolatedPA+TkAlUpsilonMuMuPA+TkAlZMuMuPA,VALIDATION,DQM','--conditions':'auto:run2_mc_pa','--era':'Run2_2016_pA','--datatier':'AODSIM,DQMIO','--eventcontent':'AODSIM,DQM'}, steps['RECOUP15']]) -#steps['RECOUP15PROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,EI,DQM:DQMOfflinePOGMC', '--datatier' : 'AODSIM,DQMIO', '--eventcontent' : 'AODSIM,DQM'},step3Up2015Defaults]) +#steps['RECOUP15PROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,DQM:DQMOfflinePOGMC', '--datatier' : 'AODSIM,DQMIO', '--eventcontent' : 'AODSIM,DQM'},step3Up2015Defaults]) steps['RECODreHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECOD']]) steps['RECODR1reHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODR1']]) @@ -2361,49 +2361,49 @@ def gen2021HiMix(fragment,howMuch): steps['RECODreHLTAlCaCalo']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODAlCaCalo']]) steps['RECODR2_25nsreHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR2_25ns']]) -steps['RECODR2_25nsreHLT_ZB']=merge([{'--hltProcess':'reHLT','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_25ns']]) +steps['RECODR2_25nsreHLT_ZB']=merge([{'--hltProcess':'reHLT','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_25ns']]) steps['RECODR2_50nsreHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR2_50ns']]) -steps['RECODR2_50nsreHLT_ZB']=merge([{'--hltProcess':'reHLT','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_50ns']]) +steps['RECODR2_50nsreHLT_ZB']=merge([{'--hltProcess':'reHLT','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_50ns']]) steps['RECODR2_2016reHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval'},steps['RECODR2_2016']]) -steps['RECODR2_2016reHLT_ZB']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_2016']]) -steps['RECODR2_2016reHLT_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_ZB']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_2016']]) +steps['RECODR2_2016reHLT_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECODR2_2016reHLT']]) steps['RECODR2_2017reHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval'},steps['RECODR2_2017']]) steps['RECODR2reHLTAlCaEle']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval'},steps['RECODR2AlCaEle']]) -steps['RECODR2reHLTAlCaTkCosmics']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,EI,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2016']]) -steps['RECODR2_2017reHLTAlCaTkCosmics']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,EI,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2017']]) -steps['RECODR2_2017reHLTSiPixelCalZeroBias']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiPixelCalZeroBias,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2017']]) -steps['RECODR2_2018reHLTAlCaTkCosmics']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,EI,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2018']]) - -steps['RECODR2_2016reHLT_skimSingleMu']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZMu+MuTau,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon+@lumi+@L1TMuon'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_skimDoubleEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_skimSinglePh']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SinglePhotonJetPlusHOFilter+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon'},steps['RECODR2_2016reHLT']]) - -steps['RECODR2_2017reHLT_skimSingleMu']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon+@lumi+@L1TMuon'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimDoubleEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimDisplacedJet']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXODisplacedJet,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimSinglePh']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SinglePhotonJetPlusHOFilter+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_skimCharmonium']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGJPsiSkim+BPHSkim,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2017reHLT']]) +steps['RECODR2reHLTAlCaTkCosmics']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2016']]) +steps['RECODR2_2017reHLTAlCaTkCosmics']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2017']]) +steps['RECODR2_2017reHLTSiPixelCalZeroBias']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiPixelCalZeroBias,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2017']]) +steps['RECODR2_2018reHLTAlCaTkCosmics']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval','-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR2_2018']]) + +steps['RECODR2_2016reHLT_skimSingleMu']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZMu+MuTau,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon+@lumi+@L1TMuon'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_skimDoubleEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_skimSinglePh']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SinglePhotonJetPlusHOFilter+EXOMONOPOLE,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon'},steps['RECODR2_2016reHLT']]) + +steps['RECODR2_2017reHLT_skimSingleMu']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon+@lumi+@L1TMuon'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimDoubleEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimDisplacedJet']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXODisplacedJet,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimSinglePh']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SinglePhotonJetPlusHOFilter+EXOMONOPOLE,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_skimCharmonium']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGJPsiSkim+BPHSkim,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2017reHLT']]) steps['RECODR2_2018reHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval'},steps['RECODR2_2018']]) -steps['RECODR2_2018reHLT_skimSingleMu']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon+@lumi+@L1TMuon'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimEGamma_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron+SinglePhotonJetPlusHOFilter+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma+@L1TEgamma'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimDisplacedJet']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXODisplacedJet,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimCharmonium']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGJPsiSkim+BPHSkim,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_skimParkingBPH']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SkimBPark,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT','--era':'Run2_2018,bParking'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimSingleMu']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon+@lumi+@L1TMuon'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimEGamma_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:ZElectron+SinglePhotonJetPlusHOFilter+EXOMONOPOLE,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@ecal+@egamma+@L1TEgamma'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimMuonEG']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:TopMuEG,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimJetHT']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:JetHTJetPlusHOFilter,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimDisplacedJet']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXODisplacedJet,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimMET']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:HighMET+EXOMONOPOLE,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@jetmet+@hcalOnly'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimMuOnia']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:BPHSkim,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT+@muon'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimCharmonium']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGJPsiSkim+BPHSkim,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_skimParkingBPH']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:SkimBPark,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+SiStripCalSmallBiasScan+TkAlMinBias+EcalESAlign,DQM:@commonFakeHLT','--era':'Run2_2018,bParking'},steps['RECODR2_2018reHLT']]) for sname in ['RECODR2_50nsreHLT','RECODR2_50nsreHLT_ZB', 'RECODR2_25nsreHLT','RECODR2_25nsreHLT_ZB', @@ -2417,8 +2417,8 @@ def gen2021HiMix(fragment,howMuch): # RECO step with offline GT steps['RECODR2_2016reHLT_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_2016reHLT']]) -steps['RECODR2_2016reHLT_Prompt_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECODR2_2016reHLT_Prompt']]) +steps['RECODR2_2016reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_2016reHLT']]) +steps['RECODR2_2016reHLT_Prompt_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECODR2_2016reHLT_Prompt']]) steps['RECODR2_2016reHLT_skimDoubleEG_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT_skimDoubleEG']]) steps['RECODR2_2016reHLT_skimJetHT_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT_skimJetHT']]) steps['RECODR2_2016reHLT_skimMET_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT_skimMET']]) @@ -2426,12 +2426,12 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR2_2016reHLT_skimSingleMu_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT_skimSingleMu']]) steps['RECODR2_2016reHLT_skimSinglePh_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT_skimSinglePh']]) steps['RECODR2_2016reHLT_skimMuOnia_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2016reHLT_skimMuOnia']]) -steps['RECODR2_2016reHLT_Prompt_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi'},steps['RECODR2_2016reHLT_Prompt']]) -steps['RECODR2_2016reHLT_Prompt_Lumi_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2016reHLT_Prompt']]) +steps['RECODR2_2016reHLT_Prompt_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi'},steps['RECODR2_2016reHLT_Prompt']]) +steps['RECODR2_2016reHLT_Prompt_Lumi_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2016reHLT_Prompt']]) steps['RECODR2_2017reHLT_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) -steps['RECODR2_2017reHLT_Prompt_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECODR2_2017reHLT_Prompt']]) +steps['RECODR2_2017reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBiasFakeHLT+@miniAODDQM'},steps['RECODR2_2017reHLT']]) +steps['RECODR2_2017reHLT_Prompt_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECODR2_2017reHLT_Prompt']]) steps['RECODR2_2017reHLT_skimDoubleEG_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT_skimDoubleEG']]) steps['RECODR2_2017reHLT_skimJetHT_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT_skimJetHT']]) steps['RECODR2_2017reHLT_skimDisplacedJet_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT_skimDisplacedJet']]) @@ -2441,12 +2441,12 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR2_2017reHLT_skimSinglePh_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT_skimSinglePh']]) steps['RECODR2_2017reHLT_skimMuOnia_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT_skimMuOnia']]) steps['RECODR2_2017reHLT_skimCharmonium_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLT_skimCharmonium']]) -steps['RECODR2_2017reHLT_skimSingleMu_Prompt_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2017reHLT_skimSingleMu_Prompt']]) +steps['RECODR2_2017reHLT_skimSingleMu_Prompt_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2017reHLT_skimSingleMu_Prompt']]) steps['RECODR2_2017reHLTAlCaTkCosmics_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLTAlCaTkCosmics']]) steps['RECODR2_2017reHLTSiPixelCalZeroBias_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2017reHLTSiPixelCalZeroBias']]) steps['RECODR2_2018reHLT_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_ZBPrompt']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2018reHLT']]) steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']=merge([{'-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,DQM:@pixelTrackingOnlyDQM'},steps['RECODR2_2018reHLT_Prompt']]) steps['RECODR2_2018reHLT_Patatrack_PixelOnlyCPU']=merge([step3_pixel_ntuplet_cpu, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']]) steps['RECODR2_2018reHLT_Patatrack_PixelOnlyGPU']=merge([step3_pixel_ntuplet_gpu, steps['RECODR2_2018reHLT_Prompt_pixelTrackingOnly']]) @@ -2458,7 +2458,7 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR2_2018reHLT_HCALOnlyCPU']=merge([{'-s': 'RAW2DIGI:RawToDigi_hcalOnly,RECO:reconstruction_hcalOnly,DQM:@hcalOnly+@hcal2Only'},steps['RECODR2_2018reHLT_Prompt']]) steps['RECODR2_2018reHLT_HCALOnlyGPU']=merge([step3_gpu, steps['RECODR2_2018reHLT_HCALOnlyCPU']]) steps['RECODR2_2018reHLT_Offline']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT']]) -steps['RECODR2_2018reHLT_ZBOffline']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2018reHLT']]) +steps['RECODR2_2018reHLT_ZBOffline']=merge([{'--conditions':'auto:run2_data','-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM'},steps['RECODR2_2018reHLT']]) steps['RECODR2_2018reHLT_skimEGamma_Prompt_L1TEgDQM']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimEGamma_L1TEgDQM']]) steps['RECODR2_2018reHLT_skimEGamma_Offline_L1TEgDQM']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimEGamma_L1TEgDQM']]) steps['RECODR2_2018reHLT_skimJetHT_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimJetHT']]) @@ -2477,8 +2477,8 @@ def gen2021HiMix(fragment,howMuch): steps['RECODR2_2018reHLT_skimCharmonium_Offline']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimCharmonium']]) steps['RECODR2_2018reHLT_skimParkingBPH_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimParkingBPH']]) steps['RECODR2_2018reHLT_skimParkingBPH_Offline']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLT_skimParkingBPH']]) -steps['RECODR2_2018reHLT_skimSingleMu_Prompt_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2018reHLT_skimSingleMu_Prompt']]) -steps['RECODR2_2018reHLT_skimSingleMu_Offline_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,EI,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2018reHLT_skimSingleMu_Offline']]) +steps['RECODR2_2018reHLT_skimSingleMu_Prompt_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2018reHLT_skimSingleMu_Prompt']]) +steps['RECODR2_2018reHLT_skimSingleMu_Offline_Lumi']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:MuonPOGSkim+ZMu+MuTau,PAT,ALCA:SiPixelCalSingleMuonLoose+SiPixelCalSingleMuonTight+SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@standardDQMFakeHLT+@miniAODDQM+@lumi+@L1TMuon'},steps['RECODR2_2018reHLT_skimSingleMu_Offline']]) steps['RECODR2_2018reHLTAlCaTkCosmics_Prompt']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLTAlCaTkCosmics']]) steps['RECODR2_2018reHLTAlCaTkCosmics_Offline']=merge([{'--conditions':'auto:run2_data'},steps['RECODR2_2018reHLTAlCaTkCosmics']]) steps['RECODR2_2018reHLT_Prompt_hBStar']=merge([{'--era':'Run2_2018_highBetaStar'},steps['RECODR2_2018reHLT_Prompt']]) @@ -2489,14 +2489,14 @@ def gen2021HiMix(fragment,howMuch): steps['RECOAlCaCalo']=merge([step3DefaultsAlCaCalo]) steps['RECODBG']=merge([{'--eventcontent':'RECODEBUG,MINIAODSIM,DQM'},steps['RECO']]) -steps['RECOPROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT', '--datatier' : 'AODSIM,MINIAODSIM', '--eventcontent' : 'AODSIM,MINIAODSIM'},step3Defaults]) -#steps['RECOPRODUP15']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,EI,DQM:DQMOfflinePOGMC','--datatier':'AODSIM,DQMIO','--eventcontent':'AODSIM,DQM'},step3Up2015Defaults]) -steps['RECOPRODUP15']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT','--datatier':'AODSIM,MINIAODSIM','--eventcontent':'AODSIM,MINIAODSIM'},step3Up2015Defaults]) +steps['RECOPROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT', '--datatier' : 'AODSIM,MINIAODSIM', '--eventcontent' : 'AODSIM,MINIAODSIM'},step3Defaults]) +#steps['RECOPRODUP15']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,DQM:DQMOfflinePOGMC','--datatier':'AODSIM,DQMIO','--eventcontent':'AODSIM,DQM'},step3Up2015Defaults]) +steps['RECOPRODUP15']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT','--datatier':'AODSIM,MINIAODSIM','--eventcontent':'AODSIM,MINIAODSIM'},step3Up2015Defaults]) ## for 2017 PROD steps['RECOPRODUP17']=merge([{ '--era' :'Run2_2017','--conditions': 'auto:phase1_2017_realistic'},steps['RECOPRODUP15']]) ## for 2018 PROD -steps['RECOPRODUP18']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI','--era' :'Run2_2018','--conditions': 'auto:phase1_2018_realistic','--datatier':'AODSIM','--eventcontent':'AODSIM'},step3Up2015Defaults]) -steps['RECOPRODUP18bParking']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI','--era' :'Run2_2018,bParking','--conditions': 'auto:phase1_2018_realistic','--datatier':'AODSIM','--eventcontent':'AODSIM'},step3Up2015Defaults]) +steps['RECOPRODUP18']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM','--era' :'Run2_2018','--conditions': 'auto:phase1_2018_realistic','--datatier':'AODSIM','--eventcontent':'AODSIM'},step3Up2015Defaults]) +steps['RECOPRODUP18bParking']=merge([{ '-s':'RAW2DIGI,L1Reco,RECO,RECOSIM','--era' :'Run2_2018,bParking','--conditions': 'auto:phase1_2018_realistic','--datatier':'AODSIM','--eventcontent':'AODSIM'},step3Up2015Defaults]) ## steps['RECOCOS']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,DQM','--scenario':'cosmics','--datatier':'GEN-SIM-RECO,DQMIO','--eventcontent':'RECOSIM,DQM'},stCond,step3Defaults]) steps['RECOHAL']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,DQM','--scenario':'cosmics'},step3Up2015Hal]) @@ -2510,31 +2510,31 @@ def gen2021HiMix(fragment,howMuch): steps['RECOCOSPEAK_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics_peak','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run2_2018'},step3Up2015Hal]) -steps['RECOMIN']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},stCond,step3Defaults]) -steps['RECOMINUP15']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},step3Up2015Defaults]) +steps['RECOMIN']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},stCond,step3Defaults]) +steps['RECOMINUP15']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},step3Up2015Defaults]) steps['RECOAODUP15']=merge([{'--datatier':'AODSIM,MINIAODSIM,DQMIO','--eventcontent':'AODSIM,MINIAODSIM,DQM'},step3Up2015Defaults]) -steps['RECODDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,DQM:@allForPrompt'},steps['RECOD']]) +steps['RECODDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,DQM:@allForPrompt'},steps['RECOD']]) steps['RECOPU1']=merge([PU,steps['RECO']]) steps['RECOPU2']=merge([PU2,steps['RECO']]) steps['RECOUP15_PU25']=merge([PU25,step3Up2015Defaults]) steps['RECOUP15_PU25_HIPM']=merge([step3_HIPM,steps['RECOUP15_PU25']]) -steps['RECOUP15_PU25_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECOUP15_PU25']]) -steps['RECOUP15_PU25_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECOUP15_PU25']]) +steps['RECOUP15_PU25_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECOUP15_PU25']]) +steps['RECOUP15_PU25_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECOUP15_PU25']]) steps['RECOUP15_PU50']=merge([PU50,step3Up2015Defaults50ns]) -steps['RECOUP15_PU50_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECOUP15_PU50']]) -steps['RECOUP15_PU50_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECOUP15_PU50']]) +steps['RECOUP15_PU50_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECOUP15_PU50']]) +steps['RECOUP15_PU50_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECOUP15_PU50']]) # for PU25 High stats workflows steps['RECOUP15_PU25HS']=merge([PU25HS,step3Up2015Defaults]) #Run3 reco steps['RECODR3_2021']=merge([{'--scenario':'pp','--conditions':'auto:run3_data','--era':'Run3','--customise':'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3'},dataReco]) -steps['RECODR3_MinBiasOffline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) -steps['RECODR3_ZBOffline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) -steps['RECODR3_HLTPhysics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkFilter+HcalCalHO+HcalCalHBHEMuonFilter,DQM:@commonReduced+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) -steps['RECODR3_AlCaTkCosmics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,EI,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR3_2021']]) +steps['RECODR3_MinBiasOffline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@commonSiStripZeroBias+@ExtraHLT+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) +steps['RECODR3_ZBOffline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalESAlign,DQM:@rerecoZeroBias+@ExtraHLT+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) +steps['RECODR3_HLTPhysics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,ALCA:TkAlMinBias+HcalCalIterativePhiSym+HcalCalIsoTrkFilter+HcalCalHO+HcalCalHBHEMuonFilter,DQM:@commonReduced+@miniAODDQM','--procModifiers':'siPixelQualityRawToDigi'},steps['RECODR3_2021']]) +steps['RECODR3_AlCaTkCosmics_Offline']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,SKIM:EXONoBPTXSkim,PAT,ALCA:TkAlCosmicsInCollisions,DQM:@standardDQMFakeHLT+@miniAODDQM'},steps['RECODR3_2021']]) # mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step #steps['RECOmAOD']=merge([step3DefaultsUnsch]) @@ -2557,8 +2557,8 @@ def gen2021HiMix(fragment,howMuch): steps['RECOPRMXUP18_PU25']=merge([ {'--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018','--procModifiers':'premix_stage2'}, step3Up2015Defaults]) -steps['RECOPRMXUP18_PU25_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECOPRMXUP18_PU25']]) -steps['RECOPRMXUP18_PU25_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECOPRMXUP18_PU25']]) +steps['RECOPRMXUP18_PU25_L1TEgDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TEgamma'},steps['RECOPRMXUP18_PU25']]) +steps['RECOPRMXUP18_PU25_L1TMuDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM+@L1TMuon'},steps['RECOPRMXUP18_PU25']]) #Run-Dependent RECO step_RECO18_RD = {'--conditions':'auto:phase1_2018_realistic_rd'} @@ -2567,8 +2567,8 @@ def gen2021HiMix(fragment,howMuch): steps['RECOPRMXUP18_PU25_L1TMuDQM_RD']=merge([step_RECO18_RD, steps['RECOPRMXUP18_PU25_L1TMuDQM']]) recoPremixUp15prod = merge([ - #{'-s':'RAW2DIGI,L1Reco,RECO,EI'}, # tmp - {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,DQM:DQMOfflinePOGMC'}, + #{'-s':'RAW2DIGI,L1Reco,RECO'}, # tmp + {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,DQM:DQMOfflinePOGMC'}, {'--datatier' : 'AODSIM,MINIAODSIM,DQMIO'}, {'--eventcontent' : 'AODSIM,MINIAODSIM,DQMIO'}, {'--era':'Run2_2016'}, # temporary replacement for premix; to be brought back to customisePostLS1 @@ -2582,7 +2582,7 @@ def gen2021HiMix(fragment,howMuch): recoPremixUp15prod]) recoPremixUp17prod = merge([ - {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT'}, + {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT'}, {'--datatier' : 'AODSIM,MINIAODSIM'}, {'--eventcontent' : 'AODSIM,MINIAODSIM'}, {'--era':'Run2_2017'}, @@ -2599,11 +2599,11 @@ def gen2021HiMix(fragment,howMuch): steps['RECOUP15_ID']=merge([{'--hltProcess':'HLT2'},steps['RECOUP15']]) -steps['RECOHI2021PPRECO']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', +steps['RECOHI2021PPRECO']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--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', +steps['RECOHI2021PPRECOMB']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', '--era':'Run3_pp_on_PbPb', @@ -2615,24 +2615,24 @@ def gen2021HiMix(fragment,howMuch): '--eventcontent':'ALCARECO' }]) -steps['RECOHI2018PPRECO']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', +steps['RECOHI2018PPRECO']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO,ALCARECO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM,ALCARECO', },step3Up2015Defaults]) -steps['RECOHI2018PPRECOMB']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', +steps['RECOHI2018PPRECOMB']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,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['RECOHI2021MIX']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', +steps['RECOHI2021MIX']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--pileup':'HiMix', '--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2021_ppReco/%s/GEN-SIM'%(baseDataSetRelease[23]) },step3Up2015Defaults]) -steps['RECOHIMIX']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', +steps['RECOHIMIX']=merge([hiDefaults2018_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--era':'Run2_2018_pp_on_AA', '--pileup':'HiMix', '--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2018/%s/GEN-SIM'%(baseDataSetRelease[9]) @@ -2659,7 +2659,7 @@ def gen2021HiMix(fragment,howMuch): }]) steps['RECOHI2018']=merge([hiDefaults2018,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults]) -steps['RECOHI2017']=merge([hiDefaults2017,{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM'},step3Up2015Defaults]) +steps['RECOHI2017']=merge([hiDefaults2017,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM'},step3Up2015Defaults]) steps['RECOHI2015']=merge([hiDefaults2015,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Up2015Defaults]) steps['RECOHI2011']=merge([hiDefaults2011,{'-s':'RAW2DIGI,L1Reco,RECO,VALIDATION,DQM'},step3Defaults]) @@ -2672,7 +2672,7 @@ def gen2021HiMix(fragment,howMuch): '--filtername':'reRECO'}, steps['RECOHID11St3']]) #steps['RECOFS']=merge([{'--fast':'', -# '-s':'RECO,EI,HLT:@fake,VALIDATION'}, +# '-s':'RECO,HLT:@fake,VALIDATION'}, # steps['RECO']]) #add this line when testing from an input file that is not strictly GEN-SIM @@ -3232,7 +3232,7 @@ def gen2021HiMix(fragment,howMuch): '--filein':'file:step2.root', '--secondfilein':'filelist:step1_dasquery.log'} -steps['RECOFROMRECO']=merge([{'-s':'RECO,EI', +steps['RECOFROMRECO']=merge([{'-s':'RECO', '--filtername':'RECOfromRECO', '--process':'reRECO', '--datatier':'AODSIM', @@ -3425,7 +3425,7 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : 'DB:Extended' } steps['DigiFullHEfail']=merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2018','--datatier':'GEN-SIM-DIGI-RAW','--eventcontent':'FEVTDEBUGHLT'}, steps['HEfail']]) -steps['RecoFullHEfail']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', +steps['RecoFullHEfail']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', }, steps['HEfail']]) @@ -3572,7 +3572,7 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : geom } - upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM', + upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM', '--conditions':gt, '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '-n':'10', @@ -3580,7 +3580,7 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : geom } - upgradeStepDict['RecoFakeHLT'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', + upgradeStepDict['RecoFakeHLT'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--conditions':gt, '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '-n':'10', @@ -3671,7 +3671,7 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : geom } - upgradeStepDict['RecoNano'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM', + upgradeStepDict['RecoNano'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM', '--conditions':gt, '--datatier':'GEN-SIM-RECO,MINIAODSIM,NANOAODSIM,DQMIO', '-n':'10', From 4d3bc67dac348ce149c28561fba5600114b5c7d8 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 10:49:18 +0100 Subject: [PATCH 02/11] Removing EI content --- Configuration/EventContent/python/EventContent_cff.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 76d7a539f24f9..e58516f48f914 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -60,7 +60,6 @@ from RecoEgamma.Configuration.RecoEgamma_EventContent_cff import * from RecoParticleFlow.Configuration.RecoParticleFlow_EventContent_cff import * from RecoVertex.BeamSpotProducer.BeamSpot_EventContent_cff import * -from CommonTools.ParticleFlow.EITopPAG_EventContent_cff import EITopPAGEventContent from RecoPPS.Configuration.RecoCTPPS_EventContent_cff import * from RecoHGCal.Configuration.RecoHGCal_EventContent_cff import * @@ -210,7 +209,6 @@ def SwapKeepAndDrop(l): RECOEventContent.outputCommands.extend(OnlineMetaDataContent.outputCommands) RECOEventContent.outputCommands.extend(TcdsEventContent.outputCommands) RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands) -RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands) from Configuration.Eras.Modifier_ctpps_cff import ctpps from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal From f227aa98924d98d535005943cd62ad9c8e7e2feb Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 10:52:56 +0100 Subject: [PATCH 03/11] Remove EI declaration --- Configuration/StandardSequences/python/EventInterpretation.py | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Configuration/StandardSequences/python/EventInterpretation.py diff --git a/Configuration/StandardSequences/python/EventInterpretation.py b/Configuration/StandardSequences/python/EventInterpretation.py deleted file mode 100644 index f0f79d35e5f73..0000000000000 --- a/Configuration/StandardSequences/python/EventInterpretation.py +++ /dev/null @@ -1,4 +0,0 @@ -EventInterpretation = { - 'top' : 'CommonTools.ParticleFlow.EITopPAG_cff', - 'MiniAODfromMiniAOD' : 'PhysicsTools.PatAlgos.slimming.MiniAODfromMiniAOD_cff' - } From 32bd14dd07e5a022564fdd4120369bafe8e093db Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 12:29:56 +0100 Subject: [PATCH 04/11] Drop EI Event Content --- Configuration/EventContent/python/EventContent_cff.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index e58516f48f914..764eb9d22e191 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -491,7 +491,6 @@ def SwapKeepAndDrop(l): FEVTEventContent.outputCommands.extend(OnlineMetaDataContent.outputCommands) FEVTEventContent.outputCommands.extend(TcdsEventContent.outputCommands) FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands) -FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands) ctpps.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands) From aa00d8aa928a6832e0c000502008b0c37d8389a7 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 13:03:55 +0100 Subject: [PATCH 05/11] Remove EI from ConfigBuilder --- Configuration/Applications/python/ConfigBuilder.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 6a83d34958e97..2a9d48dbaa8f9 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -1735,18 +1735,6 @@ def prepare_NANOGEN(self, sequence = "nanoAOD"): else: self._options.customisation_file.insert(0, '.'.join([self.NANOGENDefaultCFF, custom])) - def prepare_EI(self, sequence = None): - ''' Enrich the schedule with event interpretation ''' - from Configuration.StandardSequences.EventInterpretation import EventInterpretation - if sequence in EventInterpretation: - self.EIDefaultCFF = EventInterpretation[sequence] - sequence = 'EIsequence' - else: - raise Exception('Cannot set %s event interpretation'%( sequence) ) - self.loadDefaultOrSpecifiedCFF(sequence,self.EIDefaultCFF) - self.scheduleSequence(sequence.split('.')[-1],'eventinterpretaion_step') - return - def prepare_SKIM(self, sequence = "all"): ''' Enrich the schedule with skimming fragments''' skimConfig = self.loadDefaultOrSpecifiedCFF(sequence,self.SKIMDefaultCFF) From d50fea73cf4e31be847c138115eaadb1ba235124 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 13:31:21 +0100 Subject: [PATCH 06/11] Remove EI from RECO --- Configuration/Applications/python/ConfigBuilder.py | 2 -- Configuration/DataProcessing/python/Impl/hcalnzs.py | 1 - .../DataProcessing/python/Impl/hcalnzsEra_Run2_2016.py | 1 - .../DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py | 1 - .../DataProcessing/python/Impl/hcalnzsEra_Run2_2018.py | 1 - .../python/Impl/hcalnzsEra_Run2_2018_highBetaStar.py | 1 - .../DataProcessing/python/Impl/hcalnzsEra_Run2_25ns.py | 1 - .../DataProcessing/python/Impl/hcalnzsEra_Run3.py | 1 - Configuration/DataProcessing/python/Impl/pp.py | 1 - .../DataProcessing/python/Impl/ppEra_Run2_2016.py | 1 - .../DataProcessing/python/Impl/ppEra_Run2_2016_pA.py | 1 - .../DataProcessing/python/Impl/ppEra_Run2_2017.py | 1 - .../DataProcessing/python/Impl/ppEra_Run2_2017_ppRef.py | 1 - .../python/Impl/ppEra_Run2_2017_pp_on_XeXe.py | 1 - .../python/Impl/ppEra_Run2_2017_trackingLowPU.py | 1 - .../python/Impl/ppEra_Run2_2017_trackingOnly.py | 1 - .../DataProcessing/python/Impl/ppEra_Run2_2018.py | 1 - .../python/Impl/ppEra_Run2_2018_highBetaStar.py | 1 - .../python/Impl/ppEra_Run2_2018_pp_on_AA.py | 1 - .../DataProcessing/python/Impl/ppEra_Run2_50ns.py | 1 - Configuration/DataProcessing/python/Impl/ppEra_Run3.py | 1 - Configuration/DataProcessing/python/Impl/trackingOnly.py | 2 -- .../python/Impl/trackingOnlyEra_Run2_2017.py | 1 - .../python/Impl/trackingOnlyEra_Run2_2018.py | 1 - .../python/Impl/trackingOnlyEra_Run2_2018_highBetaStar.py | 1 - .../DataProcessing/python/Impl/trackingOnlyEra_Run3.py | 1 - Configuration/DataProcessing/python/Reco.py | 7 ------- .../python/upgradeWorkflowComponents.py | 8 ++++---- 28 files changed, 4 insertions(+), 39 deletions(-) diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 2a9d48dbaa8f9..7395b143cbac7 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -966,7 +966,6 @@ def define_Configs(self): self.PATDefaultCFF="Configuration/StandardSequences/PAT_cff" self.NANODefaultCFF="PhysicsTools/NanoAOD/nano_cff" self.NANOGENDefaultCFF="PhysicsTools/NanoAOD/nanogen_cff" - self.EIDefaultCFF=None self.SKIMDefaultCFF="Configuration/StandardSequences/Skims_cff" self.POSTRECODefaultCFF="Configuration/StandardSequences/PostRecoGenerator_cff" self.VALIDATIONDefaultCFF="Configuration/StandardSequences/Validation_cff" @@ -1006,7 +1005,6 @@ def define_Configs(self): else: self.RECODefaultSeq='reconstruction_fromRECO' self.RECOSIMDefaultSeq='recosim' - self.EIDefaultSeq='top' self.POSTRECODefaultSeq=None self.L1HwValDefaultSeq='L1HwVal' self.DQMDefaultSeq='DQMOffline' diff --git a/Configuration/DataProcessing/python/Impl/hcalnzs.py b/Configuration/DataProcessing/python/Impl/hcalnzs.py index f280f901d1405..faed7e235d034 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzs.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzs.py @@ -16,7 +16,6 @@ def __init__(self): pp.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True """ _hcalnzs_ diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2016.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2016.py index df0bf3969c925..aa6f3d22f9039 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2016.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2016.py @@ -17,7 +17,6 @@ def __init__(self): hcalnzs.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True self.eras = Run2_2016 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py index 8fa79c699a296..6da3aa6b70269 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py @@ -17,7 +17,6 @@ def __init__(self): hcalnzs.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True self.eras = Run2_2017 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018.py index 75ae3007bedf9..3f9a272d5e5cf 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018.py @@ -17,7 +17,6 @@ def __init__(self): hcalnzs.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True self.eras = Run2_2018 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018_highBetaStar.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018_highBetaStar.py index 0df7962610feb..818925e94e165 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018_highBetaStar.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018_highBetaStar.py @@ -17,7 +17,6 @@ def __init__(self): hcalnzs.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True self.eras = Run2_2018_highBetaStar #keep post-era parts the same as in the default 2018 era self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_25ns.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_25ns.py index a262ba7c5d953..9391237386993 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_25ns.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_25ns.py @@ -17,7 +17,6 @@ def __init__(self): hcalnzs.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True self.eras = Run2_25ns self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ] diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run3.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run3.py index 14c0a1bbd0f52..eb65c06ca1139 100644 --- a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run3.py +++ b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run3.py @@ -17,7 +17,6 @@ def __init__(self): hcalnzs.__init__(self) self.recoSeq=':reconstruction_HcalNZS' self.cbSc='pp' - self.addEI=True self.eras = Run3 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ] diff --git a/Configuration/DataProcessing/python/Impl/pp.py b/Configuration/DataProcessing/python/Impl/pp.py index 93056b7fc6be9..401a8ae8120d6 100644 --- a/Configuration/DataProcessing/python/Impl/pp.py +++ b/Configuration/DataProcessing/python/Impl/pp.py @@ -18,7 +18,6 @@ def __init__(self): Reco.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.isRepacked=False self.promptCustoms= [ 'Configuration/DataProcessing/RecoTLR.customisePrompt' ] self.expressCustoms=[ ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016.py index 2ebacfc17137b..01b70f81b1f32 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2016 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_pA.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_pA.py index 04f6918e2eea5..1b29365d74b34 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_pA.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_pA.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2016_pA self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py index 036c2baeee36b..d8bb57e6d8f3d 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2017 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_ppRef.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_ppRef.py index c438c33aee07a..5da32832c87e3 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_ppRef.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_ppRef.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2017_ppRef self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_ppRef' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_ppRef' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_pp_on_XeXe.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_pp_on_XeXe.py index c475b88d8ef76..651fd13750f19 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_pp_on_XeXe.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_pp_on_XeXe.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.isRepacked=True self.eras=Run2_2017_pp_on_XeXe self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_pp_on_XeXe' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py index 81f75f4a33ee1..dd2445504ec28 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2017_trackingLowPU self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingOnly.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingOnly.py index 5db143a015302..18a5518fc5fe4 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingOnly.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingOnly.py @@ -22,7 +22,6 @@ def __init__(self): # some dedicated customization are required, though: customisePostEra_Run2_2017_trackingOnly self.recoSeq=':reconstruction_trackingOnly' self.cbSc='pp' - self.addEI=False self.eras=Run2_2017 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_express_trackingOnly' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018.py index 4940ae7139bb0..b4e0458bd9249 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2018 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_highBetaStar.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_highBetaStar.py index c6592ed4ed02c..42d5fdcb05a85 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_highBetaStar.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_highBetaStar.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2018_highBetaStar #keep post-era parts the same as in the default 2018 era self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_pp_on_AA.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_pp_on_AA.py index 2c4f738522da9..d1dea3edd2a95 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_pp_on_AA.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_pp_on_AA.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.isRepacked=True self.eras=Run2_2018_pp_on_AA self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018_pp_on_AA' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_50ns.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_50ns.py index 1df74731c028a..3eb7e768b05f2 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_50ns.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_50ns.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_50ns """ _ppEra_Run2_50ns_ diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run3.py b/Configuration/DataProcessing/python/Impl/ppEra_Run3.py index 088818ddf2451..34b1253db9940 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run3.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run3.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run3 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ] diff --git a/Configuration/DataProcessing/python/Impl/trackingOnly.py b/Configuration/DataProcessing/python/Impl/trackingOnly.py index 211f15c73e98d..ad63b64907d5e 100644 --- a/Configuration/DataProcessing/python/Impl/trackingOnly.py +++ b/Configuration/DataProcessing/python/Impl/trackingOnly.py @@ -18,8 +18,6 @@ def __init__(self): # some dedicated customization are required, though: see specific era implementations self.recoSeq=':reconstruction_trackingOnly' self.cbSc='pp' - # don't run EI, because only tracking is done - self.addEI=False """ _trackingOnly_ diff --git a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2017.py b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2017.py index be19d32548d6d..4af4dd5aaa1c5 100644 --- a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2017.py +++ b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2017.py @@ -22,7 +22,6 @@ def __init__(self): # some dedicated customization are required, though: customisePostEra_Run2_2017_trackingOnly self.recoSeq=':reconstruction_trackingOnly' self.cbSc='pp' - self.addEI=False self.eras=Run2_2017 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_express_trackingOnly' ] diff --git a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018.py b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018.py index 07b3716c25d8c..976c6d14c0f33 100644 --- a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018.py +++ b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018.py @@ -22,7 +22,6 @@ def __init__(self): # some dedicated customization are required, though: customisePostEra_Run2_2018_trackingOnly self.recoSeq=':reconstruction_trackingOnly' self.cbSc='pp' - self.addEI=False self.eras=Run2_2018 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018_express_trackingOnly' ] diff --git a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018_highBetaStar.py b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018_highBetaStar.py index c1f46cc7fd897..b99fbdeda9778 100644 --- a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018_highBetaStar.py +++ b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018_highBetaStar.py @@ -22,7 +22,6 @@ def __init__(self): # some dedicated customization are required, though: customisePostEra_Run2_2018_trackingOnly self.recoSeq=':reconstruction_trackingOnly' self.cbSc='pp' - self.addEI=False self.eras=Run2_2018_highBetaStar #keep post-era parts the same as in the default 2018 era self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ] diff --git a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run3.py b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run3.py index 302e46d7c4ca7..876928d45888a 100644 --- a/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run3.py +++ b/Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run3.py @@ -22,7 +22,6 @@ def __init__(self): # some dedicated customization are required, though: customisePostEra_Run3_trackingOnly self.recoSeq=':reconstruction_trackingOnly' self.cbSc='pp' - self.addEI=False self.eras=Run3 self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_express_trackingOnly' ] diff --git a/Configuration/DataProcessing/python/Reco.py b/Configuration/DataProcessing/python/Reco.py index 5a00fae062671..7a8a79aa3c075 100644 --- a/Configuration/DataProcessing/python/Reco.py +++ b/Configuration/DataProcessing/python/Reco.py @@ -19,7 +19,6 @@ class Reco(Scenario): def __init__(self): Scenario.__init__(self) self.recoSeq='' - self.addEI=False self.cbSc=self.__class__.__name__ self.promptModifiers = cms.ModifierChain() self.expressModifiers = cms.ModifierChain() @@ -74,8 +73,6 @@ def promptReco(self, globalTag, **args): options.customisation_file=args['customs'] eiStep='' - if self.addEI: - eiStep=',EI' options.step = 'RAW2DIGI,L1Reco,RECO'+self.recoSeq+eiStep+step+PhysicsSkimStep+miniAODStep+',DQM'+dqmStep+',ENDJOB' @@ -118,8 +115,6 @@ def expressProcessing(self, globalTag, **args): options.nThreads=args['nThreads'] eiStep='' - if self.addEI: - eiStep=',EI' options.step = 'RAW2DIGI,L1Reco,RECO'+self.recoSeq+eiStep+step+',DQM'+dqmStep+',ENDJOB' @@ -161,8 +156,6 @@ def visualizationProcessing(self, globalTag, **args): options.step +='FILTER:'+args['preFilter']+',' eiStep='' - if self.addEI: - eiStep=',EI' options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB' diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index b9089ad36b61f..c922d68aa5ccb 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -690,7 +690,7 @@ def setup_(self, step, stepName, stepDict, k, properties): }, reco = { # skip the @pixelTrackingOnlyValidation which cannot run together with the full reconstruction - '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', + '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', '--procModifiers': 'pixelNtupletFit' }, harvest = { @@ -705,7 +705,7 @@ def setup_(self, step, stepName, stepDict, k, properties): }, reco = { # skip the @pixelTrackingOnlyValidation which cannot run together with the full reconstruction - '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', + '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', '--procModifiers': 'pixelNtupletFit,gpu' }, harvest = { @@ -720,7 +720,7 @@ def setup_(self, step, stepName, stepDict, k, properties): }, reco = { # skip the @pixelTrackingOnlyValidation which cannot run together with the full reconstruction - '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', + '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', '--procModifiers': 'pixelNtupletFit', '--customise' : 'RecoPixelVertexing/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets' }, @@ -737,7 +737,7 @@ def setup_(self, step, stepName, stepDict, k, properties): }, reco = { # skip the @pixelTrackingOnlyValidation which cannot run together with the full reconstruction - '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', + '-s': 'RAW2DIGI:RawToDigi+RawToDigi_pixelOnly,L1Reco,RECO:reconstruction+reconstruction_pixelTrackingOnly,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@pixelTrackingOnlyDQM', '--procModifiers': 'pixelNtupletFit,gpu', '--customise': 'RecoPixelVertexing/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets' }, From e2f831cc7b8999df6434ed3713efe6629006538d Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 19:08:42 +0100 Subject: [PATCH 07/11] Removal of EI in old Reco Eras --- .../DataProcessing/python/Impl/ppEra_Run2_2016_trackingLowPU.py | 1 - Configuration/DataProcessing/python/Impl/ppEra_Run2_25ns.py | 1 - 2 files changed, 2 deletions(-) diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_trackingLowPU.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_trackingLowPU.py index 5befd9fb13aaa..a314aa657f2e7 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_trackingLowPU.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_trackingLowPU.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_2016_trackingLowPU self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ] diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_25ns.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_25ns.py index 7c48cf10d9665..6a7bf36707833 100644 --- a/Configuration/DataProcessing/python/Impl/ppEra_Run2_25ns.py +++ b/Configuration/DataProcessing/python/Impl/ppEra_Run2_25ns.py @@ -20,7 +20,6 @@ def __init__(self): pp.__init__(self) self.recoSeq='' self.cbSc='pp' - self.addEI=True self.eras=Run2_25ns self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ] self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ] From 123ced49c9f88c1bddbd2f9484345c539b20c7b9 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 19:51:31 +0100 Subject: [PATCH 08/11] Drop EI from addOnTests --- Utilities/ReleaseScripts/scripts/addOnTests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Utilities/ReleaseScripts/scripts/addOnTests.py b/Utilities/ReleaseScripts/scripts/addOnTests.py index 83372de8a95a2..e3cb56b0e6a10 100755 --- a/Utilities/ReleaseScripts/scripts/addOnTests.py +++ b/Utilities/ReleaseScripts/scripts/addOnTests.py @@ -88,9 +88,9 @@ def prepare(self): if 'CMSSW_RELEASE_BASE' in os.environ and (os.environ['CMSSW_RELEASE_BASE'] != ""): self.relPath = os.environ['CMSSW_RELEASE_BASE'] + '/src/' lines = { 'read312RV' : ['cmsRun '+self.file2Path('Utilities/ReleaseScripts/scripts/read312RV_cfg.py')], - 'fastsim' : ["cmsDriver.py TTbar_8TeV_TuneCUETP8M1_cfi --conditions auto:run1_mc --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot Realistic8TeVCollision"], - 'fastsim1' : ["cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi --conditions auto:run2_mc_l1stage1 --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot NominalCollision2015 --era Run2_25ns"], - 'fastsim2' : ["cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi --conditions auto:run2_mc --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot NominalCollision2015 --era Run2_2016"], + 'fastsim' : ["cmsDriver.py TTbar_8TeV_TuneCUETP8M1_cfi --conditions auto:run1_mc --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot Realistic8TeVCollision"], + 'fastsim1' : ["cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi --conditions auto:run2_mc_l1stage1 --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot NominalCollision2015 --era Run2_25ns"], + 'fastsim2' : ["cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi --conditions auto:run2_mc --fast -n 100 --eventcontent AODSIM,DQM --relval 100000,1000 -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,VALIDATION --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --datatier GEN-SIM-DIGI-RECO,DQMIO --beamspot NominalCollision2015 --era Run2_2016"], 'pat1' : ['cmsRun '+self.file2Path('PhysicsTools/PatAlgos/test/IntegrationTest_cfg.py')], } From 628bd4f8e9f923db16bb90aa1f01e12577fbf703 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 19:51:49 +0100 Subject: [PATCH 09/11] Drop EI from test file --- .../IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py index 9c952f40dceeb..cfb022bbd2d1c 100644 --- a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py +++ b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py @@ -2,7 +2,7 @@ # using: # Revision: 1.19 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v -# with command line options: step3 --conditions auto:run2_mc_GRun -n 10 --eventcontent FEVTDEBUGHLT,DQM -s RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM --datatier GEN-SIM-RECO,DQM --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --geometry Extended2015 --magField 38T_PostLS1 --conditions auto:run2_mc_GRun --no_exec --filein file:step2.root --fileout file:step3.root +# with command line options: step3 --conditions auto:run2_mc_GRun -n 10 --eventcontent FEVTDEBUGHLT,DQM -s RAW2DIGI,L1Reco,RECO,VALIDATION,DQM --datatier GEN-SIM-RECO,DQM --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --geometry Extended2015 --magField 38T_PostLS1 --conditions auto:run2_mc_GRun --no_exec --filein file:step2.root --fileout file:step3.root import FWCore.ParameterSet.Config as cms process = cms.Process('HLTNew1') @@ -22,7 +22,6 @@ process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') -process.load('CommonTools.ParticleFlow.EITopPAG_cff') process.load('Configuration.StandardSequences.Validation_cff') process.load('DQMOffline.Configuration.DQMOfflineMC_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') @@ -211,7 +210,6 @@ process.raw2digi_step = cms.Path(process.RawToDigi) process.L1Reco_step = cms.Path(process.L1Reco) process.reconstruction_step = cms.Path(process.reconstruction) -process.eventinterpretaion_step = cms.Path(process.EIsequence) process.prevalidation_step = cms.Path(process.prevalidation) process.dqmoffline_step = cms.Path(process.DQMOffline) process.validation_step = cms.EndPath(process.validation) From c1e47648f51df25f60f771c9d501385d4bb4db6d Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 13 Dec 2021 19:56:26 +0100 Subject: [PATCH 10/11] Replace pfMetEI and pfJetsEI collections by pfMet and ak4PFJets resp. --- DQMOffline/Trigger/python/BTaggingMonitor_cfi.py | 4 ++-- DQMOffline/Trigger/python/DiJetMonitor_cfi.py | 2 +- DQMOffline/Trigger/python/HTMonitor_cfi.py | 4 ++-- DQMOffline/Trigger/python/HiggsMonitoring_cfi.py | 4 ++-- DQMOffline/Trigger/python/METMonitor_cfi.py | 4 ++-- DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py | 2 +- DQMOffline/Trigger/python/MjjMonitor_cfi.py | 2 +- DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py | 4 ++-- DQMOffline/Trigger/python/MuonMonitor_cfi.py | 2 +- DQMOffline/Trigger/python/PhotonMonitor_cfi.py | 4 ++-- DQMOffline/Trigger/python/RazorMonitor_cfi.py | 4 ++-- DQMOffline/Trigger/python/SoftdropMonitor_cfi.py | 2 +- DQMOffline/Trigger/python/SusyMonitor_cfi.py | 4 ++-- DQMOffline/Trigger/python/TopMonitor_cfi.py | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py b/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py index ac20947f0e631..9e159f5b7f613 100644 --- a/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py +++ b/DQMOffline/Trigger/python/BTaggingMonitor_cfi.py @@ -81,8 +81,8 @@ hltBTVmonitoring.histoPSet.HTBinning2D = cms.vdouble(0,20,40,70,100,150,200,400,700) hltBTVmonitoring.histoPSet.phiBinning2D = cms.vdouble(-3.1416,-1.8849,-0.6283,0.6283,1.8849,3.1416) -hltBTVmonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltBTVmonitoring.jets = cms.InputTag("ak4PFJetsCHS") # ak4PFJets, ak4PFJetsCHS, pfJetsEI +hltBTVmonitoring.met = cms.InputTag("pfMet") # pfMet +hltBTVmonitoring.jets = cms.InputTag("ak4PFJetsCHS") # ak4PFJets, ak4PFJetsCHS, ak4PFJets hltBTVmonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltBTVmonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! diff --git a/DQMOffline/Trigger/python/DiJetMonitor_cfi.py b/DQMOffline/Trigger/python/DiJetMonitor_cfi.py index 0a757def6fd97..1bbe2dbb34c2f 100644 --- a/DQMOffline/Trigger/python/DiJetMonitor_cfi.py +++ b/DQMOffline/Trigger/python/DiJetMonitor_cfi.py @@ -13,7 +13,7 @@ xmin = cms.double( 0.), xmax = cms.double(100.), ) -DiPFjetAve40_Prommonitoring.met = cms.InputTag("pfMetEI") # pfMet +DiPFjetAve40_Prommonitoring.met = cms.InputTag("pfMet") # pfMet #DiPFjetAve40_Prommonitoring.pfjets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS DiPFjetAve40_Prommonitoring.dijetSrc = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS DiPFjetAve40_Prommonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! diff --git a/DQMOffline/Trigger/python/HTMonitor_cfi.py b/DQMOffline/Trigger/python/HTMonitor_cfi.py index 5e446ee93abd2..bc152cb15e9dd 100644 --- a/DQMOffline/Trigger/python/HTMonitor_cfi.py +++ b/DQMOffline/Trigger/python/HTMonitor_cfi.py @@ -14,8 +14,8 @@ xmin = cms.double( -0.5), xmax = cms.double(19999.5), ) -hltHTmonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltHTmonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS +hltHTmonitoring.met = cms.InputTag("pfMet") # pfMet +hltHTmonitoring.jets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS hltHTmonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltHTmonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! diff --git a/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py b/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py index e21c79fd91510..796cd4a1790ef 100644 --- a/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py +++ b/DQMOffline/Trigger/python/HiggsMonitoring_cfi.py @@ -94,8 +94,8 @@ hltHIGmonitoring.histoPSet.phiBinning2D = cms.vdouble(-3.1416,-2.5132,-1.8849,-1.2566,-0.6283,0,0.6283,1.2566,1.8849,2.5132,3.1416) -hltHIGmonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltHIGmonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS +hltHIGmonitoring.met = cms.InputTag("pfMet") # pfMet +hltHIGmonitoring.jets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS hltHIGmonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltHIGmonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! hltHIGmonitoring.vertices = cms.InputTag("offlinePrimaryVertices") diff --git a/DQMOffline/Trigger/python/METMonitor_cfi.py b/DQMOffline/Trigger/python/METMonitor_cfi.py index ddb536863d9cf..8f72ba6acc070 100644 --- a/DQMOffline/Trigger/python/METMonitor_cfi.py +++ b/DQMOffline/Trigger/python/METMonitor_cfi.py @@ -15,8 +15,8 @@ xmax = cms.double(19999.5), ) -hltMETmonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltMETmonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS +hltMETmonitoring.met = cms.InputTag("pfMet") # pfMet +hltMETmonitoring.jets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS hltMETmonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltMETmonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! diff --git a/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py b/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py index 02cde5bb8dc50..40d7f883429b1 100644 --- a/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py +++ b/DQMOffline/Trigger/python/METplusTrackMonitor_cfi.py @@ -43,7 +43,7 @@ hltMETplusTrackMonitoring.histoPSet.ptBinning = cms.vdouble(binsLogX_METplusTrack) hltMETplusTrackMonitoring.met = cms.InputTag("caloMet") # caloMet -hltMETplusTrackMonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS +hltMETplusTrackMonitoring.jets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS hltMETplusTrackMonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! hltMETplusTrackMonitoring.muonSelection = cms.string('pt>26 && abs(eta)<2.1 && (pfIsolationR04.sumChargedHadronPt+pfIsolationR04.sumPhotonEt+pfIsolationR04.sumNeutralHadronEt-0.5*pfIsolationR04.sumPUPt)/pt<0.12') diff --git a/DQMOffline/Trigger/python/MjjMonitor_cfi.py b/DQMOffline/Trigger/python/MjjMonitor_cfi.py index 6b4eb32a24144..8273ef65f6e04 100644 --- a/DQMOffline/Trigger/python/MjjMonitor_cfi.py +++ b/DQMOffline/Trigger/python/MjjMonitor_cfi.py @@ -15,7 +15,7 @@ xmin = cms.double( -0.5), xmax = cms.double(19999.5), ) -hltMjjmonitoring.met = cms.InputTag("pfMetEI") +hltMjjmonitoring.met = cms.InputTag("pfMet") hltMjjmonitoring.jets = cms.InputTag("ak8PFJetsPuppi") hltMjjmonitoring.electrons = cms.InputTag("gedGsfElectrons") hltMjjmonitoring.muons = cms.InputTag("muons") diff --git a/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py b/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py index dbb5ccc02ec9d..63b1662a88597 100644 --- a/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py +++ b/DQMOffline/Trigger/python/MssmHbbMonitoring_cfi.py @@ -94,8 +94,8 @@ mssmHbbMonitoring.histoPSet.phiBinning2D = cms.vdouble(-3.1416,-1.8849,-0.6283,0.6283,1.8849,3.1416) -mssmHbbMonitoring.met = cms.InputTag("pfMetEI") # pfMet -mssmHbbMonitoring.jets = cms.InputTag("ak4PFJetsCHS") # ak4PFJets, ak4PFJetsCHS, pfJetsEI +mssmHbbMonitoring.met = cms.InputTag("pfMet") # pfMet +mssmHbbMonitoring.jets = cms.InputTag("ak4PFJetsCHS") # ak4PFJets, ak4PFJetsCHS, ak4PFJets mssmHbbMonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! mssmHbbMonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! #Suvankar diff --git a/DQMOffline/Trigger/python/MuonMonitor_cfi.py b/DQMOffline/Trigger/python/MuonMonitor_cfi.py index 3130611b53356..93c16eb01c427 100644 --- a/DQMOffline/Trigger/python/MuonMonitor_cfi.py +++ b/DQMOffline/Trigger/python/MuonMonitor_cfi.py @@ -14,7 +14,7 @@ xmin = cms.double( 0.0), xmax = cms.double(500), ) -hltMuonmonitoring.met = cms.InputTag("pfMetEI") # pfMet +hltMuonmonitoring.met = cms.InputTag("pfMet") # pfMet hltMuonmonitoring.muons = cms.InputTag("muons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltMuonmonitoring.nmuons = cms.uint32(0) diff --git a/DQMOffline/Trigger/python/PhotonMonitor_cfi.py b/DQMOffline/Trigger/python/PhotonMonitor_cfi.py index 58752b23fee6c..7037cfba6060f 100644 --- a/DQMOffline/Trigger/python/PhotonMonitor_cfi.py +++ b/DQMOffline/Trigger/python/PhotonMonitor_cfi.py @@ -14,8 +14,8 @@ xmin = cms.double( 0.0), xmax = cms.double(5000), ) -hltPhotonmonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltPhotonmonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS +hltPhotonmonitoring.met = cms.InputTag("pfMet") # pfMet +hltPhotonmonitoring.jets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS hltPhotonmonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltPhotonmonitoring.photons = cms.InputTag("gedPhotons") # while pfIsolatedElectronsEI are reco::PFCandidate ! diff --git a/DQMOffline/Trigger/python/RazorMonitor_cfi.py b/DQMOffline/Trigger/python/RazorMonitor_cfi.py index 24089cf6276dc..0137e097fb8ff 100644 --- a/DQMOffline/Trigger/python/RazorMonitor_cfi.py +++ b/DQMOffline/Trigger/python/RazorMonitor_cfi.py @@ -5,8 +5,8 @@ hltRazorMonitoring = razorMonitoring.clone() hltRazorMonitoring.FolderName = cms.string('HLT/SUSY/RsqMR270_Rsq0p09_MR200') -hltRazorMonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltRazorMonitoring.jets = cms.InputTag("pfJetsEI") # ak4PFJets, ak4PFJetsCHS +hltRazorMonitoring.met = cms.InputTag("pfMet") # pfMet +hltRazorMonitoring.jets = cms.InputTag("ak4PFJets") # ak4PFJets, ak4PFJetsCHS hltRazorMonitoring.numGenericTriggerEventPSet.andOr = cms.bool( False ) hltRazorMonitoring.numGenericTriggerEventPSet.andOrHlt = cms.bool(True) # True:=OR; False:=AND diff --git a/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py b/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py index 5b65979baba28..62e11f84b6676 100644 --- a/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py +++ b/DQMOffline/Trigger/python/SoftdropMonitor_cfi.py @@ -16,7 +16,7 @@ xmin = cms.double( -0.5), xmax = cms.double(19999.5), ) -hltSoftdropmonitoring.met = cms.InputTag("pfMetEI") +hltSoftdropmonitoring.met = cms.InputTag("pfMet") hltSoftdropmonitoring.jets = cms.InputTag("ak8PFJetsPuppiSoftDrop") # dont set this to non-SoftdropJets hltSoftdropmonitoring.electrons = cms.InputTag("gedGsfElectrons") hltSoftdropmonitoring.muons = cms.InputTag("muons") diff --git a/DQMOffline/Trigger/python/SusyMonitor_cfi.py b/DQMOffline/Trigger/python/SusyMonitor_cfi.py index 34299f9cc5bf8..dedd22453a5b0 100644 --- a/DQMOffline/Trigger/python/SusyMonitor_cfi.py +++ b/DQMOffline/Trigger/python/SusyMonitor_cfi.py @@ -93,8 +93,8 @@ hltSUSYmonitoring.histoPSet.phiBinning2D = cms.vdouble(-3.1416,-1.8849,-0.6283,0.6283,1.8849,3.1416) -hltSUSYmonitoring.met = cms.InputTag("pfMetEI") # pfMet -hltSUSYmonitoring.jets = cms.InputTag("ak4PFJetsCHS") # ak4PFJets, ak4PFJetsCHS, pfJetsEI +hltSUSYmonitoring.met = cms.InputTag("pfMet") # pfMet +hltSUSYmonitoring.jets = cms.InputTag("ak4PFJetsCHS") # ak4PFJets, ak4PFJetsCHS, ak4PFJets hltSUSYmonitoring.electrons = cms.InputTag("gedGsfElectrons") # while pfIsolatedElectronsEI are reco::PFCandidate ! hltSUSYmonitoring.muons = cms.InputTag("muons") # while pfIsolatedMuonsEI are reco::PFCandidate ! #Suvankar diff --git a/DQMOffline/Trigger/python/TopMonitor_cfi.py b/DQMOffline/Trigger/python/TopMonitor_cfi.py index b0fa538333ff2..b7be242ddd6f9 100644 --- a/DQMOffline/Trigger/python/TopMonitor_cfi.py +++ b/DQMOffline/Trigger/python/TopMonitor_cfi.py @@ -82,8 +82,8 @@ hltTOPmonitoring.leptonPVcuts.dxy = 9999. hltTOPmonitoring.leptonPVcuts.dz = 9999. -hltTOPmonitoring.met = "pfMetEI" # pfMet -hltTOPmonitoring.jets = "ak4PFJetsCHS" # ak4PFJets, ak4PFJetsCHS, pfJetsEI +hltTOPmonitoring.met = "pfMet" # pfMet +hltTOPmonitoring.jets = "ak4PFJetsCHS" # ak4PFJets, ak4PFJetsCHS, ak4PFJets hltTOPmonitoring.electrons = "gedGsfElectrons" # while pfIsolatedElectronsEI are reco::PFCandidate ! hltTOPmonitoring.elecID = "egmGsfElectronIDsForDQM:cutBasedElectronID-Fall17-94X-V1-tight" #Electron ID hltTOPmonitoring.muons = "muons" # while pfIsolatedMuonsEI are reco::PFCandidate ! From cea0984cadf21e331624fb57d2e0473509f1a645 Mon Sep 17 00:00:00 2001 From: Martin Grunewald Date: Tue, 14 Dec 2021 17:19:14 +0100 Subject: [PATCH 11/11] Removal of EI from TSG tests --- HLTrigger/Configuration/test/cmsDriver.csh | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/HLTrigger/Configuration/test/cmsDriver.csh b/HLTrigger/Configuration/test/cmsDriver.csh index 7a3bed163e174..e6edea976c92f 100755 --- a/HLTrigger/Configuration/test/cmsDriver.csh +++ b/HLTrigger/Configuration/test/cmsDriver.csh @@ -309,32 +309,24 @@ EOF cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME if ( $table == HIon ) then - set STEPS = "RAW2DIGI,L1Reco,RECO,EI,DQM" + set STEPS = "RAW2DIGI,L1Reco,RECO,DQM" else - set STEPS = "RAW2DIGI,L1Reco,RECO,EI,PAT,DQM" + set STEPS = "RAW2DIGI,L1Reco,RECO,PAT,DQM" endif echo - echo "Creating RECO+EI+PAT+DQM $name" + echo "Creating RECO+PAT+DQM $name" cmsDriver.py RelVal --step=$STEPS --conditions=$RTAG --filein=file:RelVal_HLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'RECO,MINIAOD,DQMIO' --eventcontent=RECO,MINIAOD,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME else - if ( $table == HIon ) then - set STEPS = "RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION,DQM" - set CustomCommand = "" - else - set STEPS = "RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION,DQM" - set CustomCommand = "--customise_commands=process.CSCHaloData.HLTResultLabel=cms.InputTag('')" - endif - echo echo "Creating HLT+L1Reco+RECO $name" - cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME $CustomCommand + cmsDriver.py RelVal --step=$XHLT,RAW2DIGI,L1Reco,RECO --conditions=$RTAG --filein=file:RelVal_Raw_$name.root --custom_conditions=$XL1T --fileout=RelVal_HLT_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'SIM-RAW-HLT-RECO' --eventcontent=RAW --customise=HLTrigger/Configuration/CustomConfigs.L1THLT $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_HLT_Reco_$name.py --processName=$PNAME echo - echo "Creating RECO+EI+PAT+VALIDATION+DQM $name" - cmsDriver.py RelVal --step=$STEPS --conditions=$RTAG --filein=file:RelVal_DigiL1RawHLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-RECO,MINIAODSIM,DQMIO' --eventcontent=RECOSIM,MINIAODSIM,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME + echo "Creating RECO+PAT+VALIDATION+DQM $name" + cmsDriver.py RelVal --step=RAW2DIGI,L1Reco,RECO,PAT,VALIDATION,DQM --conditions=$RTAG --filein=file:RelVal_DigiL1RawHLT_$name.root --custom_conditions=$XL1T --fileout=RelVal_RECO_$name.root --number=$NN $DATAMC --no_exec --datatier 'GEN-SIM-RECO,MINIAODSIM,DQMIO' --eventcontent=RECOSIM,MINIAODSIM,DQM --customise=HLTrigger/Configuration/CustomConfigs.Base $Era --customise=$Custom --scenario=$SCEN --python_filename=RelVal_RECO_$name.py --processName=$RNAME endif