Merge pull request #26394 from CTPPS/proton_reco_step2_final

PPS: proton reco finalisation before UL re-reco

CalibPPS/ESProducers/plugins/CTPPSLHCInfoESSource.cc

@@ -53,14 +53,6 @@ CTPPSLHCInfoESSource::CTPPSLHCInfoESSource(const edm::ParameterSet& conf) :
 void CTPPSLHCInfoESSource::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &key,
   const edm::IOVSyncValue& iosv, edm::ValidityInterval& oValidity)
 {
-  // TODO: the IOV specified in config is temporarily replaced with a hardcoded one
-  edm::IOVSyncValue beg(edm::EventID(270293, 0, 0), edm::Timestamp(1461016800ULL << 32));
-  edm::IOVSyncValue end(edm::EventID(290872, 0, 0), edm::Timestamp(1483138800ULL << 32));
-  oValidity = edm::ValidityInterval(beg, end);
-
-  m_insideValidityRange = (beg < iosv && iosv < end);
-
-  /*
   if (edm::contains(m_validityRange, iosv.eventID()))
   {
     m_insideValidityRange = true;
@@ -83,7 +75,6 @@ void CTPPSLHCInfoESSource::setIntervalFor(const edm::eventsetup::EventSetupRecor
       oValidity = edm::ValidityInterval(edm::IOVSyncValue(beginEvent), edm::IOVSyncValue::endOfTime());
     }
   }
-  */
 }
 
 //----------------------------------------------------------------------------------------------------

CalibPPS/ESProducers/python/ctppsLHCInfo_cff.py

@@ -1,11 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
-ctppsLHCInfoLabel = cms.string("ctpps_minimal")
+# by default, LHCInfo is now loaded from CondDB using a GT
+ctppsLHCInfoLabel = cms.string("")
 
-# minimal LHCInfo for 2016 data
-ctppsLHCInfoESSource_2016 = cms.ESSource("CTPPSLHCInfoESSource",
-  label = ctppsLHCInfoLabel,
-  validityRange = cms.EventRange("270293:min - 290872:max"),
-  beamEnergy = cms.double(6500),  # GeV
-  xangle = cms.double(185)  # murad
-)
+## minimal LHCInfo for 2016 data
+#ctppsLHCInfoLabel = cms.string("ctpps_minimal")
+#ctppsLHCInfoESSource_2016 = cms.ESSource("CTPPSLHCInfoESSource",
+#  label = ctppsLHCInfoLabel,
+#  validityRange = cms.EventRange("270293:min - 290872:max"),
+#  beamEnergy = cms.double(6500),  # GeV
+#  xangle = cms.double(185)  # murad
+#)

CalibPPS/ESProducers/python/ctppsOpticalFunctions_cff.py

@@ -2,26 +2,28 @@
 
 from CalibPPS.ESProducers.ctppsLHCInfo_cff import *
 
-from CalibPPS.ESProducers.ctppsOpticalFunctionsESSource_cfi import *
+# by default, (raw) optical functions are now loaded from CondDB using a GT
 
-# add 2016 pre-TS2 configuration
-config_2016_preTS2 = cms.PSet(
-  validityRange = cms.EventRange("273725:min - 280385:max"),
-
-  opticalFunctions = cms.VPSet(
-      cms.PSet( xangle = cms.double(185), fileName = cms.FileInPath("CalibPPS/ESProducers/data/optical_functions_2016.root") )
-  ),
-
-  scoringPlanes = cms.VPSet(
-      # z in cm
-      cms.PSet( rpId = cms.uint32(0x76100000), dirName = cms.string("XRPH_C6L5_B2"), z = cms.double(-20382.6) ),  # RP 002, strip
-      cms.PSet( rpId = cms.uint32(0x76180000), dirName = cms.string("XRPH_D6L5_B2"), z = cms.double(-21255.1) ),  # RP 003, strip
-      cms.PSet( rpId = cms.uint32(0x77100000), dirName = cms.string("XRPH_C6R5_B1"), z = cms.double(+20382.6) ),  # RP 102, strip
-      cms.PSet( rpId = cms.uint32(0x77180000), dirName = cms.string("XRPH_D6R5_B1"), z = cms.double(+21255.1) ),  # RP 103, strip
-  )
-)
-
-ctppsOpticalFunctionsESSource.configuration.append(config_2016_preTS2)
+#from CalibPPS.ESProducers.ctppsOpticalFunctionsESSource_cfi import *
+#
+## add 2016 pre-TS2 configuration
+#config_2016_preTS2 = cms.PSet(
+#  validityRange = cms.EventRange("273725:min - 280385:max"),
+#
+#  opticalFunctions = cms.VPSet(
+#      cms.PSet( xangle = cms.double(185), fileName = cms.FileInPath("CalibPPS/ESProducers/data/optical_functions_2016.root") )
+#  ),
+#
+#  scoringPlanes = cms.VPSet(
+#      # z in cm
+#      cms.PSet( rpId = cms.uint32(0x76100000), dirName = cms.string("XRPH_C6L5_B2"), z = cms.double(-20382.6) ),  # RP 002, strip
+#      cms.PSet( rpId = cms.uint32(0x76180000), dirName = cms.string("XRPH_D6L5_B2"), z = cms.double(-21255.1) ),  # RP 003, strip
+#      cms.PSet( rpId = cms.uint32(0x77100000), dirName = cms.string("XRPH_C6R5_B1"), z = cms.double(+20382.6) ),  # RP 102, strip
+#      cms.PSet( rpId = cms.uint32(0x77180000), dirName = cms.string("XRPH_D6R5_B1"), z = cms.double(+21255.1) ),  # RP 103, strip
+#  )
+#)
+#
+#ctppsOpticalFunctionsESSource.configuration.append(config_2016_preTS2)
 
 # optics interpolation between crossing angles
 from CalibPPS.ESProducers.ctppsInterpolatedOpticalFunctionsESSource_cfi import *

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'         :   '106X_dataRun2_v4',
+    'run1_data'         :   '106X_dataRun2_v8',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '106X_dataRun2_v4',
+    'run2_data'         :   '106X_dataRun2_v8',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '106X_dataRun2_relval_v2',
+    'run2_data_relval'  :   '106X_dataRun2_relval_v6',
     # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
-    'run2_data_promptlike_HEfail' : '106X_dataRun2_PromptLike_HEfail_v1',
+    'run2_data_promptlike_HEfail' : '106X_dataRun2_PromptLike_HEfail_v4',
     # GlobalTag for Run2 data 2016H relvals only: Prompt Conditions + fixed L1 menu (to be removed)
-    'run2_data_promptlike'    : '106X_dataRun2_PromptLike_v1',
-    'run2_data_promptlike_hi' : '106X_dataRun2_PromptLike_HI_v1',
+    'run2_data_promptlike'    : '106X_dataRun2_PromptLike_v4',
+    'run2_data_promptlike_hi' : '106X_dataRun2_PromptLike_HI_v4',
     # 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