From 2f5919612618a2a63d1fd85fe509360af523e4a3 Mon Sep 17 00:00:00 2001 From: sweyh99 Date: Fri, 24 Jan 2025 19:12:51 +0100 Subject: [PATCH 1/3] [EMCAL-767] change timestamps from current to trigger --- Modules/EMCAL/src/CalibMonitoringTask.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/EMCAL/src/CalibMonitoringTask.cxx b/Modules/EMCAL/src/CalibMonitoringTask.cxx index 8d0e412ba6..51dab8a927 100644 --- a/Modules/EMCAL/src/CalibMonitoringTask.cxx +++ b/Modules/EMCAL/src/CalibMonitoringTask.cxx @@ -268,7 +268,7 @@ void CalibMonitoringTask::update(Trigger t, framework::ServiceRegistryRef) reset(); for (const auto& obj : mCalibObjects) { if (obj == "BadChannelMap") { - mBadChannelMap = mCalibDB->readBadChannelMap(o2::ccdb::getCurrentTimestamp(), metadata); + mBadChannelMap = mCalibDB->readBadChannelMap(t.timestamp, metadata); if (!mBadChannelMap) { ILOG(Info, Support) << "No Bad Channel Map object " << ENDM; continue; @@ -310,7 +310,7 @@ void CalibMonitoringTask::update(Trigger t, framework::ServiceRegistryRef) } if (obj == "TimeCalibParams") { - mTimeCalib = mCalibDB->readTimeCalibParam(o2::ccdb::getCurrentTimestamp(), metadata); + mTimeCalib = mCalibDB->readTimeCalibParam(t.timestamp, metadata); if (!mTimeCalib) { ILOG(Info, Support) << " No Time Calib object " << ENDM; continue; @@ -324,7 +324,7 @@ void CalibMonitoringTask::update(Trigger t, framework::ServiceRegistryRef) } } if (obj == "FeeDCS") { - mFeeDCS = mCalibDB->readFeeDCSData(o2::ccdb::getCurrentTimestamp(), metadata); + mFeeDCS = mCalibDB->readFeeDCSData(t.timestamp, metadata); if (!mFeeDCS) { ILOG(Info, Support) << " No FEE DCS object " << ENDM; continue; From 13039f8e6e98f147f62218e7fd1d67ab22459871 Mon Sep 17 00:00:00 2001 From: sweyh99 Date: Thu, 6 Mar 2025 20:04:32 +0100 Subject: [PATCH 2/3] [EMCAL-525] Add SM lines to all SM histos --- Modules/EMCAL/include/EMCAL/CellTask.h | 1 + Modules/EMCAL/src/CellTask.cxx | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Modules/EMCAL/include/EMCAL/CellTask.h b/Modules/EMCAL/include/EMCAL/CellTask.h index 090281348a..8f5d97877b 100644 --- a/Modules/EMCAL/include/EMCAL/CellTask.h +++ b/Modules/EMCAL/include/EMCAL/CellTask.h @@ -24,6 +24,7 @@ #include "CommonDataFormat/RangeReference.h" #include "Headers/DataHeader.h" #include "DataFormatsEMCAL/TriggerRecord.h" +#include "QualityControl/PostProcessingInterface.h" class TH1; class TH2; diff --git a/Modules/EMCAL/src/CellTask.cxx b/Modules/EMCAL/src/CellTask.cxx index 7bbd76586e..7d83be64fa 100644 --- a/Modules/EMCAL/src/CellTask.cxx +++ b/Modules/EMCAL/src/CellTask.cxx @@ -38,6 +38,7 @@ #include #include #include +#include "EMCAL/DrawGridlines.h" #include namespace o2::quality_control_modules::emcal @@ -1051,6 +1052,10 @@ void CellTask::CellHistograms::fillHistograms(const o2::emcal::Cell& cell, bool } catch (o2::emcal::InvalidCellIDException& e) { ILOG(Info, Support) << "Invalid cell ID: " << e.getCellID() << ENDM; } + + o2::quality_control_modules::emcal::DrawGridlines::DrawSMGridInTriggerGeo(mCellOccupancyThr); + o2::quality_control_modules::emcal::DrawGridlines::DrawSMGridInTriggerGeo(mCellOccupancyThrBelow); + } void CellTask::CellHistograms::countEvent() From c72c7fd35be57a5bb859e8835540fd5e40c2dcfe Mon Sep 17 00:00:00 2001 From: sweyh99 Date: Fri, 7 Mar 2025 22:18:51 +0100 Subject: [PATCH 3/3] [EMCAL-525] clang fixes --- Modules/EMCAL/src/CellTask.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/EMCAL/src/CellTask.cxx b/Modules/EMCAL/src/CellTask.cxx index 7d83be64fa..aef36f9bad 100644 --- a/Modules/EMCAL/src/CellTask.cxx +++ b/Modules/EMCAL/src/CellTask.cxx @@ -1055,7 +1055,6 @@ void CellTask::CellHistograms::fillHistograms(const o2::emcal::Cell& cell, bool o2::quality_control_modules::emcal::DrawGridlines::DrawSMGridInTriggerGeo(mCellOccupancyThr); o2::quality_control_modules::emcal::DrawGridlines::DrawSMGridInTriggerGeo(mCellOccupancyThrBelow); - } void CellTask::CellHistograms::countEvent()