diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 787efeb084cff..29e3232c0ea55 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -2,81 +2,81 @@ ### NEW KEYS ### # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1 - 'run1_design' : '122X_mcRun1_design_v1', + 'run1_design' : '123X_mcRun1_design_v1', # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1 - 'run1_mc' : '122X_mcRun1_realistic_v1', + 'run1_mc' : '123X_mcRun1_realistic_v1', # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1 - 'run1_mc_hi' : '122X_mcRun1_HeavyIon_v1', + 'run1_mc_hi' : '123X_mcRun1_HeavyIon_v1', # GlobalTag for MC production with pessimistic alignment and calibrations for Run2 - 'run2_mc_50ns' : '122X_mcRun2_startup_v1', + 'run2_mc_50ns' : '123X_mcRun2_startup_v1', # GlobalTag for MC production (2015 L1 Trigger Stage1) with startup-like alignment and calibrations for Run2, L1 trigger in Stage1 mode - 'run2_mc_l1stage1' : '122X_mcRun2_asymptotic_l1stage1_v1', + 'run2_mc_l1stage1' : '123X_mcRun2_asymptotic_l1stage1_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2 - 'run2_design' : '122X_mcRun2_design_v1', + 'run2_design' : '123X_mcRun2_design_v1', #GlobalTag for MC production with optimistic alignment and calibrations for 2016, prior to VFP change - 'run2_mc_pre_vfp' : '122X_mcRun2_asymptotic_preVFP_v1', + 'run2_mc_pre_vfp' : '123X_mcRun2_asymptotic_preVFP_v1', #GlobalTag for MC production with optimistic alignment and calibrations for 2016, after VFP change - 'run2_mc' : '122X_mcRun2_asymptotic_v1', + 'run2_mc' : '123X_mcRun2_asymptotic_v1', # GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode - 'run2_mc_cosmics' : '122X_mcRun2cosmics_asymptotic_deco_v1', + 'run2_mc_cosmics' : '123X_mcRun2cosmics_asymptotic_deco_v1', # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2 - 'run2_mc_hi' : '122X_mcRun2_HeavyIon_v1', + 'run2_mc_hi' : '123X_mcRun2_HeavyIon_v1', # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2 - 'run2_mc_pa' : '122X_mcRun2_pA_v1', + 'run2_mc_pa' : '123X_mcRun2_pA_v1', # GlobalTag for Run2 data reprocessing - 'run2_data' : '122X_dataRun2_v1', + 'run2_data' : '123X_dataRun2_v1', # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail - 'run2_data_HEfail' : '122X_dataRun2_HEfail_v1', + 'run2_data_HEfail' : '123X_dataRun2_HEfail_v1', # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu - 'run2_data_relval' : '122X_dataRun2_relval_v1', + 'run2_data_relval' : '123X_dataRun2_relval_v1', # GlobalTag for Run2 HI data - 'run2_data_promptlike_hi' : '122X_dataRun2_PromptLike_HI_v1', + 'run2_data_promptlike_hi' : '123X_dataRun2_PromptLike_HI_v1', # GlobalTag for Run3 HLT: it points to the online GT - 'run3_hlt' : '122X_dataRun3_HLT_v1', + 'run3_hlt' : '123X_dataRun3_HLT_v1', # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu - 'run2_hlt_relval' : '122X_dataRun2_HLT_relval_v1', + 'run2_hlt_relval' : '123X_dataRun2_HLT_relval_v1', # GlobalTag for Run3 data relvals (express GT) - 'run3_data_express' : '122X_dataRun3_Express_v1', + 'run3_data_express' : '123X_dataRun3_Express_v1', # GlobalTag for Run3 data relvals - 'run3_data_prompt' : '122X_dataRun3_Prompt_v1', + 'run3_data_prompt' : '123X_dataRun3_Prompt_v1', # GlobalTag for Run3 offline data reprocessing - 'run3_data' : '122X_dataRun3_v3', + 'run3_data' : '123X_dataRun3_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot) - 'phase1_2017_design' : '122X_mc2017_design_v1', + 'phase1_2017_design' : '123X_mc2017_design_v1', # GlobalTag for MC production with realistic conditions for Phase1 2017 detector - 'phase1_2017_realistic' : '122X_mc2017_realistic_v1', + 'phase1_2017_realistic' : '123X_mc2017_realistic_v1', # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode - 'phase1_2017_cosmics' : '122X_mc2017cosmics_realistic_deco_v1', + 'phase1_2017_cosmics' : '123X_mc2017cosmics_realistic_deco_v1', # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode - 'phase1_2017_cosmics_peak' : '122X_mc2017cosmics_realistic_peak_v1', + 'phase1_2017_cosmics_peak' : '123X_mc2017cosmics_realistic_peak_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot) - 'phase1_2018_design' : '122X_upgrade2018_design_v1', + 'phase1_2018_design' : '123X_upgrade2018_design_v2', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector - 'phase1_2018_realistic' : '122X_upgrade2018_realistic_v1', + 'phase1_2018_realistic' : '123X_upgrade2018_realistic_v1', # GlobalTag for MC production with realistic run-dependent (RD) conditions for full Phase1 2018 detector - 'phase1_2018_realistic_rd' : '122X_upgrade2018_realistic_RD_v1', + 'phase1_2018_realistic_rd' : '123X_upgrade2018_realistic_RD_v1', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector for Heavy Ion - 'phase1_2018_realistic_hi' : '122X_upgrade2018_realistic_HI_v1', + 'phase1_2018_realistic_hi' : '123X_upgrade2018_realistic_HI_v1', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector: HEM-15-16 fail - 'phase1_2018_realistic_HEfail' : '122X_upgrade2018_realistic_HEfail_v1', + 'phase1_2018_realistic_HEfail' : '123X_upgrade2018_realistic_HEfail_v1', # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in DECO mode - 'phase1_2018_cosmics' : '122X_upgrade2018cosmics_realistic_deco_v1', + 'phase1_2018_cosmics' : '123X_upgrade2018cosmics_realistic_deco_v1', # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode - 'phase1_2018_cosmics_peak' : '122X_upgrade2018cosmics_realistic_peak_v1', + 'phase1_2018_cosmics_peak' : '123X_upgrade2018cosmics_realistic_peak_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021 - 'phase1_2021_design' : '123X_mcRun3_2021_design_v1', + 'phase1_2021_design' : '123X_mcRun3_2021_design_v2', # GlobalTag for MC production with realistic conditions for Phase1 2021 - 'phase1_2021_realistic' : '123X_mcRun3_2021_realistic_v1', + 'phase1_2021_realistic' : '123X_mcRun3_2021_realistic_v2', # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021, Strip tracker in DECO mode - 'phase1_2021_cosmics' : '123X_mcRun3_2021cosmics_realistic_deco_v1', + 'phase1_2021_cosmics' : '123X_mcRun3_2021cosmics_realistic_deco_v2', # GlobalTag for MC production with realistic conditions for Phase1 2021 detector for Heavy Ion - 'phase1_2021_realistic_hi' : '123X_mcRun3_2021_realistic_HI_v1', + 'phase1_2021_realistic_hi' : '123X_mcRun3_2021_realistic_HI_v2', # GlobalTag for MC production with realistic conditions for Phase1 2023 - 'phase1_2023_realistic' : '123X_mcRun3_2023_realistic_v1', + 'phase1_2023_realistic' : '123X_mcRun3_2023_realistic_v2', # GlobalTag for MC production with realistic conditions for Phase1 2024 - 'phase1_2024_realistic' : '123X_mcRun3_2024_realistic_v1', + 'phase1_2024_realistic' : '123X_mcRun3_2024_realistic_v2', # GlobalTag for MC production with realistic conditions for Phase2 - 'phase2_realistic' : '123X_mcRun4_realistic_v1' + 'phase2_realistic' : '123X_mcRun4_realistic_v2' } aliases = { diff --git a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py index 977104f8b73a8..4c509834cf249 100644 --- a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py +++ b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py @@ -44,16 +44,3 @@ from L1Trigger.L1TCalorimeter.simCaloStage2Digis_cfi import simCaloStage2Digis stage2L1Trigger.toReplaceWith(SimL1TCalorimeterTask, cms.Task( simCaloStage2Layer1Digis, simCaloStage2Digis )) -def _modifyStage2L1TriggerCaloParams(process): - from CondCore.CondDB.CondDB_cfi import CondDB - CondDB.connect = cms.string("frontier://FrontierProd/CMS_CONDITIONS") - process.l1conddb = cms.ESSource("PoolDBESSource", - CondDB, - toGet = cms.VPSet( - cms.PSet( - record = cms.string('L1TCaloParamsO2ORcd'), - tag = cms.string("L1TCaloParams_static_CMSSW_9_2_10_2017_v1_8_2_updateHFSF_v6MET") - ) - ) - ) -modifySimDigis_stage2L1TriggerCaloPArams = stage2L1Trigger.makeProcessModifier(_modifyStage2L1TriggerCaloParams)