diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelGenErrorDBObjectESProducer.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelGenErrorDBObjectESProducer.cc index 4f3303c817ed1..ddaf98f31268f 100644 --- a/CalibTracker/SiPixelESProducers/plugins/SiPixelGenErrorDBObjectESProducer.cc +++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelGenErrorDBObjectESProducer.cc @@ -48,18 +48,9 @@ SiPixelGenErrorDBObjectESProducer::SiPixelGenErrorDBObjectESProducer(const edm:: const float theMagField = iMagfield->inTesla(center).mag(); if (theMagField >= -0.1 && theMagField < 1.0) return get("", "0T"); - else if (theMagField >= 1.0 && theMagField < 2.5) - return get("", "2T"); - else if (theMagField >= 2.5 && theMagField < 3.25) - return get("", "3T"); - else if (theMagField >= 3.25 && theMagField < 3.65) - return get("", "35T"); - else if (theMagField >= 3.9 && theMagField < 4.1) - return get("", "4T"); else { - if (theMagField >= 4.1 || theMagField < -0.1) + if (theMagField >= 3.9 || theMagField < 3.65) edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixelGenError") << "Magnetic field is " << theMagField; - //return get("", "3.8T"); return get("", ""); } }, diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc index 6680121239cf7..5586ec5840149 100644 --- a/CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc +++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc @@ -49,18 +49,9 @@ SiPixelTemplateDBObjectESProducer::SiPixelTemplateDBObjectESProducer(const edm:: const float theMagField = iMagfield->inTesla(center).mag(); if (theMagField >= -0.1 && theMagField < 1.0) return get("", "0T"); - else if (theMagField >= 1.0 && theMagField < 2.5) - return get("", "2T"); - else if (theMagField >= 2.5 && theMagField < 3.25) - return get("", "3T"); - else if (theMagField >= 3.25 && theMagField < 3.65) - return get("", "35T"); - else if (theMagField >= 3.9 && theMagField < 4.1) - return get("", "4T"); else { - if (theMagField >= 4.1 || theMagField < -0.1) + if (theMagField >= 3.9 || theMagField < 3.65) edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixelTemplate") << "Magnetic field is " << theMagField; - //return get("", "3.8T"); return get("", ""); } }, diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 0d6947023a23c..6b5f9327dd758 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -2,83 +2,83 @@ ### NEW KEYS ### # GlobalTag for MC production with perfectly aligned and calibrated detector for Run1 - 'run1_design' : '120X_mcRun1_design_v1', + 'run1_design' : '121X_mcRun1_design_v1', # GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1 - 'run1_mc' : '120X_mcRun1_realistic_v1', + 'run1_mc' : '121X_mcRun1_realistic_v1', # GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1 - 'run1_mc_hi' : '120X_mcRun1_HeavyIon_v1', + 'run1_mc_hi' : '121X_mcRun1_HeavyIon_v1', # GlobalTag for MC production with pessimistic alignment and calibrations for Run2 - 'run2_mc_50ns' : '120X_mcRun2_startup_v1', + 'run2_mc_50ns' : '121X_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' : '120X_mcRun2_asymptotic_l1stage1_v1', + 'run2_mc_l1stage1' : '121X_mcRun2_asymptotic_l1stage1_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2 - 'run2_design' : '120X_mcRun2_design_v1', + 'run2_design' : '121X_mcRun2_design_v1', #GlobalTag for MC production with optimistic alignment and calibrations for 2016, prior to VFP change - 'run2_mc_pre_vfp' : '120X_mcRun2_asymptotic_preVFP_v2', + 'run2_mc_pre_vfp' : '121X_mcRun2_asymptotic_preVFP_v1', #GlobalTag for MC production with optimistic alignment and calibrations for 2016, after VFP change - 'run2_mc' : '120X_mcRun2_asymptotic_v2', + 'run2_mc' : '121X_mcRun2_asymptotic_v1', # GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode - 'run2_mc_cosmics' : '120X_mcRun2cosmics_asymptotic_deco_v1', + 'run2_mc_cosmics' : '121X_mcRun2cosmics_asymptotic_deco_v1', # GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2 - 'run2_mc_hi' : '120X_mcRun2_HeavyIon_v1', + 'run2_mc_hi' : '121X_mcRun2_HeavyIon_v1', # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2 - 'run2_mc_pa' : '120X_mcRun2_pA_v1', + 'run2_mc_pa' : '121X_mcRun2_pA_v1', # GlobalTag for Run2 data reprocessing - 'run2_data' : '120X_dataRun2_v2', + 'run2_data' : '121X_dataRun2_v1', # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail - 'run2_data_HEfail' : '120X_dataRun2_HEfail_v1', + 'run2_data_HEfail' : '121X_dataRun2_HEfail_v1', # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu - 'run2_data_relval' : '120X_dataRun2_relval_v2', + 'run2_data_relval' : '121X_dataRun2_relval_v1', # GlobalTag for Run2 HI data - 'run2_data_promptlike_hi' : '120X_dataRun2_PromptLike_HI_v1', + 'run2_data_promptlike_hi' : '121X_dataRun2_PromptLike_HI_v1', # GlobalTag for Run3 HLT: it points to the online GT - 'run3_hlt' : '113X_dataRun3_HLT_v3', + 'run3_hlt' : '121X_dataRun3_HLT_v1', # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu - 'run2_hlt_relval' : '113X_dataRun2_HLT_relval_v2', + 'run2_hlt_relval' : '121X_dataRun2_HLT_relval_v1', # GlobalTag for Run3 data relvals (express GT) - 'run3_data_express' : '113X_dataRun3_Express_v4', + 'run3_data_express' : '121X_dataRun3_Express_v1', # GlobalTag for Run3 data relvals - 'run3_data_prompt' : '113X_dataRun3_Prompt_v3', + 'run3_data_prompt' : '121X_dataRun3_Prompt_v1', # GlobalTag for Run3 offline data reprocessing - 'run3_data' : '113X_dataRun3_v2', + 'run3_data' : '121X_dataRun3_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot) - 'phase1_2017_design' : '120X_mc2017_design_v1', + 'phase1_2017_design' : '121X_mc2017_design_v1', # GlobalTag for MC production with realistic conditions for Phase1 2017 detector - 'phase1_2017_realistic' : '120X_mc2017_realistic_v1', + 'phase1_2017_realistic' : '121X_mc2017_realistic_v1', # GlobalTag for MC production with realistic conditions for Phase1 2017 detector, for PP reference run 'phase1_2017_realistic_ppref' : '120X_mc2017_realistic_forppRef5TeV_v2', # GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode - 'phase1_2017_cosmics' : '120X_mc2017cosmics_realistic_deco_v1', + 'phase1_2017_cosmics' : '121X_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' : '120X_mc2017cosmics_realistic_peak_v1', + 'phase1_2017_cosmics_peak' : '121X_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' : '120X_upgrade2018_design_v1', + 'phase1_2018_design' : '121X_upgrade2018_design_v1', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector - 'phase1_2018_realistic' : '120X_upgrade2018_realistic_v1', + 'phase1_2018_realistic' : '121X_upgrade2018_realistic_v1', # GlobalTag for MC production with realistic run-dependent (RD) conditions for full Phase1 2018 detector - 'phase1_2018_realistic_rd' : '113X_upgrade2018_realistic_RD_v5', + 'phase1_2018_realistic_rd' : '121X_upgrade2018_realistic_RD_v1', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector for Heavy Ion - 'phase1_2018_realistic_hi' : '120X_upgrade2018_realistic_HI_v1', + 'phase1_2018_realistic_hi' : '121X_upgrade2018_realistic_HI_v1', # GlobalTag for MC production with realistic conditions for full Phase1 2018 detector: HEM-15-16 fail - 'phase1_2018_realistic_HEfail' : '120X_upgrade2018_realistic_HEfail_v1', + 'phase1_2018_realistic_HEfail' : '121X_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' : '120X_upgrade2018cosmics_realistic_deco_v1', + 'phase1_2018_cosmics' : '121X_upgrade2018cosmics_realistic_deco_v3', # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode - 'phase1_2018_cosmics_peak' : '120X_upgrade2018cosmics_realistic_peak_v1', + 'phase1_2018_cosmics_peak' : '121X_upgrade2018cosmics_realistic_peak_v1', # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021 - 'phase1_2021_design' : '121X_mcRun3_2021_design_v2', # GT containing design conditions for Phase1 2021 + 'phase1_2021_design' : '121X_mcRun3_2021_design_v3', # GlobalTag for MC production with realistic conditions for Phase1 2021 - 'phase1_2021_realistic' : '121X_mcRun3_2021_realistic_v3', # GT containing realistic conditions for Phase1 2021 + 'phase1_2021_realistic' : '121X_mcRun3_2021_realistic_v4', # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021, Strip tracker in DECO mode - 'phase1_2021_cosmics' : '121X_mcRun3_2021cosmics_realistic_deco_v3', + 'phase1_2021_cosmics' : '121X_mcRun3_2021cosmics_realistic_deco_v4', # GlobalTag for MC production with realistic conditions for Phase1 2021 detector for Heavy Ion - 'phase1_2021_realistic_hi' : '121X_mcRun3_2021_realistic_HI_v3', + 'phase1_2021_realistic_hi' : '121X_mcRun3_2021_realistic_HI_v4', # GlobalTag for MC production with realistic conditions for Phase1 2023 - 'phase1_2023_realistic' : '121X_mcRun3_2023_realistic_v2', # GT containing realistic conditions for Phase1 2023 + 'phase1_2023_realistic' : '121X_mcRun3_2023_realistic_v3', # GlobalTag for MC production with realistic conditions for Phase1 2024 - 'phase1_2024_realistic' : '121X_mcRun3_2024_realistic_v2', # GT containing realistic conditions for Phase1 2024 + 'phase1_2024_realistic' : '121X_mcRun3_2024_realistic_v3', # GlobalTag for MC production with realistic conditions for Phase2 - 'phase2_realistic' : '113X_mcRun4_realistic_v7' + 'phase2_realistic' : '121X_mcRun4_realistic_v1' } aliases = {