Merge pull request #33206 from christopheralanwest/alca-update-relval…

…-gts Update HLT/HLT relval/Express/Prompt GTs
cms-sw · Mar 24, 2021 · 1f939c8 · 1f939c8
2 parents fe4dbec + f9b641c
commit 1f939c8
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 24 deletions.
diff --git a/Alignment/OfflineValidation/test/testPVValidation.ini b/Alignment/OfflineValidation/test/testPVValidation.ini
@@ -24,7 +24,7 @@ ttrhtype: WithAngleAndTemplate
 
 [Conditions:PromptGT]
 jobname: testingPromptGT
-gt: auto:run3_data_promptlike
+gt: auto:run3_data_prompt
 allFromGT: True
 applyextracond: False
 alignmentdb: frontier://FrontierProd/CMS_CONDITIONS

diff --git a/CondTools/DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py b/CondTools/DQM/test/DQMXMLFileEventSetupAnalyzer_cfg.py
@@ -22,7 +22,7 @@
 ####################################################################
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run3_data_promptlike', '')
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run3_data_prompt', '')
 #process.GlobalTag.DumpStat = cms.untracked.bool(True)  # optional if you want it to be verbose
 
 # import of standard configurations

diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -25,8 +25,6 @@
     'run2_mc_hi'        :   '113X_mcRun2_HeavyIon_v3',
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
     'run2_mc_pa'        :   '113X_mcRun2_pA_v3',
-    # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '113X_dataRun2_v4',
     # GlobalTag for Run2 data reprocessing
     'run2_data'         :   '113X_dataRun2_v4',
     # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
@@ -35,19 +33,14 @@
     'run2_data_relval'  :   '113X_dataRun2_relval_v4',
     # GlobalTag for Run2 HI data
     'run2_data_promptlike_hi' : '113X_dataRun2_PromptLike_HI_v4',
-    # GlobalTag for Run1 HLT: it points to the online GT
-    'run1_hlt'          :   '101X_dataRun2_HLT_frozen_v11',
-    # GlobalTag for Run2 HLT: it points to the online GT
-    'run2_hlt'          :   '101X_dataRun2_HLT_frozen_v11',
-    # GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
-    'run2_hlt_relval'      :   '112X_dataRun2_HLT_relval_v4',
-    'run2_hlt_relval_hi'   :   '112X_dataRun2_HLT_relval_HI_v3',
-    # GlobalTag for Run2 HLT for HI (not 2018 HI): it points to the online GT
-    'run2_hlt_hi'       :   '101X_dataRun2_HLTHI_frozen_v11',
+    # GlobalTag for Run3 HLT: it points to the online GT
+    'run3_hlt'          :   '112X_dataRun3_HLT_v2',
+    # GlobalTag with fixed snapshot time for Run2 HLT RelVals: customizations to run with fixed L1 Menu
+    'run2_hlt_relval'   :   '112X_dataRun2_HLT_relval_v5',
     # GlobalTag for Run3 data relvals (express GT)
-    'run3_data_express'        :   '112X_dataRun3_Express_v3',
+    'run3_data_express'        :   '112X_dataRun3_Express_v4',
     # GlobalTag for Run3 data relvals
-    'run3_data_promptlike'     :   '112X_dataRun3_Prompt_v3',
+    'run3_data_prompt'         :   '112X_dataRun3_Prompt_v4',
     # 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',
     # GlobalTag for MC production with realistic conditions for Phase1 2017 detector
@@ -91,6 +84,12 @@
     'BASEGT' : 'BASE1_V1|BASE2_V1'
 }
 
+### Run 1 data GTs ###
+    # GlobalTag with fixed snapshot time for Run1 HLT RelVals: customizations to run with fixed L1 Menu
+autoCond['run1_hlt_relval']  = autoCond['run2_hlt_relval']
+    # GlobalTag for Run1 data reprocessing
+autoCond['run1_data']        = autoCond['run2_data']
+
 # dedicated GlobalTags for HLT
 from Configuration.HLT.autoCondHLT import autoCondHLT
 autoCond = autoCondHLT(autoCond)
@@ -103,6 +102,10 @@
 from Configuration.AlCa.autoCondModifiers import autoCond0T
 autoCond = autoCond0T(autoCond)
 
