Merge pull request #26305 from CTPPS/proton_reco_alignment_GT

PPS: alignment from auto GT
cms-sw · Apr 3, 2019 · f7c4a8a · f7c4a8a
2 parents 44b00d2 + 2008837
commit f7c4a8a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/CalibPPS/ESProducers/python/ctppsAlignment_cff.py b/CalibPPS/ESProducers/python/ctppsAlignment_cff.py
@@ -1,6 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from CalibPPS.ESProducers.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi import *
-ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring(
-  "Alignment/CTPPS/data/RPixGeometryCorrections.xml"
-)
+# by default, alignment is now loaded from CondDB using a GT
+
+#from CalibPPS.ESProducers.ctppsRPAlignmentCorrectionsDataESSourceXML_cfi import *
+#ctppsRPAlignmentCorrectionsDataESSourceXML.RealFiles = cms.vstring(
+#  "Alignment/CTPPS/data/RPixGeometryCorrections.xml"
+#)
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
@@ -24,16 +24,16 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
     'run2_mc_pa'        :   '105X_mcRun2_pA_v2',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '105X_dataRun2_v8',
+    'run1_data'         :   '106X_dataRun2_v1',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '105X_dataRun2_v8',
+    'run2_data'         :   '106X_dataRun2_v1',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '105X_dataRun2_relval_v8',
+    'run2_data_relval'  :   '106X_dataRun2_relval_v1',
     # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
-    'run2_data_promptlike_HEfail' : '105X_dataRun2_PromptLike_HEfail_v7',
+    'run2_data_promptlike_HEfail' : '106X_dataRun2_PromptLike_HEfail_v1',
     # GlobalTag for Run2 data 2016H relvals only: Prompt Conditions + fixed L1 menu (to be removed)
-    'run2_data_promptlike'    : '105X_dataRun2_PromptLike_v8',
-    'run2_data_promptlike_hi' : '105X_dataRun2_PromptLike_HI_v3',
+    'run2_data_promptlike'    : '106X_dataRun2_PromptLike_v1',
+    'run2_data_promptlike_hi' : '106X_dataRun2_PromptLike_HI_v1',
     # GlobalTag for Run1 HLT: it points to the online GT
     'run1_hlt'          :   '101X_dataRun2_HLT_frozen_v8',
     # GlobalTag for Run2 HLT: it points to the online GT

diff --git a/RecoCTPPS/ProtonReconstruction/python/ctppsProtons_cff.py b/RecoCTPPS/ProtonReconstruction/python/ctppsProtons_cff.py
@@ -3,6 +3,5 @@
 from RecoCTPPS.ProtonReconstruction.ctppsProtons_cfi import *
 
 # TODO: remove these lines once conditions data are available in DB
-from CalibPPS.ESProducers.ctppsAlignment_cff import *
 from CalibPPS.ESProducers.ctppsOpticalFunctions_cff import *
 ctppsProtons.lhcInfoLabel = ctppsLHCInfoLabel
diff --git a/Validation/CTPPS/test/year_2016/proton_reconstruction_LHC_data/test_reconstruction_cfg.py b/Validation/CTPPS/test/year_2016/proton_reconstruction_LHC_data/test_reconstruction_cfg.py
@@ -8,10 +8,6 @@
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, "auto:run2_data")
 
-# TODO: these lines can be useful before all necessary data available in DB with an auto GT
-#process.GlobalTag = GlobalTag(process.GlobalTag, "105X_dataRun2_relval_v2")
-#process.alignmentEsPrefer = cms.ESPrefer("PoolDBESSource", "GlobalTag")
-
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",
   statistics = cms.untracked.vstring(),