From a3dbe5d6334302d62ca6201f1d9d81083429ce93 Mon Sep 17 00:00:00 2001 From: Tamas Date: Fri, 5 Aug 2022 18:48:49 +0200 Subject: [PATCH] Fix PPS timing detectors record and tag names for PCL --- .../PPSDiamondSampicTimingCalibrationPCLHarvester.cc | 2 +- .../plugins/PPSTimingCalibrationPCLHarvester.cc | 2 +- .../test/DiamondSampicCalibrationHarvester_cfg.py | 4 ++-- .../test/DiamondSampicCalibrationWorker_cfg.py | 2 +- .../data/PPSTimingCalibrationRcd_Sampic_prep.json | 2 +- .../data/PPSTimingCalibrationRcd_Sampic_prod.json | 2 +- CondFormats/Common/test/ProduceDropBoxMetadata.py | 8 +++++++- .../StandardSequences/python/AlCaHarvesting_cff.py | 10 +++++----- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CalibPPS/TimingCalibration/plugins/PPSDiamondSampicTimingCalibrationPCLHarvester.cc b/CalibPPS/TimingCalibration/plugins/PPSDiamondSampicTimingCalibrationPCLHarvester.cc index 89c4e7cfd5270..291c5bcf5dbed 100644 --- a/CalibPPS/TimingCalibration/plugins/PPSDiamondSampicTimingCalibrationPCLHarvester.cc +++ b/CalibPPS/TimingCalibration/plugins/PPSDiamondSampicTimingCalibrationPCLHarvester.cc @@ -257,7 +257,7 @@ void PPSDiamondSampicTimingCalibrationPCLHarvester::calibDb(DQMStore::IGetter& i auto calibPPS = PPSTimingCalibration(formula, params, time_info); // write the object edm::Service poolDbService; - poolDbService->writeOneIOV(calibPPS, poolDbService->currentTime(), "PPSTimingCalibrationRcd"); + poolDbService->writeOneIOV(calibPPS, poolDbService->currentTime(), "PPSTimingCalibrationRcd_SAMPIC"); } //------------------------------------------------------------------------------ diff --git a/CalibPPS/TimingCalibration/plugins/PPSTimingCalibrationPCLHarvester.cc b/CalibPPS/TimingCalibration/plugins/PPSTimingCalibrationPCLHarvester.cc index 18c8d330164f2..ca73e711581c0 100644 --- a/CalibPPS/TimingCalibration/plugins/PPSTimingCalibrationPCLHarvester.cc +++ b/CalibPPS/TimingCalibration/plugins/PPSTimingCalibrationPCLHarvester.cc @@ -147,7 +147,7 @@ void PPSTimingCalibrationPCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQM // write the object edm::Service poolDbService; - poolDbService->writeOneIOV(calib, poolDbService->currentTime(), "PPSTimingCalibrationRcd"); + poolDbService->writeOneIOV(calib, poolDbService->currentTime(), "PPSTimingCalibrationRcd_HPTDC"); } //------------------------------------------------------------------------------ diff --git a/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationHarvester_cfg.py b/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationHarvester_cfg.py index 62477a79dae75..985dc3ea55be8 100644 --- a/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationHarvester_cfg.py +++ b/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationHarvester_cfg.py @@ -26,8 +26,8 @@ timetype = cms.untracked.string('runnumber'), toPut = cms.VPSet( cms.PSet( - record = cms.string('PPSTimingCalibrationRcd'), - tag = cms.string('DiamondSampicCalibration'), + record = cms.string('PPSTimingCalibrationRcd_SAMPIC'), + tag = cms.string('PPSDiamondSampicCalibration_pcl'), ) ) ) diff --git a/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationWorker_cfg.py b/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationWorker_cfg.py index b1b58bb878e33..c356b3460c313 100644 --- a/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationWorker_cfg.py +++ b/CalibPPS/TimingCalibration/test/DiamondSampicCalibrationWorker_cfg.py @@ -53,7 +53,7 @@ ) process.totemTimingRecHits.mergeTimePeaks= cms.bool(False) -process.totemTimingRecHits.timingCalibrationTag= cms.string('GlobalTag:DiamondSampicCalibration') +process.totemTimingRecHits.timingCalibrationTag= cms.string('GlobalTag:PPSDiamondSampicCalibration') ################ #geometry ################ diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json index 715f2b5cdd7c0..a7824a34acf00 100644 --- a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json +++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json @@ -3,7 +3,7 @@ "destinationTags": { "CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {} }, - "inputTag": "DiamondSampicCalibration", + "inputTag": "PPSDiamondSampicCalibration_pcl", "since": null, "userText": "Tier0 PCL Upload for PPSDiamondTimingCalibration (Sampic)" } diff --git a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json index e876a5850632e..8da3acdced8b5 100644 --- a/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json +++ b/CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json @@ -3,7 +3,7 @@ "destinationTags": { "CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {} }, - "inputTag": "DiamondSampicCalibration", + "inputTag": "PPSDiamondSampicCalibration_pcl", "since": null, "userText": "Tier0 PCL Upload for PPSDiamondTimingCalibration (Sampic)" } diff --git a/CondFormats/Common/test/ProduceDropBoxMetadata.py b/CondFormats/Common/test/ProduceDropBoxMetadata.py index 9e850d2a29b22..161f3356453b2 100644 --- a/CondFormats/Common/test/ProduceDropBoxMetadata.py +++ b/CondFormats/Common/test/ProduceDropBoxMetadata.py @@ -223,11 +223,17 @@ def encodeJsonInString(filename): prodMetaData = cms.untracked.string(CTPPSRPAlignmentCorrectionsDataRcd_prod_str), prepMetaData = cms.untracked.string(CTPPSRPAlignmentCorrectionsDataRcd_prep_str), ), - cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd'), + cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd_HPTDC'), Source = cms.untracked.string("AlcaHarvesting"), FileClass = cms.untracked.string("ALCA"), prodMetaData = cms.untracked.string(PPSTimingCalibrationRcd_prod_str), prepMetaData = cms.untracked.string(PPSTimingCalibrationRcd_prep_str), + ), + cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd_SAMPIC'), + Source = cms.untracked.string("AlcaHarvesting"), + FileClass = cms.untracked.string("ALCA"), + prodMetaData = cms.untracked.string(PPSTimingCalibrationRcd_Sampic_prod_str), + prepMetaData = cms.untracked.string(PPSTimingCalibrationRcd_Sampic_prep_str), ) ), # this boolean will read the content of whichever payload is available and print its content to stoutput diff --git a/Configuration/StandardSequences/python/AlCaHarvesting_cff.py b/Configuration/StandardSequences/python/AlCaHarvesting_cff.py index d1c1c01b771ba..76bfccf82b8cc 100644 --- a/Configuration/StandardSequences/python/AlCaHarvesting_cff.py +++ b/Configuration/StandardSequences/python/AlCaHarvesting_cff.py @@ -248,15 +248,15 @@ # -------------------------------------------------------------------------------------- # PPS calibration -ALCAHARVESTPPSTimingCalibration_metadata = cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd')) -ALCAHARVESTPPSTimingCalibration_dbOutput = cms.PSet(record = cms.string('PPSTimingCalibrationRcd'), +ALCAHARVESTPPSTimingCalibration_metadata = cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd_HPTDC')) +ALCAHARVESTPPSTimingCalibration_dbOutput = cms.PSet(record = cms.string('PPSTimingCalibrationRcd_HPTDC'), tag = cms.string('PPSDiamondTimingCalibration_pcl'), timetype = cms.untracked.string('runnumber') ) -ALCAHARVESTPPSDiamondSampicTimingCalibration_metadata = cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd')) -ALCAHARVESTPPSDiamondSampicTimingCalibration_dbOutput = cms.PSet(record = cms.string('PPSTimingCalibrationRcd'), - tag = cms.string('DiamondSampicCalibration'), +ALCAHARVESTPPSDiamondSampicTimingCalibration_metadata = cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd_SAMPIC')) +ALCAHARVESTPPSDiamondSampicTimingCalibration_dbOutput = cms.PSet(record = cms.string('PPSTimingCalibrationRcd_SAMPIC'), + tag = cms.string('PPSDiamondSampicCalibration_pcl'), timetype = cms.untracked.string('runnumber')) ALCAHARVESTPPSAlignment_metadata = cms.PSet(record = cms.untracked.string('CTPPSRPAlignmentCorrectionsDataRcd'))