+# special GT for 2015 HLT HI run
+from Configuration.AlCa.autoCondModifiers import autoCondHLTHI
+autoCond = autoCondHLTHI(autoCond)
+
 ### OLD KEYS ### kept for backward compatibility
     # GlobalTag for MC production with perfectly aligned and calibrated detector
 autoCond['mc']               = ( autoCond['run1_design'] )
@@ -115,7 +118,7 @@
     # GlobalTag for data reprocessing
 autoCond['com10']            = ( autoCond['run1_data'] )
     # GlobalTag for running HLT on recent data: it points to the online GT (remove the snapshot!)
-autoCond['hltonline']        = ( autoCond['run1_hlt'] )
+autoCond['hltonline']        = ( autoCond['run3_hlt'] )
     # GlobalTag for POSTLS1 upgrade studies:
 autoCond['upgradePLS1']      = ( autoCond['run2_mc'] )
 autoCond['upgradePLS150ns']  = ( autoCond['run2_mc_50ns'] )

diff --git a/Configuration/AlCa/python/autoCondModifiers.py b/Configuration/AlCa/python/autoCondModifiers.py
@@ -11,8 +11,23 @@ def autoCond0T(autoCond):
     ConditionsFor0T =  ','.join( ['RunInfo_0T_v1_mc', "RunInfoRcd", connectionString, "", "2020-07-01 12:00:00.000"] )
     GlobalTags0T = {}
     for key,val in six.iteritems(autoCond):
-        if "phase" in key:    # restric to phase1 upgrade GTs
+        if "phase" in key:    # restrict to phase1 upgrade GTs
             GlobalTags0T[key+"_0T"] = (autoCond[key], ConditionsFor0T)
 
     autoCond.update(GlobalTags0T)
     return autoCond
+
+def autoCondHLTHI(autoCond):
+
+    GlobalTagsHLTHI = {}
+
+    # emulate hybrid ZeroSuppression on the VirginRaw data of 2015
+    FullPedestalsForHLTHI =  ','.join( ['SiStripFullPedestals_GR10_v1_hlt', "SiStripPedestalsRcd", connectionString, "", "2021-03-11 12:00:00.000"] )
+    MenuForHLTHI =  ','.join( ['L1Menu_CollisionsHeavyIons2015_v5_uGT_xml', "L1TUtmTriggerMenuRcd", connectionString, "", "2021-03-11 12:00:00.000"] )
+
+    for key,val in six.iteritems(autoCond):
+        if key == 'run2_hlt_relval':    # modification of HLT relval GT
+            GlobalTagsHLTHI['run2_hlt_hi'] = (autoCond[key], FullPedestalsForHLTHI, MenuForHLTHI)
+
+    autoCond.update(GlobalTagsHLTHI)
+    return autoCond
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -39,13 +39,13 @@
     'run3_mc_PIon'           : ('phase1_2021_realistic'   ,l1Menus['PIon']),
     'run3_mc_PRef'           : ('phase1_2021_realistic'   ,l1Menus['PRef']),
 
-    'run1_hlt_Fake'          : ('run1_hlt'                ,l1Menus['Fake']),
+    'run1_hlt_Fake'          : ('run1_hlt_relval'         ,l1Menus['Fake']),
     'run2_hlt_Fake'          : ('run2_hlt_relval'         ,l1Menus['Fake']),
     'run2_hlt_Fake1'         : ('run2_hlt_relval'         ,l1Menus['Fake1']),
     'run2_hlt_Fake2'         : ('run2_hlt_relval'         ,l1Menus['Fake2']),
     'run3_hlt_FULL'          : ('run2_hlt_relval'         ,l1Menus['FULL']),
     'run3_hlt_GRun'          : ('run2_hlt_relval'         ,l1Menus['GRun']),
-    'run3_hlt_HIon'          : ('run2_hlt_relval_hi'      ,l1Menus['HIon']),
+    'run3_hlt_HIon'          : ('run2_hlt_relval'         ,l1Menus['HIon']),
     'run3_hlt_PIon'          : ('run2_hlt_relval'         ,l1Menus['PIon']),
     'run3_hlt_PRef'          : ('run2_hlt_relval'         ,l1Menus['PRef']),
 

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -2129,7 +2129,7 @@ def lhegensim2018ml(fragment,howMuch):
                           },dataReco])
 
 steps['RECOCOSDRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016'},steps['RECOCOSD']])
