Skip to content

Commit c43cb95

Browse files
jokonigshahor02
jokonig
authored and
shahor02
committed
[EMCAL-565, EMCAL-566] Change validity of ccdb objects to +1month
- Up to now, ccdb objects were given an end TS of practically infinity - Now, a margin of one month is added to the slot end (for safety) - AdjustableEOV set to true (argument after end TS)
1 parent 3fa87fc commit c43cb95

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

‎Detectors/EMCAL/calibration/include/EMCALCalibration/EMCALCalibParams.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ struct EMCALCalibParams : public o2::conf::ConfigurableParamHelper<EMCALCalibPar
7272
bool enableTimeProfiling = false; ///< enable to log how much time is spent in the run function in the calibrator spec. Needed for speed tests offline and at point 2
7373
bool setSavedSlotAllowed_EMC = true; ///< if true, saving and loading of calibrations from last run and for next run is enabled
7474
bool setSavedSlotAllowedSOR_EMC = true; ///< if true, stored calibrations from last run can be loaded in the next run (if false, storing of the calib histograms is still active in contrast to setSavedSlotAllowed_EMC)
75+
long endTimeMargin = 2592000000; ///< set end TS to 30 days after slot ends (1000 * 60 * 60 * 24 * 30)
7576

7677
// old parameters. Keep them for a bit (can be deleted after september 5th) as otherwise ccdb and o2 version might not be in synch
7778
unsigned int minNEvents = 1e7; ///< minimum number of events to trigger the calibration

‎Detectors/EMCAL/calibration/include/EMCALCalibration/EMCALChannelCalibrator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void EMCALChannelCalibrator<DataInput, DataOutput>::finalizeSlot(o2::calibration
170170
// for the CCDB entry
171171
auto clName = o2::utils::MemFileHelper::getClassName(bcm);
172172
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
173-
mInfoVector.emplace_back(CalibDB::getCDBPathBadChannelMap(), clName, flName, md, slot.getStartTimeMS(), o2::ccdb::CcdbObjectInfo::INFINITE_TIMESTAMP);
173+
mInfoVector.emplace_back(CalibDB::getCDBPathBadChannelMap(), clName, flName, md, slot.getStartTimeMS(), slot.getEndTimeMS() + EMCALCalibParams::Instance().endTimeMargin, true);
174174
mCalibObjectVector.push_back(bcm);
175175

176176
if ((EMCALCalibParams::Instance().localRootFilePath).find(".root") != std::string::npos) {
@@ -200,7 +200,7 @@ void EMCALChannelCalibrator<DataInput, DataOutput>::finalizeSlot(o2::calibration
200200
auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
201201

202202
//prepareCCDBobjectInfo
203-
mInfoVector.emplace_back(CalibDB::getCDBPathTimeCalibrationParams(), clName, flName, md, slot.getStartTimeMS(), o2::ccdb::CcdbObjectInfo::INFINITE_TIMESTAMP);
203+
mInfoVector.emplace_back(CalibDB::getCDBPathTimeCalibrationParams(), clName, flName, md, slot.getStartTimeMS(), slot.getEndTimeMS() + EMCALCalibParams::Instance().endTimeMargin, true);
204204
mCalibObjectVector.push_back(tcd);
205205

206206
if ((EMCALCalibParams::Instance().localRootFilePath).find(".root") != std::string::npos) {

0 commit comments

Comments
 (0)