Skip to content

Commit

Permalink
Merge pull request #38981 from tvami/PPSsampicPCL
Browse files Browse the repository at this point in the history 
Fix PPS timing detectors record and tag names for PCL
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 7, 2022
2 parents 848a3db + a3dbe5d commit 63a3e87
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CalibPPS/TimingCalibration/plugins/PPSDiamondSampicTimingCalibrationPCLHarvester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ void PPSDiamondSampicTimingCalibrationPCLHarvester::calibDb(DQMStore::IGetter& i
auto calibPPS = PPSTimingCalibration(formula, params, time_info);
// write the object
edm::Service<cond::service::PoolDBOutputService> poolDbService;
poolDbService->writeOneIOV(calibPPS, poolDbService->currentTime(), "PPSTimingCalibrationRcd");
poolDbService->writeOneIOV(calibPPS, poolDbService->currentTime(), "PPSTimingCalibrationRcd_SAMPIC");
}

//------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/TimingCalibration/plugins/PPSTimingCalibrationPCLHarvester.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void PPSTimingCalibrationPCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQM

// write the object
edm::Service<cond::service::PoolDBOutputService> poolDbService;
poolDbService->writeOneIOV(calib, poolDbService->currentTime(), "PPSTimingCalibrationRcd");
poolDbService->writeOneIOV(calib, poolDbService->currentTime(), "PPSTimingCalibrationRcd_HPTDC");
}

//------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions CalibPPS/TimingCalibration/test/DiamondSampicCalibrationHarvester_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
)
)
)
Expand Down
2 changes: 1 addition & 1 deletion CalibPPS/TimingCalibration/test/DiamondSampicCalibrationWorker_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
################
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"destinationTags": {
"CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {}
},
"inputTag": "DiamondSampicCalibration",
"inputTag": "PPSDiamondSampicCalibration_pcl",
"since": null,
"userText": "Tier0 PCL Upload for PPSDiamondTimingCalibration (Sampic)"
}
2 changes: 1 addition & 1 deletion CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"destinationTags": {
"CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {}
},
"inputTag": "DiamondSampicCalibration",
"inputTag": "PPSDiamondSampicCalibration_pcl",
"since": null,
"userText": "Tier0 PCL Upload for PPSDiamondTimingCalibration (Sampic)"
}
8 changes: 7 additions & 1 deletion CondFormats/Common/test/ProduceDropBoxMetadata.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Configuration/StandardSequences/python/AlCaHarvesting_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down

0 comments on commit 63a3e87

Please sign in to comment.