-steps['RECOCOSDRUN3']=merge([{'--conditions':'auto:run3_data_promptlike','--era':'Run3'},steps['RECOCOSD']])
+steps['RECOCOSDRUN3']=merge([{'--conditions':'auto:run3_data_prompt','--era':'Run3'},steps['RECOCOSD']])
 steps['RECOCOSDEXPRUN3']=merge([{'--conditions':'auto:run3_data_express','--era':'Run3'},steps['RECOCOSD']])
 
 # step1 gensim for HI mixing
@@ -2539,7 +2539,7 @@ def gen2021HiMix(fragment,howMuch):
 
 steps['ALCACOSDRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016','-s':'ALCA:SiPixelCalCosmics+TkAlCosmics0T+SiStripCalCosmics+MuAlGlobalCosmics+HcalCalHOCosmics+DQM'},steps['ALCACOSD']])
 
-steps['ALCACOSDRUN3']=merge([{'--conditions':'auto:run3_data_promptlike','--era':'Run3','-s':'ALCA:SiPixelCalCosmics+TkAlCosmics0T+SiStripCalCosmics+MuAlGlobalCosmics+HcalCalHOCosmics+DQM'},steps['ALCACOSD']])
+steps['ALCACOSDRUN3']=merge([{'--conditions':'auto:run3_data_prompt','--era':'Run3','-s':'ALCA:SiPixelCalCosmics+TkAlCosmics0T+SiStripCalCosmics+MuAlGlobalCosmics+HcalCalHOCosmics+DQM'},steps['ALCACOSD']])
 steps['ALCACOSDEXPRUN3']=merge([{'--conditions':'auto:run3_data_express','--era':'Run3','-s':'ALCA:SiPixelCalCosmics+TkAlCosmics0T+SiStripCalCosmics+MuAlGlobalCosmics+HcalCalHOCosmics+DQM'},steps['ALCACOSD']])
 
 steps['ALCAPROMPT']={'-s':'ALCA:PromptCalibProd',
@@ -2761,7 +2761,7 @@ def gen2021HiMix(fragment,howMuch):
 
 steps['HARVESTDCRUN2']=merge([{'--conditions':'auto:run2_data','--era':'Run2_2016'},steps['HARVESTDC']])
 
-steps['HARVESTDCRUN3']=merge([{'--conditions':'auto:run3_data_promptlike','--era':'Run3'},steps['HARVESTDC']])
+steps['HARVESTDCRUN3']=merge([{'--conditions':'auto:run3_data_prompt','--era':'Run3'},steps['HARVESTDC']])
 steps['HARVESTDCEXPRUN3']=merge([{'--conditions':'auto:run3_data_express','--era':'Run3'},steps['HARVESTDC']])
 
 steps['HARVESTDR2_REMINIAOD_data2016']=merge([{'--data':'', '-s':'HARVESTING:@miniAODDQM','--era':'Run2_2016,run2_miniAOD_80XLegacy'},steps['HARVESTDR2']])

diff --git a/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py b/DQM/Integration/python/config/FrontierCondition_GT_autoExpress_cfi.py
@@ -1,13 +1,14 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
+from Configuration.AlCa.autoCond import autoCond
 
 # Default Express GT: it is the GT that will be used in case we are not able
 # to retrieve the one used at Tier0.
 # It should be kept in synch with Express processing at Tier0: what the url
 # https://cmsweb.cern.ch/t0wmadatasvc/prod/express_config
 # would tell you.
-GlobalTag.globaltag = "112X_dataRun3_Express_v2"
+GlobalTag.globaltag = autoCond['run3_data_express']
 
 # ===== auto -> Automatically get the GT string from current Tier0 configuration via a Tier0Das call.
 #       This needs a valid proxy to access the cern.ch network from the .cms one.

diff --git a/DQM/Integration/python/config/FrontierCondition_GT_cfi.py b/DQM/Integration/python/config/FrontierCondition_GT_cfi.py
@@ -1,3 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import *
-GlobalTag.globaltag = "112X_dataRun3_HLT_v1"
+from Configuration.AlCa.autoCond import autoCond
+GlobalTag.globaltag = autoCond['run3_hlt']