Merge pull request #37034 from malbouis/alca_HCALMC_PPSdata_GTs-123X

Include PPS timing-hptdc tag, HCal trigger primitive tag and update HI GT
cms-sw · Feb 25, 2022 · a74e430 · a74e430
2 parents e0b8a2b + 692903e
commit a74e430
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -24,23 +24,23 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
     'run2_mc_pa'                   : '123X_mcRun2_pA_v1',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'                    : '123X_dataRun2_v1',
+    'run2_data'                    : '123X_dataRun2_v2',
     # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
-    'run2_data_HEfail'             : '123X_dataRun2_HEfail_v1',
+    'run2_data_HEfail'             : '123X_dataRun2_HEfail_v2',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'             : '123X_dataRun2_relval_v1',
+    'run2_data_relval'             : '123X_dataRun2_relval_v2',
     # GlobalTag for Run2 HI data
-    'run2_data_promptlike_hi'      : '123X_dataRun2_PromptLike_HI_v1',
+    'run2_data_promptlike_hi'      : '123X_dataRun2_PromptLike_HI_v2',
     # GlobalTag for Run3 HLT: it points to the online GT
-    'run3_hlt'                     : '123X_dataRun3_HLT_v3',
+    'run3_hlt'                     : '123X_dataRun3_HLT_v4',
     # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu
-    'run2_hlt_relval'              : '123X_dataRun2_HLT_relval_v1',
+    'run2_hlt_relval'              : '123X_dataRun2_HLT_relval_v2',
     # GlobalTag for Run3 data relvals (express GT)
-    'run3_data_express'            : '123X_dataRun3_Express_v2',
+    'run3_data_express'            : '123X_dataRun3_Express_v3',
     # GlobalTag for Run3 data relvals
-    'run3_data_prompt'             : '123X_dataRun3_Prompt_v2',
+    'run3_data_prompt'             : '123X_dataRun3_Prompt_v3',
     # GlobalTag for Run3 offline data reprocessing
-    'run3_data'                    : '123X_dataRun3_v1',
+    'run3_data'                    : '123X_dataRun3_v2',
     # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
     'phase1_2017_design'           : '123X_mc2017_design_v1',
     # GlobalTag for MC production with realistic conditions for Phase1 2017 detector
@@ -64,19 +64,19 @@
     # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector,  Strip tracker in PEAK mode
     '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_v6',
+    'phase1_2021_design'           : '123X_mcRun3_2021_design_v7',
     # GlobalTag for MC production with realistic conditions for Phase1 2021
-    'phase1_2021_realistic'        : '123X_mcRun3_2021_realistic_v6',
+    'phase1_2021_realistic'        : '123X_mcRun3_2021_realistic_v7',
     # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021,  Strip tracker in DECO mode
-    'phase1_2021_cosmics'          : '123X_mcRun3_2021cosmics_realistic_deco_v6',
+    'phase1_2021_cosmics'          : '123X_mcRun3_2021cosmics_realistic_deco_v7',
     # GlobalTag for MC production with realistic conditions for Phase1 2021 detector for Heavy Ion
-    'phase1_2021_realistic_hi'     : '123X_mcRun3_2021_realistic_HI_v6',
+    'phase1_2021_realistic_hi'     : '123X_mcRun3_2021_realistic_HI_v7',
     # GlobalTag for MC production with realistic conditions for Phase1 2023
-    'phase1_2023_realistic'        : '123X_mcRun3_2023_realistic_v6',
+    'phase1_2023_realistic'        : '123X_mcRun3_2023_realistic_v7',
     # GlobalTag for MC production with realistic conditions for Phase1 2024
-    'phase1_2024_realistic'        : '123X_mcRun3_2024_realistic_v6',
+    'phase1_2024_realistic'        : '123X_mcRun3_2024_realistic_v7',
     # GlobalTag for MC production with realistic conditions for Phase2
-    'phase2_realistic'             : '123X_mcRun4_realistic_noSiStrip_v3'
+    'phase2_realistic'             : '123X_mcRun4_realistic_v5'
 }
 
 aliases = {

diff --git a/RecoPPS/Local/python/ctppsDiamondLocalReconstruction_cff.py b/RecoPPS/Local/python/ctppsDiamondLocalReconstruction_cff.py
@@ -1,13 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-# Temporary customization of GT - to be removed once the tag is included in the GTs
-from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import GlobalTag
-GlobalTag.toGet.append(
-  cms.PSet(record = cms.string('PPSTimingCalibrationLUTRcd'),
-           tag = cms.string('PPSDiamondTimingCalibrationLUT_test')
-  )
-)
-
 # reco hit production
 from RecoPPS.Local.ctppsDiamondRecHits_cfi import ctppsDiamondRecHits