Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ECAL TPG double weight tags and remove GEMELMapRcd from GTs [11_3_X] #33509

Merged
merged 1 commit into from
Apr 23, 2021
Merged

Add ECAL TPG double weight tags and remove GEMELMapRcd from GTs [11_3_X] #33509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 38 additions & 38 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,81 +2,81 @@

### NEW KEYS ###
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run1
'run1_design' : '113X_mcRun1_design_v2',
'run1_design' : '113X_mcRun1_design_v3',
# GlobalTag for MC production (pp collisions) with realistic alignment and calibrations for Run1
'run1_mc' : '113X_mcRun1_realistic_v2',
'run1_mc' : '113X_mcRun1_realistic_v3',
# GlobalTag for MC production (Heavy Ions collisions) with realistic alignment and calibrations for Run1
'run1_mc_hi' : '113X_mcRun1_HeavyIon_v2',
'run1_mc_hi' : '113X_mcRun1_HeavyIon_v3',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : '113X_mcRun1_pA_v2',
'run1_mc_pa' : '113X_mcRun1_pA_v3',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : '113X_mcRun2_startup_v2',
'run2_mc_50ns' : '113X_mcRun2_startup_v3',
# GlobalTag for MC production (2015 L1 Trigger Stage1) with startup-like alignment and calibrations for Run2, L1 trigger in Stage1 mode
'run2_mc_l1stage1' : '113X_mcRun2_asymptotic_l1stage1_v3',
'run2_mc_l1stage1' : '113X_mcRun2_asymptotic_l1stage1_v4',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : '113X_mcRun2_design_v3',
'run2_design' : '113X_mcRun2_design_v4',
#GlobalTag for MC production with optimistic alignment and calibrations for 2016, prior to VFP change
'run2_mc_pre_vfp' : '113X_mcRun2_asymptotic_preVFP_v3',
'run2_mc_pre_vfp' : '113X_mcRun2_asymptotic_preVFP_v4',
#GlobalTag for MC production with optimistic alignment and calibrations for 2016, after VFP change
'run2_mc' : '113X_mcRun2_asymptotic_v3',
'run2_mc' : '113X_mcRun2_asymptotic_v4',
# GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode
'run2_mc_cosmics' : '113X_mcRun2cosmics_asymptotic_deco_v3',
'run2_mc_cosmics' : '113X_mcRun2cosmics_asymptotic_deco_v4',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '113X_mcRun2_HeavyIon_v3',
'run2_mc_hi' : '113X_mcRun2_HeavyIon_v4',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
'run2_mc_pa' : '113X_mcRun2_pA_v3',
'run2_mc_pa' : '113X_mcRun2_pA_v4',
# GlobalTag for Run2 data reprocessing
'run2_data' : '113X_dataRun2_v5',
'run2_data' : '113X_dataRun2_v6',
# GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
'run2_data_HEfail' : '113X_dataRun2_HEfail_v5',
'run2_data_HEfail' : '113X_dataRun2_HEfail_v6',
# GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
'run2_data_relval' : '113X_dataRun2_relval_v5',
'run2_data_relval' : '113X_dataRun2_relval_v6',
# GlobalTag for Run2 HI data
'run2_data_promptlike_hi' : '113X_dataRun2_PromptLike_HI_v5',
'run2_data_promptlike_hi' : '113X_dataRun2_PromptLike_HI_v6',
# GlobalTag for Run3 HLT: it points to the online GT
'run3_hlt' : '112X_dataRun3_HLT_v3',
'run3_hlt' : '113X_dataRun3_HLT_v1',
# GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu
'run2_hlt_relval' : '112X_dataRun2_HLT_relval_v6',
'run2_hlt_relval' : '113X_dataRun2_HLT_relval_v1',
# GlobalTag for Run3 data relvals (express GT)
'run3_data_express' : '112X_dataRun3_Express_v5',
'run3_data_express' : '113X_dataRun3_Express_v1',
# GlobalTag for Run3 data relvals
'run3_data_prompt' : '112X_dataRun3_Prompt_v5',
'run3_data_prompt' : '113X_dataRun3_Prompt_v1',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
'phase1_2017_design' : '113X_mc2017_design_v4',
'phase1_2017_design' : '113X_mc2017_design_v5',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector
'phase1_2017_realistic' : '113X_mc2017_realistic_v4',
'phase1_2017_realistic' : '113X_mc2017_realistic_v5',
# GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in DECO mode
'phase1_2017_cosmics' : '113X_mc2017cosmics_realistic_deco_v4',
'phase1_2017_cosmics' : '113X_mc2017cosmics_realistic_deco_v5',
# GlobalTag for MC production (cosmics) with realistic alignment and calibrations for Phase1 2017 detector, Strip tracker in PEAK mode
'phase1_2017_cosmics_peak' : '113X_mc2017cosmics_realistic_peak_v4',
'phase1_2017_cosmics_peak' : '113X_mc2017cosmics_realistic_peak_v5',
# GlobalTag for MC production with perfectly aligned and calibrated detector for full Phase1 2018 (and 0,0,0-centred beamspot)
'phase1_2018_design' : '113X_upgrade2018_design_v4',
'phase1_2018_design' : '113X_upgrade2018_design_v5',
# GlobalTag for MC production with realistic conditions for full Phase1 2018 detector
'phase1_2018_realistic' : '113X_upgrade2018_realistic_v4',
'phase1_2018_realistic' : '113X_upgrade2018_realistic_v5',
# GlobalTag for MC production with realistic run-dependent (RD) conditions for full Phase1 2018 detector
'phase1_2018_realistic_rd' : '113X_upgrade2018_realistic_RD_v3',
'phase1_2018_realistic_rd' : '113X_upgrade2018_realistic_RD_v4',
# GlobalTag for MC production with realistic conditions for full Phase1 2018 detector for Heavy Ion
'phase1_2018_realistic_hi' : '113X_upgrade2018_realistic_HI_v4',
'phase1_2018_realistic_hi' : '113X_upgrade2018_realistic_HI_v5',
# GlobalTag for MC production with realistic conditions for full Phase1 2018 detector: HEM-15-16 fail
'phase1_2018_realistic_HEfail' : '113X_upgrade2018_realistic_HEfail_v4',
'phase1_2018_realistic_HEfail' : '113X_upgrade2018_realistic_HEfail_v5',
# GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in DECO mode
'phase1_2018_cosmics' : '113X_upgrade2018cosmics_realistic_deco_v4',
'phase1_2018_cosmics' : '113X_upgrade2018cosmics_realistic_deco_v5',
# GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode
'phase1_2018_cosmics_peak' : '113X_upgrade2018cosmics_realistic_peak_v4',
'phase1_2018_cosmics_peak' : '113X_upgrade2018cosmics_realistic_peak_v5',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021
'phase1_2021_design' : '113X_mcRun3_2021_design_v7', # GT containing design conditions for Phase1 2021
'phase1_2021_design' : '113X_mcRun3_2021_design_v8', # GT containing design conditions for Phase1 2021
# GlobalTag for MC production with realistic conditions for Phase1 2021
'phase1_2021_realistic' : '113X_mcRun3_2021_realistic_v9', # GT containing realistic conditions for Phase1 2021
'phase1_2021_realistic' : '113X_mcRun3_2021_realistic_v10', # GT containing realistic conditions for Phase1 2021
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021, Strip tracker in DECO mode
'phase1_2021_cosmics' : '113X_mcRun3_2021cosmics_realistic_deco_v8',
'phase1_2021_cosmics' : '113X_mcRun3_2021cosmics_realistic_deco_v9',
# GlobalTag for MC production with realistic conditions for Phase1 2021 detector for Heavy Ion
'phase1_2021_realistic_hi' : '113X_mcRun3_2021_realistic_HI_v7',
'phase1_2021_realistic_hi' : '113X_mcRun3_2021_realistic_HI_v8',
# GlobalTag for MC production with realistic conditions for Phase1 2023
'phase1_2023_realistic' : '113X_mcRun3_2023_realistic_v7', # GT containing realistic conditions for Phase1 2023
'phase1_2023_realistic' : '113X_mcRun3_2023_realistic_v8', # GT containing realistic conditions for Phase1 2023
# GlobalTag for MC production with realistic conditions for Phase1 2024
'phase1_2024_realistic' : '113X_mcRun3_2024_realistic_v7', # GT containing realistic conditions for Phase1 2024
'phase1_2024_realistic' : '113X_mcRun3_2024_realistic_v8', # GT containing realistic conditions for Phase1 2024
# GlobalTag for MC production with realistic conditions for Phase2
'phase2_realistic' : '113X_mcRun4_realistic_v6'
'phase2_realistic' : '113X_mcRun4_realistic_v7'
}

aliases = {
Expand Down
15 changes: 0 additions & 15 deletions SimCalorimetry/EcalTrigPrimProducers/python/ecalTrigPrimESDoubleWeights_cff.py
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
#
#from SimCalorimetry.EcalTrigPrimProducers.ecalTrigPrimESProducer_cff import *

# Import the records for the new odd weights from tags not yet in the GT
from SimCalorimetry.EcalTrigPrimProducers.ecalTrigPrimESDoubleWeights_cff import *

#Common
from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) )