From 26fccb6bae2cd646581c5ae15db66e56870d07f2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:09:26 +0000 Subject: [PATCH 1/8] Initial plan From 90677384118c66edc7260f04722f6ad7108e6c21 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 10:15:54 +0000 Subject: [PATCH 2/8] Remove CheckInterface::getAcceptedType and isObjectCheckable methods from framework and all user code Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- Framework/include/QualityControl/CheckInterface.h | 11 +---------- Framework/src/CheckInterface.cxx | 14 -------------- Framework/test/testCheckInterface.cxx | 7 ++----- .../Benchmark/include/Benchmark/AlwaysGoodCheck.h | 5 +---- Modules/Benchmark/src/AlwaysGoodCheck.cxx | 2 +- Modules/CPV/include/CPV/PedestalCheck.h | 5 +---- Modules/CPV/include/CPV/PhysicsCheck.h | 2 +- Modules/CPV/src/PedestalCheck.cxx | 4 ++-- Modules/CTP/include/CTP/RawDataReaderCheck.h | 4 +--- Modules/CTP/src/RawDataReaderCheck.cxx | 2 +- Modules/Common/include/Common/CcdbInspectorCheck.h | 4 +--- .../Common/include/Common/EverIncreasingGraph.h | 5 +---- Modules/Common/include/Common/IncreasingEntries.h | 5 +---- Modules/Common/include/Common/MeanIsAbove.h | 5 +---- Modules/Common/include/Common/NonEmpty.h | 5 +---- .../include/Common/ReferenceComparatorCheck.h | 5 +---- Modules/Common/include/Common/TrendCheck.h | 5 +---- Modules/Common/src/CcdbInspectorCheck.cxx | 2 +- Modules/Common/src/EverIncreasingGraph.cxx | 2 +- Modules/Common/src/IncreasingEntries.cxx | 2 +- Modules/Common/src/MeanIsAbove.cxx | 11 ++--------- Modules/Common/src/NonEmpty.cxx | 2 +- Modules/Common/src/ReferenceComparatorCheck.cxx | 2 +- Modules/Common/src/TrendCheck.cxx | 2 +- Modules/Common/test/testMeanIsAbove.cxx | 2 +- Modules/Common/test/testNonEmpty.cxx | 5 ----- Modules/EMCAL/include/EMCAL/CalibCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/CellAmpCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/CellCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/DigitCheck.h | 5 +---- .../EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h | 5 +---- .../EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/RawCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/RawErrorCheck.h | 5 +---- Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h | 5 +---- Modules/EMCAL/include/EMCAL/TrendGraphCheck.h | 5 +---- Modules/EMCAL/src/CalibCheck.cxx | 2 +- Modules/EMCAL/src/CellAmpCheck.cxx | 2 +- Modules/EMCAL/src/CellCheck.cxx | 2 +- Modules/EMCAL/src/CellTimeCalibCheck.cxx | 2 +- Modules/EMCAL/src/DigitCheck.cxx | 2 +- Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx | 2 +- Modules/EMCAL/src/NumPhysTriggCheck.cxx | 2 +- Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx | 2 +- Modules/EMCAL/src/PedestalChannelCheck.cxx | 2 +- Modules/EMCAL/src/RawCheck.cxx | 2 +- Modules/EMCAL/src/RawErrorCheck.cxx | 2 +- Modules/EMCAL/src/RawErrorCheckAll.cxx | 2 +- Modules/EMCAL/src/TrendGraphCheck.cxx | 2 +- Modules/Example/include/Example/FakeCheck.h | 5 +---- Modules/Example/src/FakeCheck.cxx | 2 +- Modules/FIT/FDD/include/FDD/CFDEffCheck.h | 5 +---- Modules/FIT/FDD/include/FDD/GenericCheck.h | 5 +---- Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h | 5 +---- .../include/FDD/OutOfBunchCollFeeModulesCheck.h | 5 +---- Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h | 5 +---- Modules/FIT/FDD/src/CFDEffCheck.cxx | 2 +- Modules/FIT/FDD/src/GenericCheck.cxx | 2 +- Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx | 2 +- .../FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx | 2 +- Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx | 2 +- Modules/FIT/FIT/include/FIT/LevelCheck.h | 4 +--- Modules/FIT/FIT/include/FIT/MIPCheck.h | 4 +--- Modules/FIT/FIT/src/LevelCheck.cxx | 2 +- Modules/FIT/FIT/src/MIPCheck.cxx | 6 +----- Modules/FIT/FT0/include/FT0/CFDEffCheck.h | 5 +---- Modules/FIT/FT0/include/FT0/FractionCheck.h | 5 +---- Modules/FIT/FT0/include/FT0/GenericCheck.h | 5 +---- Modules/FIT/FT0/include/FT0/MergedTreeCheck.h | 5 +---- Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h | 5 +---- Modules/FIT/FT0/src/CFDEffCheck.cxx | 2 +- Modules/FIT/FT0/src/FractionCheck.cxx | 2 +- Modules/FIT/FT0/src/GenericCheck.cxx | 2 +- Modules/FIT/FT0/src/MergedTreeCheck.cxx | 2 +- Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx | 2 +- Modules/FIT/FV0/include/FV0/CFDEffCheck.h | 5 +---- Modules/FIT/FV0/include/FV0/GenericCheck.h | 5 +---- Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h | 5 +---- .../include/FV0/OutOfBunchCollFeeModulesCheck.h | 5 +---- Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h | 5 +---- Modules/FIT/FV0/src/CFDEffCheck.cxx | 2 +- Modules/FIT/FV0/src/GenericCheck.cxx | 2 +- Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx | 2 +- .../FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx | 2 +- Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx | 2 +- Modules/GLO/include/GLO/MeanVertexCheck.h | 5 +---- Modules/GLO/src/MeanVertexCheck.cxx | 2 +- Modules/HMPID/include/HMPID/HmpidRawChecks.h | 4 +--- Modules/ITS/include/ITS/ITSClusterCheck.h | 5 +---- Modules/ITS/include/ITS/ITSFeeCheck.h | 5 +---- Modules/ITS/include/ITS/ITSFhrCheck.h | 4 +--- .../ITS/include/ITS/ITSThresholdCalibrationCheck.h | 5 +---- Modules/ITS/include/ITS/ITSTrackCheck.h | 4 +--- Modules/ITS/src/ITSClusterCheck.cxx | 2 +- Modules/ITS/src/ITSFeeCheck.cxx | 2 +- Modules/ITS/src/ITSFhrCheck.cxx | 2 +- Modules/ITS/src/ITSThresholdCalibrationCheck.cxx | 2 +- Modules/ITS/src/ITSTrackCheck.cxx | 2 +- Modules/MFT/include/MFT/QcMFTClusterCheck.h | 5 +---- Modules/MFT/include/MFT/QcMFTDigitCheck.h | 5 +---- Modules/MFT/include/MFT/QcMFTReadoutCheck.h | 5 +---- Modules/MFT/include/MFT/QcMFTTrackCheck.h | 5 +---- Modules/MFT/src/QcMFTClusterCheck.cxx | 2 +- Modules/MFT/src/QcMFTDigitCheck.cxx | 2 +- Modules/MFT/src/QcMFTReadoutCheck.cxx | 2 +- Modules/MFT/src/QcMFTTrackCheck.cxx | 2 +- .../include/MUONCommon/MatchingEfficiencyCheck.h | 5 +---- .../MUON/Common/include/MUONCommon/TracksCheck.h | 5 +---- .../MUON/Common/src/MatchingEfficiencyCheck.cxx | 2 +- Modules/MUON/Common/src/TracksCheck.cxx | 2 +- Modules/MUON/MCH/include/MCH/ClustersCheck.h | 5 +---- Modules/MUON/MCH/include/MCH/DecodingCheck.h | 5 +---- Modules/MUON/MCH/include/MCH/DigitsCheck.h | 5 +---- Modules/MUON/MCH/include/MCH/PedestalsCheck.h | 5 +---- Modules/MUON/MCH/include/MCH/PreclustersCheck.h | 5 +---- Modules/MUON/MCH/src/ClustersCheck.cxx | 2 +- Modules/MUON/MCH/src/DecodingCheck.cxx | 2 +- Modules/MUON/MCH/src/DigitsCheck.cxx | 2 +- Modules/MUON/MCH/src/PedestalsCheck.cxx | 2 +- Modules/MUON/MCH/src/PreclustersCheck.cxx | 2 +- Modules/MUON/MID/include/MID/CalibMQcCheck.h | 5 +---- Modules/MUON/MID/include/MID/CalibQcCheck.h | 5 +---- Modules/MUON/MID/include/MID/ClustQcCheck.h | 5 +---- Modules/MUON/MID/include/MID/DigitsQcCheck.h | 5 +---- Modules/MUON/MID/include/MID/RawQcCheck.h | 5 +---- Modules/MUON/MID/include/MID/TracksQcCheck.h | 5 +---- Modules/MUON/MID/src/CalibMQcCheck.cxx | 2 +- Modules/MUON/MID/src/CalibQcCheck.cxx | 2 +- Modules/MUON/MID/src/ClustQcCheck.cxx | 2 +- Modules/MUON/MID/src/DigitsQcCheck.cxx | 2 +- Modules/MUON/MID/src/RawQcCheck.cxx | 2 +- Modules/MUON/MID/src/TracksQcCheck.cxx | 2 +- Modules/PHOS/include/PHOS/ClusterCheck.h | 5 +---- Modules/PHOS/include/PHOS/RawCheck.h | 5 +---- Modules/PHOS/src/ClusterCheck.cxx | 2 +- Modules/PHOS/src/RawCheck.cxx | 2 +- Modules/Skeleton/include/Skeleton/SkeletonCheck.h | 4 +--- Modules/Skeleton/src/SkeletonCheck.cxx | 6 +----- Modules/TOF/include/TOF/CheckCompressedData.h | 5 +---- Modules/TOF/include/TOF/CheckDRMDiagnostics.h | 5 +---- Modules/TOF/include/TOF/CheckDiagnostics.h | 5 +---- Modules/TOF/include/TOF/CheckHitMap.h | 2 +- Modules/TOF/include/TOF/CheckLostOrbits.h | 5 +---- Modules/TOF/include/TOF/CheckNoise.h | 2 +- Modules/TOF/include/TOF/CheckRaw.h | 5 +---- Modules/TOF/include/TOF/CheckRawMultiplicity.h | 2 +- Modules/TOF/include/TOF/CheckRawTime.h | 2 +- Modules/TOF/include/TOF/CheckRawToT.h | 2 +- Modules/TOF/include/TOF/CheckSlotPartMask.h | 5 +---- Modules/TOF/src/CheckCompressedData.cxx | 2 +- Modules/TOF/src/CheckDRMDiagnostics.cxx | 2 +- Modules/TOF/src/CheckDiagnostics.cxx | 2 +- Modules/TOF/src/CheckHitMap.cxx | 14 ++------------ Modules/TOF/src/CheckLostOrbits.cxx | 2 +- Modules/TOF/src/CheckNoise.cxx | 14 ++------------ Modules/TOF/src/CheckRaw.cxx | 2 +- Modules/TOF/src/CheckRawMultiplicity.cxx | 14 ++------------ Modules/TOF/src/CheckRawTime.cxx | 14 ++------------ Modules/TOF/src/CheckRawToT.cxx | 14 ++------------ Modules/TOF/src/CheckSlotPartMask.cxx | 2 +- Modules/TPC/include/TPC/CheckForEmptyPads.h | 5 +---- Modules/TPC/include/TPC/CheckOfPads.h | 5 +---- Modules/TPC/include/TPC/CheckOfSlices.h | 2 +- Modules/TPC/include/TPC/CheckOfTrendings.h | 5 +---- Modules/TPC/include/TPC/GenericHistogramCheck.h | 5 +---- Modules/TPC/include/TPC/PadCalibrationCheck.h | 5 +---- Modules/TPC/src/CheckForEmptyPads.cxx | 5 +---- Modules/TPC/src/CheckOfPads.cxx | 2 +- Modules/TPC/src/CheckOfTrendings.cxx | 2 +- Modules/TPC/src/GenericHistogramCheck.cxx | 2 +- Modules/TPC/src/PadCalibrationCheck.cxx | 2 +- Modules/TRD/include/TRD/PulseHeightCheck.h | 4 +--- Modules/TRD/include/TRD/PulsePositionCheck.h | 4 +--- Modules/TRD/include/TRD/RawDataCheck.h | 8 ++------ Modules/TRD/include/TRD/TrackletCountCheck.h | 4 +--- Modules/TRD/src/PulseHeightCheck.cxx | 2 +- Modules/TRD/src/PulsePositionCheck.cxx | 2 +- Modules/TRD/src/RawDataCheck.cxx | 10 ++-------- Modules/TRD/src/TrackletCountCheck.cxx | 2 +- Modules/ZDC/include/ZDC/ZDCRawDataCheck.h | 5 +---- Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h | 4 +--- Modules/ZDC/include/ZDC/ZDCRecDataCheck.h | 5 +---- Modules/ZDC/src/ZDCRawDataCheck.cxx | 2 +- Modules/ZDC/src/ZDCRecBeautifyPlots.cxx | 6 +----- Modules/ZDC/src/ZDCRecDataCheck.cxx | 2 +- 188 files changed, 196 insertions(+), 552 deletions(-) diff --git a/Framework/include/QualityControl/CheckInterface.h b/Framework/include/QualityControl/CheckInterface.h index ce19d1ff97..1b4c543966 100644 --- a/Framework/include/QualityControl/CheckInterface.h +++ b/Framework/include/QualityControl/CheckInterface.h @@ -69,16 +69,7 @@ class CheckInterface : public core::UserCodeInterface /// then this should be reset here. virtual void reset(); // not fully abstract because we don't want to change all the existing subclasses - /// \brief Returns the name of the class that can be treated by this check. - /// - /// The name of the class returned by this method will be checked against the MonitorObject's encapsulated - /// object's class. If it is the same or a parent then the check will be applied. Therefore, this method - /// must return the highest class in the hierarchy that this check can use. - /// If the class does not override it, we return "TObject". - virtual std::string getAcceptedType(); - - bool isObjectCheckable(const std::shared_ptr mo); - bool isObjectCheckable(const core::MonitorObject* mo); + virtual void startOfActivity(const core::Activity& activity); // not fully abstract because we don't want to change all the existing subclasses virtual void endOfActivity(const core::Activity& activity); // not fully abstract because we don't want to change all the existing subclasses diff --git a/Framework/src/CheckInterface.cxx b/Framework/src/CheckInterface.cxx index 445d51e609..44fa2cf0f0 100644 --- a/Framework/src/CheckInterface.cxx +++ b/Framework/src/CheckInterface.cxx @@ -18,27 +18,13 @@ #include "QualityControl/ReferenceUtils.h" #include "QualityControl/MonitorObject.h" -#include - using namespace std; using namespace o2::quality_control::core; namespace o2::quality_control::checker { -std::string CheckInterface::getAcceptedType() { return "TObject"; } - -bool CheckInterface::isObjectCheckable(const std::shared_ptr mo) -{ - return isObjectCheckable(mo.get()); -} -bool CheckInterface::isObjectCheckable(const MonitorObject* mo) -{ - TObject* encapsulated = mo->getObject(); - - return encapsulated->IsA()->InheritsFrom(getAcceptedType().c_str()); -} void CheckInterface::configure() { diff --git a/Framework/test/testCheckInterface.cxx b/Framework/test/testCheckInterface.cxx index 61994da0f2..3b06479755 100644 --- a/Framework/test/testCheckInterface.cxx +++ b/Framework/test/testCheckInterface.cxx @@ -62,10 +62,7 @@ class TestCheck : public checker::CheckInterface str->String().Append(" is beautiful now"); } - std::string getAcceptedType() override - { - return "TObjString"; - } + string mValidString; }; @@ -91,5 +88,5 @@ TEST_CASE("test_invoke_all_interface_methods") testCheck.beautify(mo); CHECK(reinterpret_cast(mo->getObject())->String() == "A string is beautiful now"); - CHECK(testCheck.getAcceptedType() == "TObjString"); + } diff --git a/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h b/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h index b181650751..45a7565034 100644 --- a/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h +++ b/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h @@ -36,10 +36,7 @@ class AlwaysGoodCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(AlwaysGoodCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(AlwaysGoodCheck, 2); }; } // namespace o2::quality_control_modules::benchmark diff --git a/Modules/Benchmark/src/AlwaysGoodCheck.cxx b/Modules/Benchmark/src/AlwaysGoodCheck.cxx index 2207745440..42a17a8cf3 100644 --- a/Modules/Benchmark/src/AlwaysGoodCheck.cxx +++ b/Modules/Benchmark/src/AlwaysGoodCheck.cxx @@ -33,7 +33,7 @@ Quality AlwaysGoodCheck::check(std::map, Quality) { diff --git a/Modules/CPV/include/CPV/PedestalCheck.h b/Modules/CPV/include/CPV/PedestalCheck.h index d25b70f8e6..c89bee1755 100644 --- a/Modules/CPV/include/CPV/PedestalCheck.h +++ b/Modules/CPV/include/CPV/PedestalCheck.h @@ -36,10 +36,7 @@ class PedestalCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: int getRunNumberFromMO(std::shared_ptr mo); // configurable parameters and their default values diff --git a/Modules/CPV/include/CPV/PhysicsCheck.h b/Modules/CPV/include/CPV/PhysicsCheck.h index 9cf2cb603e..ba9aa7e0d4 100644 --- a/Modules/CPV/include/CPV/PhysicsCheck.h +++ b/Modules/CPV/include/CPV/PhysicsCheck.h @@ -37,7 +37,7 @@ class PhysicsCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override { return "TH1"; } + private: int getRunNumberFromMO(std::shared_ptr mo); diff --git a/Modules/CPV/src/PedestalCheck.cxx b/Modules/CPV/src/PedestalCheck.cxx index 8e02c4c38d..6e708bad5a 100644 --- a/Modules/CPV/src/PedestalCheck.cxx +++ b/Modules/CPV/src/PedestalCheck.cxx @@ -279,8 +279,8 @@ Quality PedestalCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/CTP/include/CTP/RawDataReaderCheck.h b/Modules/CTP/include/CTP/RawDataReaderCheck.h index b7a1fa1673..c738d3bb57 100644 --- a/Modules/CTP/include/CTP/RawDataReaderCheck.h +++ b/Modules/CTP/include/CTP/RawDataReaderCheck.h @@ -41,9 +41,7 @@ class RawDataReaderCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; const double_t nofOrbitsPerTF = o2::base::GRPGeomHelper::instance().getNHBFPerTF(); const double_t TimeTF = nofOrbitsPerTF * o2::constants::lhc::LHCOrbitMUS / 1e6; // in seconds diff --git a/Modules/CTP/src/RawDataReaderCheck.cxx b/Modules/CTP/src/RawDataReaderCheck.cxx index 83094a67a4..a1860f1d84 100644 --- a/Modules/CTP/src/RawDataReaderCheck.cxx +++ b/Modules/CTP/src/RawDataReaderCheck.cxx @@ -201,7 +201,7 @@ float RawDataReaderCheck::setTextPosition(float iPos, std::shared_ptr ms return MessagePos; } -std::string RawDataReaderCheck::getAcceptedType() { return "TH1"; } + void RawDataReaderCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/Common/include/Common/CcdbInspectorCheck.h b/Modules/Common/include/Common/CcdbInspectorCheck.h index b6c4b15d81..9d40d49148 100644 --- a/Modules/Common/include/Common/CcdbInspectorCheck.h +++ b/Modules/Common/include/Common/CcdbInspectorCheck.h @@ -36,9 +36,7 @@ class CcdbInspectorCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/Common/include/Common/EverIncreasingGraph.h b/Modules/Common/include/Common/EverIncreasingGraph.h index d8526e0f9e..5e0c29e93c 100644 --- a/Modules/Common/include/Common/EverIncreasingGraph.h +++ b/Modules/Common/include/Common/EverIncreasingGraph.h @@ -34,10 +34,7 @@ class EverIncreasingGraph : public o2::quality_control::checker::CheckInterface ~EverIncreasingGraph() override = default; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: ClassDefOverride(EverIncreasingGraph, 2); }; diff --git a/Modules/Common/include/Common/IncreasingEntries.h b/Modules/Common/include/Common/IncreasingEntries.h index 44ac51c6b2..bcae01a55a 100644 --- a/Modules/Common/include/Common/IncreasingEntries.h +++ b/Modules/Common/include/Common/IncreasingEntries.h @@ -38,10 +38,7 @@ class IncreasingEntries : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: std::map mLastEntries; // moName -> number of entries // count the number of faults we have seen in a row for each object diff --git a/Modules/Common/include/Common/MeanIsAbove.h b/Modules/Common/include/Common/MeanIsAbove.h index 09ec66243c..9af428af22 100644 --- a/Modules/Common/include/Common/MeanIsAbove.h +++ b/Modules/Common/include/Common/MeanIsAbove.h @@ -37,10 +37,7 @@ class MeanIsAbove : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: float mThreshold = 0.0f; ClassDefOverride(MeanIsAbove, 2) diff --git a/Modules/Common/include/Common/NonEmpty.h b/Modules/Common/include/Common/NonEmpty.h index 2e72e6810c..e0cb885174 100644 --- a/Modules/Common/include/Common/NonEmpty.h +++ b/Modules/Common/include/Common/NonEmpty.h @@ -34,10 +34,7 @@ class NonEmpty : public o2::quality_control::checker::CheckInterface ~NonEmpty() override = default; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - ClassDefOverride(NonEmpty, 2); + void beautify(std::shared_ptr mo, Quality checkResult) override; ClassDefOverride(NonEmpty, 2); }; } // namespace o2::quality_control_modules::common diff --git a/Modules/Common/include/Common/ReferenceComparatorCheck.h b/Modules/Common/include/Common/ReferenceComparatorCheck.h index f251b33c17..ef599c6220 100644 --- a/Modules/Common/include/Common/ReferenceComparatorCheck.h +++ b/Modules/Common/include/Common/ReferenceComparatorCheck.h @@ -44,10 +44,7 @@ class ReferenceComparatorCheck : public o2::quality_control::checker::CheckInter void configure() override; Quality check(std::map>* moMap) override; void reset() override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; private: diff --git a/Modules/Common/include/Common/TrendCheck.h b/Modules/Common/include/Common/TrendCheck.h index f52c1bad17..c9209eceb2 100644 --- a/Modules/Common/include/Common/TrendCheck.h +++ b/Modules/Common/include/Common/TrendCheck.h @@ -47,10 +47,7 @@ class TrendCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; ClassDefOverride(TrendCheck, 1); diff --git a/Modules/Common/src/CcdbInspectorCheck.cxx b/Modules/Common/src/CcdbInspectorCheck.cxx index 90f3fb25b9..dc71cbb634 100644 --- a/Modules/Common/src/CcdbInspectorCheck.cxx +++ b/Modules/Common/src/CcdbInspectorCheck.cxx @@ -71,7 +71,7 @@ Quality CcdbInspectorCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/Common/src/EverIncreasingGraph.cxx b/Modules/Common/src/EverIncreasingGraph.cxx index 20b7ca9e1e..f61ac56f02 100644 --- a/Modules/Common/src/EverIncreasingGraph.cxx +++ b/Modules/Common/src/EverIncreasingGraph.cxx @@ -55,7 +55,7 @@ Quality EverIncreasingGraph::check(std::map mo, Quality checkResult) { diff --git a/Modules/Common/src/IncreasingEntries.cxx b/Modules/Common/src/IncreasingEntries.cxx index 2bcd9eb220..b06fb780e2 100644 --- a/Modules/Common/src/IncreasingEntries.cxx +++ b/Modules/Common/src/IncreasingEntries.cxx @@ -93,7 +93,7 @@ Quality IncreasingEntries::check(std::map mo, Quality checkResult) { diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx index fe8922bf84..271529242c 100644 --- a/Modules/Common/src/MeanIsAbove.cxx +++ b/Modules/Common/src/MeanIsAbove.cxx @@ -38,7 +38,7 @@ void MeanIsAbove::configure() mThreshold = stof(mCustomParameters.at("meanThreshold")); } -std::string MeanIsAbove::getAcceptedType() { return "TH1"; } + Quality MeanIsAbove::check(std::map>* moMap) { @@ -57,14 +57,7 @@ Quality MeanIsAbove::check(std::map> void MeanIsAbove::beautify(std::shared_ptr mo, Quality checkResult) { // A line is drawn at the level of the threshold. - // Its colour depends on the quality. - - if (!this->isObjectCheckable(mo)) { - ILOG(Error, Support) << "object not checkable" << ENDM; - return; - } - - auto* th1 = dynamic_cast(mo->getObject()); + // Its colour depends on the quality.auto* th1 = dynamic_cast(mo->getObject()); Double_t xMin = th1->GetXaxis()->GetXmin(); Double_t xMax = th1->GetXaxis()->GetXmax(); diff --git a/Modules/Common/src/NonEmpty.cxx b/Modules/Common/src/NonEmpty.cxx index a8b0093afe..643ac107e0 100644 --- a/Modules/Common/src/NonEmpty.cxx +++ b/Modules/Common/src/NonEmpty.cxx @@ -46,7 +46,7 @@ ClassImp(o2::quality_control_modules::common::NonEmpty) return result; } - std::string NonEmpty::getAcceptedType() { return "TH1"; } + void NonEmpty::beautify(std::shared_ptr /*mo*/, Quality /*checkResult*/) { diff --git a/Modules/Common/src/ReferenceComparatorCheck.cxx b/Modules/Common/src/ReferenceComparatorCheck.cxx index c3eea7b6a4..3d01f43eab 100644 --- a/Modules/Common/src/ReferenceComparatorCheck.cxx +++ b/Modules/Common/src/ReferenceComparatorCheck.cxx @@ -211,7 +211,7 @@ void ReferenceComparatorCheck::reset() mQualityFlags.clear(); } -std::string ReferenceComparatorCheck::getAcceptedType() { return "TH1"; } + // return the ROOT color index associated to a give quality level static int getQualityColor(const Quality& q) diff --git a/Modules/Common/src/TrendCheck.cxx b/Modules/Common/src/TrendCheck.cxx index 18af651995..1934668605 100644 --- a/Modules/Common/src/TrendCheck.cxx +++ b/Modules/Common/src/TrendCheck.cxx @@ -356,7 +356,7 @@ Quality TrendCheck::check(std::map>* return result; } -std::string TrendCheck::getAcceptedType() { return "TObject"; } + static void drawThresholds(TGraph* graph, const std::vector>>& thresholds, int lineColor, int lineStyle) { diff --git a/Modules/Common/test/testMeanIsAbove.cxx b/Modules/Common/test/testMeanIsAbove.cxx index fe4a5964e9..a87325c003 100644 --- a/Modules/Common/test/testMeanIsAbove.cxx +++ b/Modules/Common/test/testMeanIsAbove.cxx @@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(test_types) std::map> moMap = { { "test", mo } }; MeanIsAbove check; - BOOST_TEST(!check.isObjectCheckable(mo)); + Quality quality = check.check(&moMap); BOOST_CHECK_EQUAL(quality, Quality::Null); diff --git a/Modules/Common/test/testNonEmpty.cxx b/Modules/Common/test/testNonEmpty.cxx index c280ab52a8..ad2796fba5 100644 --- a/Modules/Common/test/testNonEmpty.cxx +++ b/Modules/Common/test/testNonEmpty.cxx @@ -34,12 +34,7 @@ BOOST_AUTO_TEST_CASE(checkable) monitorObject.setIsOwner(false); NonEmpty myCheck; - BOOST_CHECK_EQUAL(myCheck.getAcceptedType(), "TH1"); - BOOST_CHECK_EQUAL(myCheck.isObjectCheckable(&monitorObject), true); - TObject obj; - monitorObject.setObject(&obj); - BOOST_CHECK_EQUAL(myCheck.isObjectCheckable(&monitorObject), false); } BOOST_AUTO_TEST_CASE(beautify) diff --git a/Modules/EMCAL/include/EMCAL/CalibCheck.h b/Modules/EMCAL/include/EMCAL/CalibCheck.h index d3287f67e5..9fed860e63 100644 --- a/Modules/EMCAL/include/EMCAL/CalibCheck.h +++ b/Modules/EMCAL/include/EMCAL/CalibCheck.h @@ -36,10 +36,7 @@ class CalibCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/CellAmpCheck.h b/Modules/EMCAL/include/EMCAL/CellAmpCheck.h index 38ab341676..b742f99637 100644 --- a/Modules/EMCAL/include/EMCAL/CellAmpCheck.h +++ b/Modules/EMCAL/include/EMCAL/CellAmpCheck.h @@ -40,10 +40,7 @@ class CellAmpCheck : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, - Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + Quality checkResult = Quality::Null) override; private: // /************************************************ // * reference histograms * // ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/CellCheck.h b/Modules/EMCAL/include/EMCAL/CellCheck.h index 0f9a2301dc..d4d4a2b418 100644 --- a/Modules/EMCAL/include/EMCAL/CellCheck.h +++ b/Modules/EMCAL/include/EMCAL/CellCheck.h @@ -35,10 +35,7 @@ class CellCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(CellCheck, 1); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CellCheck, 1); }; } // namespace o2::quality_control_modules::emcal diff --git a/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h b/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h index ca567d3bb0..13459b33c4 100644 --- a/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h +++ b/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h @@ -36,10 +36,7 @@ class CellTimeCalibCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/DigitCheck.h b/Modules/EMCAL/include/EMCAL/DigitCheck.h index 427482c4e7..029ccd3d40 100644 --- a/Modules/EMCAL/include/EMCAL/DigitCheck.h +++ b/Modules/EMCAL/include/EMCAL/DigitCheck.h @@ -32,10 +32,7 @@ class DigitCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(DigitCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(DigitCheck, 2); }; } // namespace o2::quality_control_modules::emcal diff --git a/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h b/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h index 02decc0ea1..08533f94f4 100644 --- a/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h +++ b/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h @@ -40,10 +40,7 @@ class NumPatchesPerFastORCheck : public o2::quality_control::checker::CheckInter // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - struct FastORNoiseInfo { + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; struct FastORNoiseInfo { int mCounts; int mTRUIndex; int mFastORIndex; diff --git a/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h b/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h index bec6093ea4..6984a67db2 100644 --- a/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h +++ b/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h @@ -47,10 +47,7 @@ class NumPhysTriggCheck : public o2::quality_control::checker::CheckInterface void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; /// \brief Accept only TH1 histograms as input - /// \return Name of the accepted object: TH1 - std::string getAcceptedType() override; - - ClassDefOverride(NumPhysTriggCheck, 1); + /// \return Name of the accepted object: TH1 ClassDefOverride(NumPhysTriggCheck, 1); private: double mFracToMaxGood = 0.5; ///< Thresholds for minimum fraction of physics triggers compared to maximum diff --git a/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h b/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h index 394f980738..f335c64b20 100644 --- a/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h +++ b/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h @@ -37,10 +37,7 @@ class PayloadPerEventDDLCheck : public o2::quality_control::checker::CheckInterf // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: // /************************************************ // * reference histograms * // ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h b/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h index c62feb0333..dbacaf8e28 100644 --- a/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h +++ b/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h @@ -36,10 +36,7 @@ class PedestalChannelCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/RawCheck.h b/Modules/EMCAL/include/EMCAL/RawCheck.h index 90e3366474..af438a5be8 100644 --- a/Modules/EMCAL/include/EMCAL/RawCheck.h +++ b/Modules/EMCAL/include/EMCAL/RawCheck.h @@ -41,10 +41,7 @@ class RawCheck final : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: Quality runPedestalCheck1D(TH1* adcdist, double minentries, double signalfraction) const; std::vector runPedestalCheck2D(TH2* adchist, double minentries, double signalfraction) const; std::array, 20> reduceBadFECs(std::vector fecids) const; diff --git a/Modules/EMCAL/include/EMCAL/RawErrorCheck.h b/Modules/EMCAL/include/EMCAL/RawErrorCheck.h index 581e637257..9cdf7d3bdf 100644 --- a/Modules/EMCAL/include/EMCAL/RawErrorCheck.h +++ b/Modules/EMCAL/include/EMCAL/RawErrorCheck.h @@ -57,10 +57,7 @@ class RawErrorCheck : public o2::quality_control::checker::CheckInterface void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; /// \brief Accept only TH2 histograms as input - /// \return Name of the accepted object: TH2 - std::string getAcceptedType() override; - - ClassDefOverride(RawErrorCheck, 2); + /// \return Name of the accepted object: TH2 ClassDefOverride(RawErrorCheck, 2); private: /// \brief Decode key of a configurable parameter as boolean diff --git a/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h b/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h index ee789432fc..32ea9f67ee 100644 --- a/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h +++ b/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h @@ -36,10 +36,7 @@ class RawErrorCheckAll : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h b/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h index c61a103bed..119ebe8ae3 100644 --- a/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h +++ b/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h @@ -38,10 +38,7 @@ class TrendGraphCheck : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, - Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + Quality checkResult = Quality::Null) override; private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/src/CalibCheck.cxx b/Modules/EMCAL/src/CalibCheck.cxx index e2933ca952..d6177c8c2e 100644 --- a/Modules/EMCAL/src/CalibCheck.cxx +++ b/Modules/EMCAL/src/CalibCheck.cxx @@ -372,7 +372,7 @@ Quality CalibCheck::check(std::map>* return result; } -std::string CalibCheck::getAcceptedType() { return "TH1"; } + void CalibCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/CellAmpCheck.cxx b/Modules/EMCAL/src/CellAmpCheck.cxx index cc8a74d620..04095d2dc1 100644 --- a/Modules/EMCAL/src/CellAmpCheck.cxx +++ b/Modules/EMCAL/src/CellAmpCheck.cxx @@ -77,7 +77,7 @@ Quality CellAmpCheck::check( return result; } -std::string CellAmpCheck::getAcceptedType() { return "TH1"; } + void CellAmpCheck::beautify(std::shared_ptr mo, Quality checkResult) diff --git a/Modules/EMCAL/src/CellCheck.cxx b/Modules/EMCAL/src/CellCheck.cxx index 12b6673ff3..186ac4b7fc 100644 --- a/Modules/EMCAL/src/CellCheck.cxx +++ b/Modules/EMCAL/src/CellCheck.cxx @@ -97,7 +97,7 @@ Quality CellCheck::check(std::map>* return result; } -std::string CellCheck::getAcceptedType() { return "TH1"; } + void CellCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/CellTimeCalibCheck.cxx b/Modules/EMCAL/src/CellTimeCalibCheck.cxx index 5f07173e11..d0a804383b 100644 --- a/Modules/EMCAL/src/CellTimeCalibCheck.cxx +++ b/Modules/EMCAL/src/CellTimeCalibCheck.cxx @@ -76,7 +76,7 @@ Quality CellTimeCalibCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/DigitCheck.cxx b/Modules/EMCAL/src/DigitCheck.cxx index 55e7aef7e3..45a2dc2361 100644 --- a/Modules/EMCAL/src/DigitCheck.cxx +++ b/Modules/EMCAL/src/DigitCheck.cxx @@ -94,7 +94,7 @@ Quality DigitCheck::check(std::map>* return result; } -std::string DigitCheck::getAcceptedType() { return "TH1"; } + void DigitCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx b/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx index 26b3f7f9fc..c9e7c2b298 100644 --- a/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx +++ b/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx @@ -236,7 +236,7 @@ Quality NumPatchesPerFastORCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/NumPhysTriggCheck.cxx b/Modules/EMCAL/src/NumPhysTriggCheck.cxx index 84022e088b..7167ac0275 100644 --- a/Modules/EMCAL/src/NumPhysTriggCheck.cxx +++ b/Modules/EMCAL/src/NumPhysTriggCheck.cxx @@ -81,7 +81,7 @@ Quality NumPhysTriggCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx b/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx index 8f0efeb4ea..02042912fd 100644 --- a/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx +++ b/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx @@ -77,7 +77,7 @@ Quality PayloadPerEventDDLCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/PedestalChannelCheck.cxx b/Modules/EMCAL/src/PedestalChannelCheck.cxx index 83e350e351..adbbdff2f1 100644 --- a/Modules/EMCAL/src/PedestalChannelCheck.cxx +++ b/Modules/EMCAL/src/PedestalChannelCheck.cxx @@ -164,7 +164,7 @@ Quality PedestalChannelCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/RawCheck.cxx b/Modules/EMCAL/src/RawCheck.cxx index b872db814a..cd3249a5c3 100644 --- a/Modules/EMCAL/src/RawCheck.cxx +++ b/Modules/EMCAL/src/RawCheck.cxx @@ -226,7 +226,7 @@ Quality RawCheck::check(std::map>* m return result; } -std::string RawCheck::getAcceptedType() { return "TH1"; } + void RawCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/RawErrorCheck.cxx b/Modules/EMCAL/src/RawErrorCheck.cxx index af70213cf6..5245a592d2 100644 --- a/Modules/EMCAL/src/RawErrorCheck.cxx +++ b/Modules/EMCAL/src/RawErrorCheck.cxx @@ -355,7 +355,7 @@ Quality RawErrorCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/RawErrorCheckAll.cxx b/Modules/EMCAL/src/RawErrorCheckAll.cxx index 704ba41b7b..f520b57dd4 100644 --- a/Modules/EMCAL/src/RawErrorCheckAll.cxx +++ b/Modules/EMCAL/src/RawErrorCheckAll.cxx @@ -90,7 +90,7 @@ Quality RawErrorCheckAll::check(std::map mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/TrendGraphCheck.cxx b/Modules/EMCAL/src/TrendGraphCheck.cxx index 263f49f161..e65026905d 100644 --- a/Modules/EMCAL/src/TrendGraphCheck.cxx +++ b/Modules/EMCAL/src/TrendGraphCheck.cxx @@ -117,7 +117,7 @@ Quality TrendGraphCheck::check( return result; } -std::string TrendGraphCheck::getAcceptedType() { return "TGraph"; } + void TrendGraphCheck::beautify(std::shared_ptr mo, Quality checkResult) diff --git a/Modules/Example/include/Example/FakeCheck.h b/Modules/Example/include/Example/FakeCheck.h index f812573938..84858f9c54 100644 --- a/Modules/Example/include/Example/FakeCheck.h +++ b/Modules/Example/include/Example/FakeCheck.h @@ -35,10 +35,7 @@ class FakeCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(FakeCheck, 1); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(FakeCheck, 1); }; } // namespace o2::quality_control_modules::example diff --git a/Modules/Example/src/FakeCheck.cxx b/Modules/Example/src/FakeCheck.cxx index e764045f5f..c33d7f9e50 100644 --- a/Modules/Example/src/FakeCheck.cxx +++ b/Modules/Example/src/FakeCheck.cxx @@ -34,7 +34,7 @@ ClassImp(o2::quality_control_modules::example::FakeCheck) return result; } - std::string FakeCheck::getAcceptedType() { return "TH1"; } + void FakeCheck::beautify(std::shared_ptr /*mo*/, Quality /*checkResult*/) { diff --git a/Modules/FIT/FDD/include/FDD/CFDEffCheck.h b/Modules/FIT/FDD/include/FDD/CFDEffCheck.h index e00e7c71d1..b5bd3b516e 100644 --- a/Modules/FIT/FDD/include/FDD/CFDEffCheck.h +++ b/Modules/FIT/FDD/include/FDD/CFDEffCheck.h @@ -39,10 +39,7 @@ class CFDEffCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(CFDEffCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CFDEffCheck, 2); private: template >* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(GenericCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(GenericCheck, 2); private: SingleCheck getCheckFromConfig(std::string); diff --git a/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h b/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h index 3f932ffac2..9ed3437c1f 100644 --- a/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h +++ b/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h @@ -36,10 +36,7 @@ class OutOfBunchCollCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; ClassDefOverride(OutOfBunchCollCheck, 2); diff --git a/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h b/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h index 7f5b5f04bd..bc7df6a293 100644 --- a/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h +++ b/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h @@ -30,10 +30,7 @@ class OutOfBunchCollFeeModulesCheck : public o2::quality_control::checker::Check void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(OutOfBunchCollFeeModulesCheck, 1); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(OutOfBunchCollFeeModulesCheck, 1); private: float mThreshWarning; diff --git a/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h b/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h index 2808bdcb41..33b9636292 100644 --- a/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h +++ b/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h @@ -30,10 +30,7 @@ class TriggersSwVsTcmCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(TriggersSwVsTcmCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(TriggersSwVsTcmCheck, 2); private: std::array mPositionMsgBox; diff --git a/Modules/FIT/FDD/src/CFDEffCheck.cxx b/Modules/FIT/FDD/src/CFDEffCheck.cxx index 666916d769..eb30b31661 100644 --- a/Modules/FIT/FDD/src/CFDEffCheck.cxx +++ b/Modules/FIT/FDD/src/CFDEffCheck.cxx @@ -146,7 +146,7 @@ Quality CFDEffCheck::check(std::map> return result; } -std::string CFDEffCheck::getAcceptedType() { return "TH1"; } + void CFDEffCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FDD/src/GenericCheck.cxx b/Modules/FIT/FDD/src/GenericCheck.cxx index 4717095fe4..b61c3347b2 100644 --- a/Modules/FIT/FDD/src/GenericCheck.cxx +++ b/Modules/FIT/FDD/src/GenericCheck.cxx @@ -262,7 +262,7 @@ Quality GenericCheck::check(std::map return result; } -std::string GenericCheck::getAcceptedType() { return "TObject"; } + void GenericCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx b/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx index 111acfc9bb..bb8a38b6e7 100644 --- a/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx +++ b/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx @@ -128,7 +128,7 @@ Quality OutOfBunchCollCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx b/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx index 84f998d355..c558180e33 100644 --- a/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx +++ b/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx @@ -120,7 +120,7 @@ Quality OutOfBunchCollFeeModulesCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx b/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx index 4fcb589fe3..0a407b8894 100644 --- a/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx +++ b/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx @@ -103,7 +103,7 @@ Quality TriggersSwVsTcmCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FIT/include/FIT/LevelCheck.h b/Modules/FIT/FIT/include/FIT/LevelCheck.h index 92d18e4261..4433fb1dcb 100644 --- a/Modules/FIT/FIT/include/FIT/LevelCheck.h +++ b/Modules/FIT/FIT/include/FIT/LevelCheck.h @@ -34,9 +34,7 @@ class LevelCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; private: void updateBinsToIgnoreWithDCM(); diff --git a/Modules/FIT/FIT/include/FIT/MIPCheck.h b/Modules/FIT/FIT/include/FIT/MIPCheck.h index de2e4950d6..4094b14e38 100644 --- a/Modules/FIT/FIT/include/FIT/MIPCheck.h +++ b/Modules/FIT/FIT/include/FIT/MIPCheck.h @@ -33,9 +33,7 @@ class MIPCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; private: std::shared_ptr mActivity; diff --git a/Modules/FIT/FIT/src/LevelCheck.cxx b/Modules/FIT/FIT/src/LevelCheck.cxx index e92206c276..c70b9de750 100644 --- a/Modules/FIT/FIT/src/LevelCheck.cxx +++ b/Modules/FIT/FIT/src/LevelCheck.cxx @@ -204,7 +204,7 @@ Quality LevelCheck::check(std::map>* return result; } -std::string LevelCheck::getAcceptedType() { return "TH1"; } + void LevelCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FIT/src/MIPCheck.cxx b/Modules/FIT/FIT/src/MIPCheck.cxx index 240d8563d0..9d93f72808 100644 --- a/Modules/FIT/FIT/src/MIPCheck.cxx +++ b/Modules/FIT/FIT/src/MIPCheck.cxx @@ -242,11 +242,7 @@ Quality MIPCheck::check(std::map>* m return result; } -std::string MIPCheck::getAcceptedType() -{ - // This method is a remnant of early interface prototype and will be removed in the scope of ticket QC-373 - return "TH1"; -} + void MIPCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FT0/include/FT0/CFDEffCheck.h b/Modules/FIT/FT0/include/FT0/CFDEffCheck.h index 87e9a1bac2..7c85882ef7 100644 --- a/Modules/FIT/FT0/include/FT0/CFDEffCheck.h +++ b/Modules/FIT/FT0/include/FT0/CFDEffCheck.h @@ -38,10 +38,7 @@ class CFDEffCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(CFDEffCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CFDEffCheck, 2); private: template >* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: template ::value || std::is_same::value || (std::is_integral::value && !std::is_same::value)>::type> diff --git a/Modules/FIT/FT0/include/FT0/GenericCheck.h b/Modules/FIT/FT0/include/FT0/GenericCheck.h index 932ea51ca9..2bbf78388f 100644 --- a/Modules/FIT/FT0/include/FT0/GenericCheck.h +++ b/Modules/FIT/FT0/include/FT0/GenericCheck.h @@ -102,10 +102,7 @@ class GenericCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(GenericCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(GenericCheck, 2); private: SingleCheck getCheckFromConfig(std::string); diff --git a/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h b/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h index 118f8b33e3..0f32488619 100644 --- a/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h +++ b/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h @@ -33,10 +33,7 @@ class MergedTreeCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(MergedTreeCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(MergedTreeCheck, 2); }; } // namespace o2::quality_control_modules::ft0 diff --git a/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h b/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h index 459dd6c03b..0801f53629 100644 --- a/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h +++ b/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h @@ -36,10 +36,7 @@ class OutOfBunchCollCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; ClassDefOverride(OutOfBunchCollCheck, 2); diff --git a/Modules/FIT/FT0/src/CFDEffCheck.cxx b/Modules/FIT/FT0/src/CFDEffCheck.cxx index be178837df..145816dc3d 100644 --- a/Modules/FIT/FT0/src/CFDEffCheck.cxx +++ b/Modules/FIT/FT0/src/CFDEffCheck.cxx @@ -150,7 +150,7 @@ Quality CFDEffCheck::check(std::map> return result; } -std::string CFDEffCheck::getAcceptedType() { return "TH1"; } + void CFDEffCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FT0/src/FractionCheck.cxx b/Modules/FIT/FT0/src/FractionCheck.cxx index 9f1e129951..476a4df2ec 100644 --- a/Modules/FIT/FT0/src/FractionCheck.cxx +++ b/Modules/FIT/FT0/src/FractionCheck.cxx @@ -117,7 +117,7 @@ Quality FractionCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FT0/src/GenericCheck.cxx b/Modules/FIT/FT0/src/GenericCheck.cxx index 4688dc0e27..cc42ec1dc3 100644 --- a/Modules/FIT/FT0/src/GenericCheck.cxx +++ b/Modules/FIT/FT0/src/GenericCheck.cxx @@ -187,7 +187,7 @@ Quality GenericCheck::check(std::map return result; } -std::string GenericCheck::getAcceptedType() { return "TObject"; } + void GenericCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FT0/src/MergedTreeCheck.cxx b/Modules/FIT/FT0/src/MergedTreeCheck.cxx index f7d1f132e5..42a15425a3 100644 --- a/Modules/FIT/FT0/src/MergedTreeCheck.cxx +++ b/Modules/FIT/FT0/src/MergedTreeCheck.cxx @@ -56,7 +56,7 @@ Quality MergedTreeCheck::check(std::map, Quality) { diff --git a/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx b/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx index 0ba6af50ec..8d3d42816f 100644 --- a/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx +++ b/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx @@ -128,7 +128,7 @@ Quality OutOfBunchCollCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FV0/include/FV0/CFDEffCheck.h b/Modules/FIT/FV0/include/FV0/CFDEffCheck.h index 470e90a3eb..c1f1ebb7cd 100644 --- a/Modules/FIT/FV0/include/FV0/CFDEffCheck.h +++ b/Modules/FIT/FV0/include/FV0/CFDEffCheck.h @@ -38,10 +38,7 @@ class CFDEffCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(CFDEffCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CFDEffCheck, 2); private: template >* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(GenericCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(GenericCheck, 2); private: SingleCheck getCheckFromConfig(std::string); diff --git a/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h b/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h index 853d05a5e6..524abbf116 100644 --- a/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h +++ b/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h @@ -36,10 +36,7 @@ class OutOfBunchCollCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; ClassDefOverride(OutOfBunchCollCheck, 2); diff --git a/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h b/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h index 3d35dd3150..778188ad0a 100644 --- a/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h +++ b/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h @@ -35,10 +35,7 @@ class OutOfBunchCollFeeModulesCheck : public o2::quality_control::checker::Check void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(OutOfBunchCollFeeModulesCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(OutOfBunchCollFeeModulesCheck, 2); private: float mThreshWarning; diff --git a/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h b/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h index beba45d950..70d21367f5 100644 --- a/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h +++ b/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h @@ -34,10 +34,7 @@ class TriggersSwVsTcmCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(TriggersSwVsTcmCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(TriggersSwVsTcmCheck, 2); private: std::array mPositionMsgBox; diff --git a/Modules/FIT/FV0/src/CFDEffCheck.cxx b/Modules/FIT/FV0/src/CFDEffCheck.cxx index 020f148c22..92d91c9e6c 100644 --- a/Modules/FIT/FV0/src/CFDEffCheck.cxx +++ b/Modules/FIT/FV0/src/CFDEffCheck.cxx @@ -145,7 +145,7 @@ Quality CFDEffCheck::check(std::map> return result; } -std::string CFDEffCheck::getAcceptedType() { return "TH1"; } + void CFDEffCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FV0/src/GenericCheck.cxx b/Modules/FIT/FV0/src/GenericCheck.cxx index ce9109cd8e..f0207ebd4d 100644 --- a/Modules/FIT/FV0/src/GenericCheck.cxx +++ b/Modules/FIT/FV0/src/GenericCheck.cxx @@ -265,7 +265,7 @@ Quality GenericCheck::check(std::map return result; } -std::string GenericCheck::getAcceptedType() { return "TObject"; } + void GenericCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx b/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx index 1e0ee594bb..f25722548e 100644 --- a/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx +++ b/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx @@ -130,7 +130,7 @@ Quality OutOfBunchCollCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx b/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx index 72a80f1be8..0126871d29 100644 --- a/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx +++ b/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx @@ -125,7 +125,7 @@ Quality OutOfBunchCollFeeModulesCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx b/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx index 3ba476d320..f6d0fd703c 100644 --- a/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx +++ b/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx @@ -103,7 +103,7 @@ Quality TriggersSwVsTcmCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/GLO/include/GLO/MeanVertexCheck.h b/Modules/GLO/include/GLO/MeanVertexCheck.h index 9e337a8aa5..ff4a4c63c6 100644 --- a/Modules/GLO/include/GLO/MeanVertexCheck.h +++ b/Modules/GLO/include/GLO/MeanVertexCheck.h @@ -40,10 +40,7 @@ class MeanVertexCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; ClassDefOverride(MeanVertexCheck, 1); diff --git a/Modules/GLO/src/MeanVertexCheck.cxx b/Modules/GLO/src/MeanVertexCheck.cxx index 913d1c7c42..fec4a044a8 100644 --- a/Modules/GLO/src/MeanVertexCheck.cxx +++ b/Modules/GLO/src/MeanVertexCheck.cxx @@ -166,7 +166,7 @@ Quality MeanVertexCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/HMPID/include/HMPID/HmpidRawChecks.h b/Modules/HMPID/include/HMPID/HmpidRawChecks.h index c318714c8e..db49607768 100644 --- a/Modules/HMPID/include/HMPID/HmpidRawChecks.h +++ b/Modules/HMPID/include/HMPID/HmpidRawChecks.h @@ -48,9 +48,7 @@ class HmpidRawChecks : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - // std::string getAcceptedType() override; - - private: + // private: std::array check_hHmpBigMap(TProfile2D* h); // <-- Dimensione da chiarire std::array check_hHmpHvSectorQ(TH2F* h); std::array check_hHmpPadOccPrf(TProfile* h); diff --git a/Modules/ITS/include/ITS/ITSClusterCheck.h b/Modules/ITS/include/ITS/ITSClusterCheck.h index 15767b6a88..b2a7cf7f82 100644 --- a/Modules/ITS/include/ITS/ITSClusterCheck.h +++ b/Modules/ITS/include/ITS/ITSClusterCheck.h @@ -41,10 +41,7 @@ class ITSClusterCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(ITSClusterCheck, 2); std::shared_ptr tInfoSummary; diff --git a/Modules/ITS/include/ITS/ITSFeeCheck.h b/Modules/ITS/include/ITS/ITSFeeCheck.h index 35b46a95ab..14f5249a09 100644 --- a/Modules/ITS/include/ITS/ITSFeeCheck.h +++ b/Modules/ITS/include/ITS/ITSFeeCheck.h @@ -39,10 +39,7 @@ class ITSFeeCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - bool checkReason(Quality checkResult, TString text); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; bool checkReason(Quality checkResult, TString text); private: ClassDefOverride(ITSFeeCheck, 2); diff --git a/Modules/ITS/include/ITS/ITSFhrCheck.h b/Modules/ITS/include/ITS/ITSFhrCheck.h index 38b7f70250..e667d426c0 100644 --- a/Modules/ITS/include/ITS/ITSFhrCheck.h +++ b/Modules/ITS/include/ITS/ITSFhrCheck.h @@ -38,9 +38,7 @@ class ITSFhrCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - bool checkReason(Quality checkResult, TString text); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; bool checkReason(Quality checkResult, TString text); private: int mNPixelPerStave[3] = { 4718592, 58720256, 102760448 }; // IB, ML, OL diff --git a/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h b/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h index 1bd97e027d..6e186001f9 100644 --- a/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h +++ b/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h @@ -35,10 +35,7 @@ class ITSThresholdCalibrationCheck : public o2::quality_control::checker::CheckI // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(ITSThresholdCalibrationCheck, 2); }; diff --git a/Modules/ITS/include/ITS/ITSTrackCheck.h b/Modules/ITS/include/ITS/ITSTrackCheck.h index 6cf781ea99..172ae0d4de 100644 --- a/Modules/ITS/include/ITS/ITSTrackCheck.h +++ b/Modules/ITS/include/ITS/ITSTrackCheck.h @@ -38,9 +38,7 @@ class ITSTrackCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - int getDigit(int number, int digit); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; int getDigit(int number, int digit); private: float mEtaRatio = 0.1, mPhiRatio = 0.1; diff --git a/Modules/ITS/src/ITSClusterCheck.cxx b/Modules/ITS/src/ITSClusterCheck.cxx index c5d943eb97..eb1e80eeac 100644 --- a/Modules/ITS/src/ITSClusterCheck.cxx +++ b/Modules/ITS/src/ITSClusterCheck.cxx @@ -136,7 +136,7 @@ Quality ITSClusterCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/ITS/src/ITSFeeCheck.cxx b/Modules/ITS/src/ITSFeeCheck.cxx index 53a1816b5e..889abb4b4c 100644 --- a/Modules/ITS/src/ITSFeeCheck.cxx +++ b/Modules/ITS/src/ITSFeeCheck.cxx @@ -272,7 +272,7 @@ Quality ITSFeeCheck::check(std::map> return result; } // end check -std::string ITSFeeCheck::getAcceptedType() { return "TH2I, TH2Poly"; } + void ITSFeeCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/ITS/src/ITSFhrCheck.cxx b/Modules/ITS/src/ITSFhrCheck.cxx index 612c3c76bc..dff6beb46d 100644 --- a/Modules/ITS/src/ITSFhrCheck.cxx +++ b/Modules/ITS/src/ITSFhrCheck.cxx @@ -169,7 +169,7 @@ Quality ITSFhrCheck::check(std::map> return result; } -std::string ITSFhrCheck::getAcceptedType() { return "TH1"; } + void ITSFhrCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx b/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx index b1bf57db0c..2fc2d2fd3a 100644 --- a/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx +++ b/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx @@ -31,7 +31,7 @@ Quality ITSThresholdCalibrationCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/ITS/src/ITSTrackCheck.cxx b/Modules/ITS/src/ITSTrackCheck.cxx index 7676face98..6be60aa869 100644 --- a/Modules/ITS/src/ITSTrackCheck.cxx +++ b/Modules/ITS/src/ITSTrackCheck.cxx @@ -196,7 +196,7 @@ Quality ITSTrackCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MFT/include/MFT/QcMFTClusterCheck.h b/Modules/MFT/include/MFT/QcMFTClusterCheck.h index 429428e1a8..7ac999fe1e 100644 --- a/Modules/MFT/include/MFT/QcMFTClusterCheck.h +++ b/Modules/MFT/include/MFT/QcMFTClusterCheck.h @@ -39,10 +39,7 @@ class QcMFTClusterCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: int mLadderThresholdMedium; int mLadderThresholdBad; diff --git a/Modules/MFT/include/MFT/QcMFTDigitCheck.h b/Modules/MFT/include/MFT/QcMFTDigitCheck.h index 2dbaeebfd8..783f9b03b0 100644 --- a/Modules/MFT/include/MFT/QcMFTDigitCheck.h +++ b/Modules/MFT/include/MFT/QcMFTDigitCheck.h @@ -38,10 +38,7 @@ class QcMFTDigitCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: int mLadderThresholdMedium; int mLadderThresholdBad; diff --git a/Modules/MFT/include/MFT/QcMFTReadoutCheck.h b/Modules/MFT/include/MFT/QcMFTReadoutCheck.h index 8f2c08c15d..39034573f4 100644 --- a/Modules/MFT/include/MFT/QcMFTReadoutCheck.h +++ b/Modules/MFT/include/MFT/QcMFTReadoutCheck.h @@ -41,10 +41,7 @@ class QcMFTReadoutCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: int mWarningThresholdMedium; int mWarningThresholdBad; int mErrorThresholdMedium; diff --git a/Modules/MFT/include/MFT/QcMFTTrackCheck.h b/Modules/MFT/include/MFT/QcMFTTrackCheck.h index 15ee597a8a..f08b7f4db3 100644 --- a/Modules/MFT/include/MFT/QcMFTTrackCheck.h +++ b/Modules/MFT/include/MFT/QcMFTTrackCheck.h @@ -39,10 +39,7 @@ class QcMFTTrackCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: // ROF check bool mFirstCall; int mROF; diff --git a/Modules/MFT/src/QcMFTClusterCheck.cxx b/Modules/MFT/src/QcMFTClusterCheck.cxx index 15c53a00e9..a21379bbb0 100644 --- a/Modules/MFT/src/QcMFTClusterCheck.cxx +++ b/Modules/MFT/src/QcMFTClusterCheck.cxx @@ -217,7 +217,7 @@ Quality QcMFTClusterCheck::check(std::map mo) { diff --git a/Modules/MFT/src/QcMFTDigitCheck.cxx b/Modules/MFT/src/QcMFTDigitCheck.cxx index e22a153112..7f45b927d9 100644 --- a/Modules/MFT/src/QcMFTDigitCheck.cxx +++ b/Modules/MFT/src/QcMFTDigitCheck.cxx @@ -270,7 +270,7 @@ Quality QcMFTDigitCheck::check(std::map mo) { diff --git a/Modules/MFT/src/QcMFTReadoutCheck.cxx b/Modules/MFT/src/QcMFTReadoutCheck.cxx index dc71613b34..0f67a34f3c 100644 --- a/Modules/MFT/src/QcMFTReadoutCheck.cxx +++ b/Modules/MFT/src/QcMFTReadoutCheck.cxx @@ -210,7 +210,7 @@ Quality QcMFTReadoutCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MFT/src/QcMFTTrackCheck.cxx b/Modules/MFT/src/QcMFTTrackCheck.cxx index 1f1cfa903c..a0ffc32520 100644 --- a/Modules/MFT/src/QcMFTTrackCheck.cxx +++ b/Modules/MFT/src/QcMFTTrackCheck.cxx @@ -68,7 +68,7 @@ Quality QcMFTTrackCheck::check(std::map mo) { diff --git a/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h b/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h index 38158470f9..3c1716eb09 100644 --- a/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h +++ b/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h @@ -37,10 +37,7 @@ class MatchingEfficiencyCheck : public o2::quality_control::checker::CheckInterf void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; ClassDefOverride(MatchingEfficiencyCheck, 1); diff --git a/Modules/MUON/Common/include/MUONCommon/TracksCheck.h b/Modules/MUON/Common/include/MUONCommon/TracksCheck.h index 3bd0f98ad1..45d8cd8194 100644 --- a/Modules/MUON/Common/include/MUONCommon/TracksCheck.h +++ b/Modules/MUON/Common/include/MUONCommon/TracksCheck.h @@ -38,10 +38,7 @@ class TracksCheck : public o2::quality_control::checker::CheckInterface void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: std::unordered_map mQualities; int mMinTracksPerTF{ 50 }; int mMaxTracksPerTF{ 500 }; diff --git a/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx b/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx index 7df4bb2f69..d53d41918b 100644 --- a/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx +++ b/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx @@ -166,7 +166,7 @@ Quality MatchingEfficiencyCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MUON/Common/src/TracksCheck.cxx b/Modules/MUON/Common/src/TracksCheck.cxx index d63d96c446..8cd2531eb5 100644 --- a/Modules/MUON/Common/src/TracksCheck.cxx +++ b/Modules/MUON/Common/src/TracksCheck.cxx @@ -161,7 +161,7 @@ Quality TracksCheck::check(std::map> return result; } -std::string TracksCheck::getAcceptedType() { return "TH1"; } + static void updateTitle(TH1* hist, std::string suffix) { diff --git a/Modules/MUON/MCH/include/MCH/ClustersCheck.h b/Modules/MUON/MCH/include/MCH/ClustersCheck.h index 83a8f4a720..f6e6ea2fcf 100644 --- a/Modules/MUON/MCH/include/MCH/ClustersCheck.h +++ b/Modules/MUON/MCH/include/MCH/ClustersCheck.h @@ -44,10 +44,7 @@ class ClustersCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: /// quality flag associated to each input plot std::unordered_map mQualities; /// acceptable limits for the average number of clusters associated tracks diff --git a/Modules/MUON/MCH/include/MCH/DecodingCheck.h b/Modules/MUON/MCH/include/MCH/DecodingCheck.h index c317743189..01f1d5aaa5 100644 --- a/Modules/MUON/MCH/include/MCH/DecodingCheck.h +++ b/Modules/MUON/MCH/include/MCH/DecodingCheck.h @@ -43,10 +43,7 @@ class DecodingCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: std::string mGoodFracHistName{ "DecodingErrors/GoodBoardsFractionPerDE" }; std::string mGoodFracPerSolarHistName{ "DecodingErrors/GoodBoardsFractionPerSolar" }; std::string mSyncFracHistName{ "SyncErrors/SyncedBoardsFractionPerDE" }; diff --git a/Modules/MUON/MCH/include/MCH/DigitsCheck.h b/Modules/MUON/MCH/include/MCH/DigitsCheck.h index 4fbad5487b..f6d272289e 100644 --- a/Modules/MUON/MCH/include/MCH/DigitsCheck.h +++ b/Modules/MUON/MCH/include/MCH/DigitsCheck.h @@ -46,10 +46,7 @@ class DigitsCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: std::array checkMeanRates(TH1* h); std::array checkBadChannels(TH1* h); std::array checkMeanRateRatios(TH1* h); diff --git a/Modules/MUON/MCH/include/MCH/PedestalsCheck.h b/Modules/MUON/MCH/include/MCH/PedestalsCheck.h index def73d8a73..bb19476264 100644 --- a/Modules/MUON/MCH/include/MCH/PedestalsCheck.h +++ b/Modules/MUON/MCH/include/MCH/PedestalsCheck.h @@ -35,10 +35,7 @@ class PedestalsCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: /// Maximum number of bad detection elements for "good" quality status int mMaxBadST12{ 1 }; int mMaxBadST345{ 3 }; diff --git a/Modules/MUON/MCH/include/MCH/PreclustersCheck.h b/Modules/MUON/MCH/include/MCH/PreclustersCheck.h index 401e58e871..54ae1809ef 100644 --- a/Modules/MUON/MCH/include/MCH/PreclustersCheck.h +++ b/Modules/MUON/MCH/include/MCH/PreclustersCheck.h @@ -44,10 +44,7 @@ class PreclustersCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: std::array checkMeanEfficiencies(TH1* h); std::array checkMeanEfficiencyRatios(TH1* h); void checkSolarMeanEfficiencies(TH1* h); diff --git a/Modules/MUON/MCH/src/ClustersCheck.cxx b/Modules/MUON/MCH/src/ClustersCheck.cxx index ea698c7eb7..3bd5645fa1 100644 --- a/Modules/MUON/MCH/src/ClustersCheck.cxx +++ b/Modules/MUON/MCH/src/ClustersCheck.cxx @@ -130,7 +130,7 @@ Quality ClustersCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MUON/MCH/src/DigitsCheck.cxx b/Modules/MUON/MCH/src/DigitsCheck.cxx index e1a0f3b646..ee89a18662 100644 --- a/Modules/MUON/MCH/src/DigitsCheck.cxx +++ b/Modules/MUON/MCH/src/DigitsCheck.cxx @@ -322,7 +322,7 @@ Quality DigitsCheck::check(std::map> return mQualityChecker.getQuality(); } -std::string DigitsCheck::getAcceptedType() { return "TH1"; } + static void updateTitle(TH1* hist, std::string suffix) { diff --git a/Modules/MUON/MCH/src/PedestalsCheck.cxx b/Modules/MUON/MCH/src/PedestalsCheck.cxx index 7d50ac6c9c..105d58fcef 100644 --- a/Modules/MUON/MCH/src/PedestalsCheck.cxx +++ b/Modules/MUON/MCH/src/PedestalsCheck.cxx @@ -223,7 +223,7 @@ Quality PedestalsCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MUON/MID/include/MID/CalibMQcCheck.h b/Modules/MUON/MID/include/MID/CalibMQcCheck.h index 1806733258..24dfa4fe3a 100644 --- a/Modules/MUON/MID/include/MID/CalibMQcCheck.h +++ b/Modules/MUON/MID/include/MID/CalibMQcCheck.h @@ -34,10 +34,7 @@ class CalibMQcCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: HistoHelper mHistoHelper; ///! Histogram helper ClassDefOverride(CalibMQcCheck, 3); }; diff --git a/Modules/MUON/MID/include/MID/CalibQcCheck.h b/Modules/MUON/MID/include/MID/CalibQcCheck.h index ea8322fa99..a693ad0e34 100644 --- a/Modules/MUON/MID/include/MID/CalibQcCheck.h +++ b/Modules/MUON/MID/include/MID/CalibQcCheck.h @@ -35,10 +35,7 @@ class CalibQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: float mDeadRof = 0; HistoHelper mHistoHelper; ///! Histogram helper diff --git a/Modules/MUON/MID/include/MID/ClustQcCheck.h b/Modules/MUON/MID/include/MID/ClustQcCheck.h index 527d8e737a..7ae8c1ff13 100644 --- a/Modules/MUON/MID/include/MID/ClustQcCheck.h +++ b/Modules/MUON/MID/include/MID/ClustQcCheck.h @@ -33,10 +33,7 @@ class ClustQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: float mClusterTF = 0; int mOrbTF = 32; // float scaleTime = 0.0114048; // 128 orb/TF * 3564 BC/orb * 25ns diff --git a/Modules/MUON/MID/include/MID/DigitsQcCheck.h b/Modules/MUON/MID/include/MID/DigitsQcCheck.h index 631b441e8a..2da3ee666d 100644 --- a/Modules/MUON/MID/include/MID/DigitsQcCheck.h +++ b/Modules/MUON/MID/include/MID/DigitsQcCheck.h @@ -39,10 +39,7 @@ class DigitsQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: double mMeanMultThreshold = 10.; ///! Upper threshold on mean multiplicity double mMinMultThreshold = 0.001; ///! Lower threshold on mean multiplicity double mLocalBoardScale = 100.; ///! Local board scale in kHz diff --git a/Modules/MUON/MID/include/MID/RawQcCheck.h b/Modules/MUON/MID/include/MID/RawQcCheck.h index 897f9cd1de..316d2c119c 100644 --- a/Modules/MUON/MID/include/MID/RawQcCheck.h +++ b/Modules/MUON/MID/include/MID/RawQcCheck.h @@ -34,10 +34,7 @@ class RawQcCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(RawQcCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(RawQcCheck, 2); }; } // namespace o2::quality_control_modules::mid diff --git a/Modules/MUON/MID/include/MID/TracksQcCheck.h b/Modules/MUON/MID/include/MID/TracksQcCheck.h index 61fd21cd83..d45b731cb8 100644 --- a/Modules/MUON/MID/include/MID/TracksQcCheck.h +++ b/Modules/MUON/MID/include/MID/TracksQcCheck.h @@ -35,10 +35,7 @@ class TracksQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: double mRatio44Threshold; float mTracksTF = 0; int mOrbTF = 32; diff --git a/Modules/MUON/MID/src/CalibMQcCheck.cxx b/Modules/MUON/MID/src/CalibMQcCheck.cxx index 3f7200d185..da675018b0 100644 --- a/Modules/MUON/MID/src/CalibMQcCheck.cxx +++ b/Modules/MUON/MID/src/CalibMQcCheck.cxx @@ -45,7 +45,7 @@ Quality CalibMQcCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MUON/MID/src/CalibQcCheck.cxx b/Modules/MUON/MID/src/CalibQcCheck.cxx index 459fb4cc2b..d045d94496 100644 --- a/Modules/MUON/MID/src/CalibQcCheck.cxx +++ b/Modules/MUON/MID/src/CalibQcCheck.cxx @@ -56,7 +56,7 @@ Quality CalibQcCheck::check(std::map return result; } -std::string CalibQcCheck::getAcceptedType() { return "TH1"; } + void CalibQcCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/MUON/MID/src/ClustQcCheck.cxx b/Modules/MUON/MID/src/ClustQcCheck.cxx index e6b5449413..e682947fc8 100644 --- a/Modules/MUON/MID/src/ClustQcCheck.cxx +++ b/Modules/MUON/MID/src/ClustQcCheck.cxx @@ -79,7 +79,7 @@ Quality ClustQcCheck::check(std::map return result; } -std::string ClustQcCheck::getAcceptedType() { return "TH1"; } + static void updateTitle(TH1* hist, std::string suffix) { diff --git a/Modules/MUON/MID/src/DigitsQcCheck.cxx b/Modules/MUON/MID/src/DigitsQcCheck.cxx index 577da2b873..16e915ac38 100644 --- a/Modules/MUON/MID/src/DigitsQcCheck.cxx +++ b/Modules/MUON/MID/src/DigitsQcCheck.cxx @@ -220,7 +220,7 @@ Quality DigitsQcCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MUON/MID/src/RawQcCheck.cxx b/Modules/MUON/MID/src/RawQcCheck.cxx index 03a01a733d..653e5c1167 100644 --- a/Modules/MUON/MID/src/RawQcCheck.cxx +++ b/Modules/MUON/MID/src/RawQcCheck.cxx @@ -72,7 +72,7 @@ Quality RawQcCheck::check(std::map>* return result; } -std::string RawQcCheck::getAcceptedType() { return "TH1"; } + void RawQcCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/MUON/MID/src/TracksQcCheck.cxx b/Modules/MUON/MID/src/TracksQcCheck.cxx index baee8bbb2f..38bd4bd0f6 100644 --- a/Modules/MUON/MID/src/TracksQcCheck.cxx +++ b/Modules/MUON/MID/src/TracksQcCheck.cxx @@ -105,7 +105,7 @@ Quality TracksQcCheck::check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - protected: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; protected: int mDeadThreshold[5] = { 10, 10, 10, 10, 10 }; /// Number of new dead channels per module to decalre bad int mNoisyThreshold[5] = { 2, 2, 2, 2, 2 }; /// Number of new noisy channels per module to send warning int mMaxOccupancyCut[5] = { 10, 10, 10, 10, 10 }; /// occupancy in noisy channel wrt mean over module diff --git a/Modules/PHOS/include/PHOS/RawCheck.h b/Modules/PHOS/include/PHOS/RawCheck.h index 57f265c98f..b339c1e39c 100644 --- a/Modules/PHOS/include/PHOS/RawCheck.h +++ b/Modules/PHOS/include/PHOS/RawCheck.h @@ -41,10 +41,7 @@ class RawCheck final : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override {} - std::string getAcceptedType() override; - - protected: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override {} protected: bool checkErrHistograms(MonitorObject* mo); bool checkPhysicsHistograms(MonitorObject* mo); bool checkPedestalHistograms(MonitorObject* mo); diff --git a/Modules/PHOS/src/ClusterCheck.cxx b/Modules/PHOS/src/ClusterCheck.cxx index 96d4739727..5d603d869c 100644 --- a/Modules/PHOS/src/ClusterCheck.cxx +++ b/Modules/PHOS/src/ClusterCheck.cxx @@ -257,7 +257,7 @@ Quality ClusterCheck::check(std::map return result; } // namespace o2::quality_control_modules::phos -std::string ClusterCheck::getAcceptedType() { return "TH1"; } + void ClusterCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/PHOS/src/RawCheck.cxx b/Modules/PHOS/src/RawCheck.cxx index 8082596cad..da2c02a874 100644 --- a/Modules/PHOS/src/RawCheck.cxx +++ b/Modules/PHOS/src/RawCheck.cxx @@ -146,7 +146,7 @@ Quality RawCheck::check(std::map>* m return mCheckResult; } -std::string RawCheck::getAcceptedType() { return "TH1"; } + bool RawCheck::checkErrHistograms(MonitorObject* mo) { diff --git a/Modules/Skeleton/include/Skeleton/SkeletonCheck.h b/Modules/Skeleton/include/Skeleton/SkeletonCheck.h index 691b82776d..dd1c114867 100644 --- a/Modules/Skeleton/include/Skeleton/SkeletonCheck.h +++ b/Modules/Skeleton/include/Skeleton/SkeletonCheck.h @@ -35,9 +35,7 @@ class SkeletonCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/Skeleton/src/SkeletonCheck.cxx b/Modules/Skeleton/src/SkeletonCheck.cxx index 8f1f1cbf99..7374f9665e 100644 --- a/Modules/Skeleton/src/SkeletonCheck.cxx +++ b/Modules/Skeleton/src/SkeletonCheck.cxx @@ -81,11 +81,7 @@ Quality SkeletonCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/TOF/include/TOF/CheckCompressedData.h b/Modules/TOF/include/TOF/CheckCompressedData.h index 9a40d51d8e..21871def49 100644 --- a/Modules/TOF/include/TOF/CheckCompressedData.h +++ b/Modules/TOF/include/TOF/CheckCompressedData.h @@ -38,10 +38,7 @@ class CheckCompressedData : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: float mDiagnosticThresholdPerSlot = 0; /// Messages to print on the output PAD diff --git a/Modules/TOF/include/TOF/CheckDRMDiagnostics.h b/Modules/TOF/include/TOF/CheckDRMDiagnostics.h index 01da723100..71c5ecf467 100644 --- a/Modules/TOF/include/TOF/CheckDRMDiagnostics.h +++ b/Modules/TOF/include/TOF/CheckDRMDiagnostics.h @@ -38,10 +38,7 @@ class CheckDRMDiagnostics : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: /// Messages to print on the output PAD MessagePad mShifterMessages; diff --git a/Modules/TOF/include/TOF/CheckDiagnostics.h b/Modules/TOF/include/TOF/CheckDiagnostics.h index 7f1acf9ab2..2268177516 100644 --- a/Modules/TOF/include/TOF/CheckDiagnostics.h +++ b/Modules/TOF/include/TOF/CheckDiagnostics.h @@ -38,10 +38,7 @@ class CheckDiagnostics : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: /// Messages to print on the output PAD MessagePad mShifterMessages; diff --git a/Modules/TOF/include/TOF/CheckHitMap.h b/Modules/TOF/include/TOF/CheckHitMap.h index ce7273b7d9..68e6ce298e 100644 --- a/Modules/TOF/include/TOF/CheckHitMap.h +++ b/Modules/TOF/include/TOF/CheckHitMap.h @@ -37,7 +37,7 @@ class CheckHitMap : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override { return "TH2F"; } + private: /// Reference hit map taken from the CCDB and translated into QC binning diff --git a/Modules/TOF/include/TOF/CheckLostOrbits.h b/Modules/TOF/include/TOF/CheckLostOrbits.h index 26122caaeb..6f37bf46ea 100644 --- a/Modules/TOF/include/TOF/CheckLostOrbits.h +++ b/Modules/TOF/include/TOF/CheckLostOrbits.h @@ -35,10 +35,7 @@ class CheckLostOrbits : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: MessagePad mShifterMessages{ "", 0.15, 0.65, 0.4, 0.85 }; /// To select to check link inefficiencies (if recovery does not work) double mFractionThr = 0.9; diff --git a/Modules/TOF/include/TOF/CheckNoise.h b/Modules/TOF/include/TOF/CheckNoise.h index b1326a3f1b..4d0ebd1cd3 100644 --- a/Modules/TOF/include/TOF/CheckNoise.h +++ b/Modules/TOF/include/TOF/CheckNoise.h @@ -37,7 +37,7 @@ class CheckNoise : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override { return "TH1F"; } + private: /// Messages to print on the output PAD diff --git a/Modules/TOF/include/TOF/CheckRaw.h b/Modules/TOF/include/TOF/CheckRaw.h index 0471b84577..e65d0096c2 100644 --- a/Modules/TOF/include/TOF/CheckRaw.h +++ b/Modules/TOF/include/TOF/CheckRaw.h @@ -38,10 +38,7 @@ class CheckRaw : public o2::quality_control::checker::CheckInterface // Override interface void configure(std::string name) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: float mDiagnosticThresholdPerSlot = 0; ClassDefOverride(CheckRaw, 1); diff --git a/Modules/TOF/include/TOF/CheckRawMultiplicity.h b/Modules/TOF/include/TOF/CheckRawMultiplicity.h index 02ad71d1f9..264af8929f 100644 --- a/Modules/TOF/include/TOF/CheckRawMultiplicity.h +++ b/Modules/TOF/include/TOF/CheckRawMultiplicity.h @@ -36,7 +36,7 @@ class CheckRawMultiplicity : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override { return "TH1I"; } + /// Running modes available static constexpr int kModeCollisions = 0; /// Standard running mode with collisions diff --git a/Modules/TOF/include/TOF/CheckRawTime.h b/Modules/TOF/include/TOF/CheckRawTime.h index a08b4c48d4..53d235eaa4 100644 --- a/Modules/TOF/include/TOF/CheckRawTime.h +++ b/Modules/TOF/include/TOF/CheckRawTime.h @@ -36,7 +36,7 @@ class CheckRawTime : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override { return "TH1F"; } + private: // Running configurable parameters diff --git a/Modules/TOF/include/TOF/CheckRawToT.h b/Modules/TOF/include/TOF/CheckRawToT.h index cf566ea795..2838aaa52d 100644 --- a/Modules/TOF/include/TOF/CheckRawToT.h +++ b/Modules/TOF/include/TOF/CheckRawToT.h @@ -36,7 +36,7 @@ class CheckRawToT : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override { return "TH1F"; } + private: // Running configurable parameters diff --git a/Modules/TOF/include/TOF/CheckSlotPartMask.h b/Modules/TOF/include/TOF/CheckSlotPartMask.h index 4ec05dc58d..d4aa8dc2e3 100644 --- a/Modules/TOF/include/TOF/CheckSlotPartMask.h +++ b/Modules/TOF/include/TOF/CheckSlotPartMask.h @@ -35,10 +35,7 @@ class CheckSlotPartMask : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult) override; private: // Threshold number of crates missing int mNCrates = 36; // Threshold number of inefficient links diff --git a/Modules/TOF/src/CheckCompressedData.cxx b/Modules/TOF/src/CheckCompressedData.cxx index 0a372e74c4..8604300fee 100644 --- a/Modules/TOF/src/CheckCompressedData.cxx +++ b/Modules/TOF/src/CheckCompressedData.cxx @@ -60,7 +60,7 @@ Quality CheckCompressedData::check(std::map mo, Quality checkResult) { diff --git a/Modules/TOF/src/CheckDRMDiagnostics.cxx b/Modules/TOF/src/CheckDRMDiagnostics.cxx index 26df9fed00..32aa6902f7 100644 --- a/Modules/TOF/src/CheckDRMDiagnostics.cxx +++ b/Modules/TOF/src/CheckDRMDiagnostics.cxx @@ -62,7 +62,7 @@ Quality CheckDRMDiagnostics::check(std::map mo, Quality checkResult) { diff --git a/Modules/TOF/src/CheckDiagnostics.cxx b/Modules/TOF/src/CheckDiagnostics.cxx index 92671e6d5b..ba9b4c6155 100644 --- a/Modules/TOF/src/CheckDiagnostics.cxx +++ b/Modules/TOF/src/CheckDiagnostics.cxx @@ -50,7 +50,7 @@ Quality CheckDiagnostics::check(std::map mo, Quality checkResult) { diff --git a/Modules/TOF/src/CheckHitMap.cxx b/Modules/TOF/src/CheckHitMap.cxx index ee3feaac35..f2a34a62c5 100644 --- a/Modules/TOF/src/CheckHitMap.cxx +++ b/Modules/TOF/src/CheckHitMap.cxx @@ -48,12 +48,7 @@ Quality CheckHitMap::check(std::map> Quality result = Quality::Null; - for (auto& [moName, mo] : *moMap) { - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << getAcceptedType() << ENDM; - continue; - } - ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; const auto* h = static_cast(mo->getObject()); if (h->GetEntries() == 0) { // Histogram is empty result = Quality::Medium; @@ -131,12 +126,7 @@ Quality CheckHitMap::check(std::map> void CheckHitMap::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << getAcceptedType() << ENDM; - return; - } - if (1) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (1) { auto* h = static_cast(mo->getObject()); if (checkResult != Quality::Good) { auto msg = mShifterMessages.MakeMessagePad(h, checkResult); diff --git a/Modules/TOF/src/CheckLostOrbits.cxx b/Modules/TOF/src/CheckLostOrbits.cxx index bb730cc9ed..48866871b3 100644 --- a/Modules/TOF/src/CheckLostOrbits.cxx +++ b/Modules/TOF/src/CheckLostOrbits.cxx @@ -55,7 +55,7 @@ Quality CheckLostOrbits::check(std::map mo, Quality checkResult) { diff --git a/Modules/TOF/src/CheckNoise.cxx b/Modules/TOF/src/CheckNoise.cxx index 7dd7405354..3e98aec181 100644 --- a/Modules/TOF/src/CheckNoise.cxx +++ b/Modules/TOF/src/CheckNoise.cxx @@ -35,12 +35,7 @@ Quality CheckNoise::check(std::map>* Quality result = Quality::Null; - for (auto& [moName, mo] : *moMap) { - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << getAcceptedType() << ENDM; - continue; - } - if (mo->getName() != mAcceptedName) { + for (auto& [moName, mo] : *moMap) {if (mo->getName() != mAcceptedName) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which does not have name " << mAcceptedName << ENDM; continue; } @@ -64,12 +59,7 @@ Quality CheckNoise::check(std::map>* void CheckNoise::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << getAcceptedType() << ENDM; - return; - } - if (mo->getName() == mAcceptedName) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName() == mAcceptedName) { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { diff --git a/Modules/TOF/src/CheckRaw.cxx b/Modules/TOF/src/CheckRaw.cxx index 16c988da10..de1d6394f5 100644 --- a/Modules/TOF/src/CheckRaw.cxx +++ b/Modules/TOF/src/CheckRaw.cxx @@ -73,7 +73,7 @@ Quality CheckRaw::check(std::map>* m return result; } -std::string CheckRaw::getAcceptedType() { return "TH2F"; } + void CheckRaw::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/TOF/src/CheckRawMultiplicity.cxx b/Modules/TOF/src/CheckRawMultiplicity.cxx index 26858016fc..fddfa1b805 100644 --- a/Modules/TOF/src/CheckRawMultiplicity.cxx +++ b/Modules/TOF/src/CheckRawMultiplicity.cxx @@ -66,12 +66,7 @@ Quality CheckRawMultiplicity::check(std::map 0 float hitsIntegral = 0.f; - for (auto& [moName, mo] : *moMap) { - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << getAcceptedType() << ENDM; - continue; - } - ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName() == "Multiplicity/Integrated") { const auto* h = static_cast(mo->getObject()); if (h->GetEntries() == 0) { // Histogram is empty @@ -154,12 +149,7 @@ Quality CheckRawMultiplicity::check(std::map mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << getAcceptedType() << ENDM; - return; - } - if (mo->getName() == "Multiplicity/Integrated") { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName() == "Multiplicity/Integrated") { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { diff --git a/Modules/TOF/src/CheckRawTime.cxx b/Modules/TOF/src/CheckRawTime.cxx index b96e9a8cd0..6de4d07e63 100644 --- a/Modules/TOF/src/CheckRawTime.cxx +++ b/Modules/TOF/src/CheckRawTime.cxx @@ -43,12 +43,7 @@ Quality CheckRawTime::check(std::map Quality result = Quality::Null; - for (auto& [moName, mo] : *moMap) { - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << getAcceptedType() << ENDM; - continue; - } - ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName().find("Time/") != std::string::npos) { auto* h = static_cast(mo->getObject()); @@ -85,12 +80,7 @@ Quality CheckRawTime::check(std::map void CheckRawTime::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << getAcceptedType() << ENDM; - return; - } - if (mo->getName().find("Time/") != std::string::npos) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName().find("Time/") != std::string::npos) { auto* h = static_cast(mo->getObject()); if (h->GetEntries() < mMinEntriesBeforeMessage) { // Checking that the histogram has enough entries before printing messages return; diff --git a/Modules/TOF/src/CheckRawToT.cxx b/Modules/TOF/src/CheckRawToT.cxx index 5a57ca1579..76bd7630a2 100644 --- a/Modules/TOF/src/CheckRawToT.cxx +++ b/Modules/TOF/src/CheckRawToT.cxx @@ -50,12 +50,7 @@ Quality CheckRawToT::check(std::map> /// Number of events with ToT > 0 (excluding orphans) float ToTIntegral = 0.f; - for (auto& [moName, mo] : *moMap) { - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << getAcceptedType() << ENDM; - continue; - } - ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName().find("ToT/") != std::string::npos) { auto* h = static_cast(mo->getObject()); @@ -95,12 +90,7 @@ Quality CheckRawToT::check(std::map> void CheckRawToT::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!isObjectCheckable(mo)) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << getAcceptedType() << ENDM; - return; - } - if (mo->getName().find("ToT/") != std::string::npos) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName().find("ToT/") != std::string::npos) { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { diff --git a/Modules/TOF/src/CheckSlotPartMask.cxx b/Modules/TOF/src/CheckSlotPartMask.cxx index ba8aa325fc..d5181d5179 100644 --- a/Modules/TOF/src/CheckSlotPartMask.cxx +++ b/Modules/TOF/src/CheckSlotPartMask.cxx @@ -89,7 +89,7 @@ Quality CheckSlotPartMask::check(std::map mo, Quality checkResult) { diff --git a/Modules/TPC/include/TPC/CheckForEmptyPads.h b/Modules/TPC/include/TPC/CheckForEmptyPads.h index a52b4eeb57..219fefe9e0 100644 --- a/Modules/TPC/include/TPC/CheckForEmptyPads.h +++ b/Modules/TPC/include/TPC/CheckForEmptyPads.h @@ -36,10 +36,7 @@ class CheckForEmptyPads : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(CheckForEmptyPads, 1); std::string summarizeMetaData(Quality quality); std::vector mSectorsName; diff --git a/Modules/TPC/include/TPC/CheckOfPads.h b/Modules/TPC/include/TPC/CheckOfPads.h index 2457485e07..28f7a64585 100644 --- a/Modules/TPC/include/TPC/CheckOfPads.h +++ b/Modules/TPC/include/TPC/CheckOfPads.h @@ -36,10 +36,7 @@ class CheckOfPads : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(CheckOfPads, 1); static constexpr std::string_view CheckChoiceMean = "Mean"; static constexpr std::string_view CheckChoiceExpectedValue = "ExpectedValue"; diff --git a/Modules/TPC/include/TPC/CheckOfSlices.h b/Modules/TPC/include/TPC/CheckOfSlices.h index ab16896c08..b936d9b2db 100644 --- a/Modules/TPC/include/TPC/CheckOfSlices.h +++ b/Modules/TPC/include/TPC/CheckOfSlices.h @@ -41,7 +41,7 @@ class CheckOfSlices : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override { return "TCanvas"; } + private: ClassDefOverride(CheckOfSlices, 3); diff --git a/Modules/TPC/include/TPC/CheckOfTrendings.h b/Modules/TPC/include/TPC/CheckOfTrendings.h index c38d4427ad..cea6d628f0 100644 --- a/Modules/TPC/include/TPC/CheckOfTrendings.h +++ b/Modules/TPC/include/TPC/CheckOfTrendings.h @@ -41,10 +41,7 @@ class CheckOfTrendings : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(CheckOfTrendings, 2); void getGraphs(TCanvas* canv, std::vector& graphs, const std::string moName); std::string createMetaData(const std::vector& pointMetaData); diff --git a/Modules/TPC/include/TPC/GenericHistogramCheck.h b/Modules/TPC/include/TPC/GenericHistogramCheck.h index 697ced05f8..df6168cde0 100644 --- a/Modules/TPC/include/TPC/GenericHistogramCheck.h +++ b/Modules/TPC/include/TPC/GenericHistogramCheck.h @@ -35,10 +35,7 @@ class GenericHistogramCheck : public o2::quality_control::checker::CheckInterfac // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(GenericHistogramCheck, 2); std::string mAxisName; float mMeanX = 0; diff --git a/Modules/TPC/include/TPC/PadCalibrationCheck.h b/Modules/TPC/include/TPC/PadCalibrationCheck.h index 8254f4efd8..a43ca5c6f3 100644 --- a/Modules/TPC/include/TPC/PadCalibrationCheck.h +++ b/Modules/TPC/include/TPC/PadCalibrationCheck.h @@ -36,10 +36,7 @@ class PadCalibrationCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: ClassDefOverride(PadCalibrationCheck, 2); std::vector mSectorsName; std::vector mSectorsQuality; diff --git a/Modules/TPC/src/CheckForEmptyPads.cxx b/Modules/TPC/src/CheckForEmptyPads.cxx index d8fb001ce7..cddd3cd6fd 100644 --- a/Modules/TPC/src/CheckForEmptyPads.cxx +++ b/Modules/TPC/src/CheckForEmptyPads.cxx @@ -220,10 +220,7 @@ std::string CheckForEmptyPads::summarizeMetaData(Quality quality) } //______________________________________________________________________________ -std::string CheckForEmptyPads::getAcceptedType() -{ - return "TCanvas"; -} + //______________________________________________________________________________ void CheckForEmptyPads::beautify(std::shared_ptr mo, Quality) diff --git a/Modules/TPC/src/CheckOfPads.cxx b/Modules/TPC/src/CheckOfPads.cxx index 75d41d2320..0b4f00e38d 100644 --- a/Modules/TPC/src/CheckOfPads.cxx +++ b/Modules/TPC/src/CheckOfPads.cxx @@ -254,7 +254,7 @@ Quality CheckOfPads::check(std::map> } // end of loop over moMap //______________________________________________________________________________ -std::string CheckOfPads::getAcceptedType() { return "TCanvas"; } + //______________________________________________________________________________ void CheckOfPads::beautify(std::shared_ptr mo, Quality) diff --git a/Modules/TPC/src/CheckOfTrendings.cxx b/Modules/TPC/src/CheckOfTrendings.cxx index 6cb6e4c6f2..6509db099d 100644 --- a/Modules/TPC/src/CheckOfTrendings.cxx +++ b/Modules/TPC/src/CheckOfTrendings.cxx @@ -379,7 +379,7 @@ Quality CheckOfTrendings::check(std::map mo, Quality checkResult) { diff --git a/Modules/TPC/src/GenericHistogramCheck.cxx b/Modules/TPC/src/GenericHistogramCheck.cxx index ce8bdcaea7..9a63270509 100644 --- a/Modules/TPC/src/GenericHistogramCheck.cxx +++ b/Modules/TPC/src/GenericHistogramCheck.cxx @@ -238,7 +238,7 @@ Quality GenericHistogramCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/TPC/src/PadCalibrationCheck.cxx b/Modules/TPC/src/PadCalibrationCheck.cxx index cad34a9059..b9cabc6fad 100644 --- a/Modules/TPC/src/PadCalibrationCheck.cxx +++ b/Modules/TPC/src/PadCalibrationCheck.cxx @@ -122,7 +122,7 @@ Quality PadCalibrationCheck::check(std::map mo, Quality) diff --git a/Modules/TRD/include/TRD/PulseHeightCheck.h b/Modules/TRD/include/TRD/PulseHeightCheck.h index d2b2ecc2f9..7609d9764a 100644 --- a/Modules/TRD/include/TRD/PulseHeightCheck.h +++ b/Modules/TRD/include/TRD/PulseHeightCheck.h @@ -36,9 +36,7 @@ class PulseHeightCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - std::pair mDriftRegion; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; std::pair mDriftRegion; std::pair mPulseHeightPeakRegion; unsigned int mPulseHeightMinSum; float mPulseHeightRatio; diff --git a/Modules/TRD/include/TRD/PulsePositionCheck.h b/Modules/TRD/include/TRD/PulsePositionCheck.h index 2d4aa189cf..c7f539058b 100644 --- a/Modules/TRD/include/TRD/PulsePositionCheck.h +++ b/Modules/TRD/include/TRD/PulsePositionCheck.h @@ -35,9 +35,7 @@ class PulsePositionCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - std::pair mPulseHeightPeakRegion; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; std::pair mPulseHeightPeakRegion; double chi2byNDF_threshold; double FitParam0; double FitParam1; diff --git a/Modules/TRD/include/TRD/RawDataCheck.h b/Modules/TRD/include/TRD/RawDataCheck.h index 448b095f0a..d941bf7b34 100644 --- a/Modules/TRD/include/TRD/RawDataCheck.h +++ b/Modules/TRD/include/TRD/RawDataCheck.h @@ -37,9 +37,7 @@ class RawDataCheckStats : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; @@ -65,9 +63,7 @@ class RawDataCheckSizes : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/TRD/include/TRD/TrackletCountCheck.h b/Modules/TRD/include/TRD/TrackletCountCheck.h index d483de51db..13f5ba09b8 100644 --- a/Modules/TRD/include/TRD/TrackletCountCheck.h +++ b/Modules/TRD/include/TRD/TrackletCountCheck.h @@ -34,9 +34,7 @@ class TrackletCountCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/TRD/src/PulseHeightCheck.cxx b/Modules/TRD/src/PulseHeightCheck.cxx index 8d95d95c9e..ce58d6c05d 100644 --- a/Modules/TRD/src/PulseHeightCheck.cxx +++ b/Modules/TRD/src/PulseHeightCheck.cxx @@ -145,7 +145,7 @@ Quality PulseHeightCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/TRD/src/PulsePositionCheck.cxx b/Modules/TRD/src/PulsePositionCheck.cxx index 4787d1276d..abf7513115 100644 --- a/Modules/TRD/src/PulsePositionCheck.cxx +++ b/Modules/TRD/src/PulsePositionCheck.cxx @@ -207,7 +207,7 @@ Quality PulsePositionCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/TRD/src/RawDataCheck.cxx b/Modules/TRD/src/RawDataCheck.cxx index f818456530..ca8f3b8c04 100644 --- a/Modules/TRD/src/RawDataCheck.cxx +++ b/Modules/TRD/src/RawDataCheck.cxx @@ -130,10 +130,7 @@ void RawDataCheckStats::beautify(std::shared_ptr mo, Quality chec } } -std::string RawDataCheckStats::getAcceptedType() -{ - return "TH1"; -} + void RawDataCheckStats::reset() { @@ -209,10 +206,7 @@ void RawDataCheckSizes::beautify(std::shared_ptr mo, Quality chec } } -std::string RawDataCheckSizes::getAcceptedType() -{ - return "TH2"; -} + void RawDataCheckSizes::reset() { diff --git a/Modules/TRD/src/TrackletCountCheck.cxx b/Modules/TRD/src/TrackletCountCheck.cxx index 4359eec9b2..538e73377e 100644 --- a/Modules/TRD/src/TrackletCountCheck.cxx +++ b/Modules/TRD/src/TrackletCountCheck.cxx @@ -151,7 +151,7 @@ Quality TrackletCountCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h b/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h index d416c2fa5c..cbd4914e05 100644 --- a/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h +++ b/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h @@ -35,10 +35,7 @@ class ZDCRawDataCheck : public o2::quality_control::checker::CheckInterface ~ZDCRawDataCheck() override = default; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(ZDCRawDataCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(ZDCRawDataCheck, 2); struct sCheck { std::string ch; float minW; diff --git a/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h b/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h index cc4483ad8c..1b36a5f6a0 100644 --- a/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h +++ b/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h @@ -35,9 +35,7 @@ class ZDCRecBeautifyPlots : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h b/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h index 7d9e964633..b12fd52025 100644 --- a/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h +++ b/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h @@ -35,10 +35,7 @@ class ZDCRecDataCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - std::string getAcceptedType() override; - - ClassDefOverride(ZDCRecDataCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(ZDCRecDataCheck, 2); struct sCheck { std::string ch; diff --git a/Modules/ZDC/src/ZDCRawDataCheck.cxx b/Modules/ZDC/src/ZDCRawDataCheck.cxx index db3cc36fb1..66d1a02b6d 100644 --- a/Modules/ZDC/src/ZDCRawDataCheck.cxx +++ b/Modules/ZDC/src/ZDCRawDataCheck.cxx @@ -222,7 +222,7 @@ Quality ZDCRawDataCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx b/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx index 01905d791f..f5443adab7 100644 --- a/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx +++ b/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx @@ -48,11 +48,7 @@ Quality ZDCRecBeautifyPlots::check(std::map mo, Quality checkResult) { diff --git a/Modules/ZDC/src/ZDCRecDataCheck.cxx b/Modules/ZDC/src/ZDCRecDataCheck.cxx index ac21faa4a3..709cdcd26c 100644 --- a/Modules/ZDC/src/ZDCRecDataCheck.cxx +++ b/Modules/ZDC/src/ZDCRecDataCheck.cxx @@ -305,7 +305,7 @@ Quality ZDCRecDataCheck::check(std::map mo, Quality checkResult) { From fddcbd30e7293aa7850fb374457adb7c6dd117e3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 14:22:48 +0000 Subject: [PATCH 3/8] Apply ALICE coding guidelines formatting using git-clang-format Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- Framework/include/QualityControl/CheckInterface.h | 2 -- Framework/src/CheckInterface.cxx | 2 -- Framework/test/testCheckInterface.cxx | 4 ---- Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h | 3 ++- Modules/Benchmark/src/AlwaysGoodCheck.cxx | 2 -- Modules/CPV/include/CPV/PedestalCheck.h | 4 +++- Modules/CPV/include/CPV/PhysicsCheck.h | 1 - Modules/CPV/src/PedestalCheck.cxx | 3 +-- Modules/CTP/include/CTP/RawDataReaderCheck.h | 3 ++- Modules/CTP/src/RawDataReaderCheck.cxx | 2 -- Modules/Common/include/Common/CcdbInspectorCheck.h | 3 ++- Modules/Common/include/Common/EverIncreasingGraph.h | 4 +++- Modules/Common/include/Common/IncreasingEntries.h | 4 +++- Modules/Common/include/Common/MeanIsAbove.h | 4 +++- Modules/Common/include/Common/NonEmpty.h | 3 ++- Modules/Common/include/Common/ReferenceComparatorCheck.h | 3 ++- Modules/Common/include/Common/TrendCheck.h | 3 ++- Modules/Common/src/CcdbInspectorCheck.cxx | 2 -- Modules/Common/src/EverIncreasingGraph.cxx | 2 -- Modules/Common/src/IncreasingEntries.cxx | 2 -- Modules/Common/src/MeanIsAbove.cxx | 2 -- Modules/Common/src/NonEmpty.cxx | 2 -- Modules/Common/src/ReferenceComparatorCheck.cxx | 2 -- Modules/Common/src/TrendCheck.cxx | 2 -- Modules/Common/test/testMeanIsAbove.cxx | 1 - Modules/Common/test/testNonEmpty.cxx | 2 -- Modules/EMCAL/include/EMCAL/CalibCheck.h | 4 +++- Modules/EMCAL/include/EMCAL/CellAmpCheck.h | 4 +++- Modules/EMCAL/include/EMCAL/CellCheck.h | 3 ++- Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h | 4 +++- Modules/EMCAL/include/EMCAL/DigitCheck.h | 3 ++- Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h | 3 ++- Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h | 4 +++- Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h | 4 +++- Modules/EMCAL/include/EMCAL/RawCheck.h | 4 +++- Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h | 4 +++- Modules/EMCAL/include/EMCAL/TrendGraphCheck.h | 4 +++- Modules/EMCAL/src/CalibCheck.cxx | 2 -- Modules/EMCAL/src/CellAmpCheck.cxx | 2 -- Modules/EMCAL/src/CellCheck.cxx | 2 -- Modules/EMCAL/src/CellTimeCalibCheck.cxx | 2 -- Modules/EMCAL/src/DigitCheck.cxx | 2 -- Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx | 2 -- Modules/EMCAL/src/NumPhysTriggCheck.cxx | 2 -- Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx | 2 -- Modules/EMCAL/src/PedestalChannelCheck.cxx | 2 -- Modules/EMCAL/src/RawCheck.cxx | 2 -- Modules/EMCAL/src/RawErrorCheck.cxx | 2 -- Modules/EMCAL/src/RawErrorCheckAll.cxx | 2 -- Modules/EMCAL/src/TrendGraphCheck.cxx | 2 -- Modules/Example/include/Example/FakeCheck.h | 3 ++- Modules/Example/src/FakeCheck.cxx | 2 -- Modules/FIT/FDD/include/FDD/CFDEffCheck.h | 3 ++- Modules/FIT/FDD/include/FDD/GenericCheck.h | 3 ++- Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h | 3 ++- Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h | 3 ++- Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h | 3 ++- Modules/FIT/FDD/src/CFDEffCheck.cxx | 2 -- Modules/FIT/FDD/src/GenericCheck.cxx | 2 -- Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx | 2 -- Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx | 2 -- Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx | 2 -- Modules/FIT/FIT/include/FIT/LevelCheck.h | 3 ++- Modules/FIT/FIT/include/FIT/MIPCheck.h | 3 ++- Modules/FIT/FIT/src/LevelCheck.cxx | 2 -- Modules/FIT/FIT/src/MIPCheck.cxx | 2 -- Modules/FIT/FT0/include/FT0/CFDEffCheck.h | 3 ++- Modules/FIT/FT0/include/FT0/FractionCheck.h | 4 +++- Modules/FIT/FT0/include/FT0/GenericCheck.h | 3 ++- Modules/FIT/FT0/include/FT0/MergedTreeCheck.h | 3 ++- Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h | 3 ++- Modules/FIT/FT0/src/CFDEffCheck.cxx | 2 -- Modules/FIT/FT0/src/FractionCheck.cxx | 2 -- Modules/FIT/FT0/src/GenericCheck.cxx | 2 -- Modules/FIT/FT0/src/MergedTreeCheck.cxx | 2 -- Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx | 2 -- Modules/FIT/FV0/include/FV0/CFDEffCheck.h | 3 ++- Modules/FIT/FV0/include/FV0/GenericCheck.h | 3 ++- Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h | 3 ++- Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h | 3 ++- Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h | 3 ++- Modules/FIT/FV0/src/CFDEffCheck.cxx | 2 -- Modules/FIT/FV0/src/GenericCheck.cxx | 2 -- Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx | 2 -- Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx | 2 -- Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx | 2 -- Modules/GLO/include/GLO/MeanVertexCheck.h | 3 ++- Modules/GLO/src/MeanVertexCheck.cxx | 2 -- Modules/ITS/include/ITS/ITSClusterCheck.h | 4 +++- Modules/ITS/include/ITS/ITSFeeCheck.h | 3 ++- Modules/ITS/include/ITS/ITSFhrCheck.h | 3 ++- Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h | 4 +++- Modules/ITS/include/ITS/ITSTrackCheck.h | 3 ++- Modules/ITS/src/ITSClusterCheck.cxx | 2 -- Modules/ITS/src/ITSFeeCheck.cxx | 2 -- Modules/ITS/src/ITSFhrCheck.cxx | 2 -- Modules/ITS/src/ITSThresholdCalibrationCheck.cxx | 2 -- Modules/ITS/src/ITSTrackCheck.cxx | 2 -- Modules/MFT/include/MFT/QcMFTClusterCheck.h | 4 +++- Modules/MFT/include/MFT/QcMFTDigitCheck.h | 4 +++- Modules/MFT/include/MFT/QcMFTReadoutCheck.h | 4 +++- Modules/MFT/include/MFT/QcMFTTrackCheck.h | 4 +++- Modules/MFT/src/QcMFTClusterCheck.cxx | 2 -- Modules/MFT/src/QcMFTDigitCheck.cxx | 1 - Modules/MFT/src/QcMFTReadoutCheck.cxx | 2 -- Modules/MFT/src/QcMFTTrackCheck.cxx | 2 -- .../Common/include/MUONCommon/MatchingEfficiencyCheck.h | 3 ++- Modules/MUON/Common/include/MUONCommon/TracksCheck.h | 4 +++- Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx | 2 -- Modules/MUON/Common/src/TracksCheck.cxx | 2 -- Modules/MUON/MCH/include/MCH/ClustersCheck.h | 4 +++- Modules/MUON/MCH/include/MCH/DecodingCheck.h | 4 +++- Modules/MUON/MCH/include/MCH/DigitsCheck.h | 4 +++- Modules/MUON/MCH/include/MCH/PedestalsCheck.h | 4 +++- Modules/MUON/MCH/include/MCH/PreclustersCheck.h | 4 +++- Modules/MUON/MCH/src/ClustersCheck.cxx | 2 -- Modules/MUON/MCH/src/DecodingCheck.cxx | 2 -- Modules/MUON/MCH/src/DigitsCheck.cxx | 2 -- Modules/MUON/MCH/src/PedestalsCheck.cxx | 2 -- Modules/MUON/MCH/src/PreclustersCheck.cxx | 2 -- Modules/MUON/MID/include/MID/CalibMQcCheck.h | 4 +++- Modules/MUON/MID/include/MID/CalibQcCheck.h | 4 +++- Modules/MUON/MID/include/MID/ClustQcCheck.h | 4 +++- Modules/MUON/MID/include/MID/DigitsQcCheck.h | 4 +++- Modules/MUON/MID/include/MID/RawQcCheck.h | 3 ++- Modules/MUON/MID/include/MID/TracksQcCheck.h | 4 +++- Modules/MUON/MID/src/CalibMQcCheck.cxx | 2 -- Modules/MUON/MID/src/CalibQcCheck.cxx | 2 -- Modules/MUON/MID/src/ClustQcCheck.cxx | 2 -- Modules/MUON/MID/src/DigitsQcCheck.cxx | 2 -- Modules/MUON/MID/src/RawQcCheck.cxx | 2 -- Modules/MUON/MID/src/TracksQcCheck.cxx | 2 -- Modules/PHOS/include/PHOS/ClusterCheck.h | 4 +++- Modules/PHOS/include/PHOS/RawCheck.h | 4 +++- Modules/PHOS/src/ClusterCheck.cxx | 2 -- Modules/PHOS/src/RawCheck.cxx | 2 -- Modules/Skeleton/include/Skeleton/SkeletonCheck.h | 3 ++- Modules/Skeleton/src/SkeletonCheck.cxx | 2 -- Modules/TOF/include/TOF/CheckCompressedData.h | 4 +++- Modules/TOF/include/TOF/CheckDRMDiagnostics.h | 4 +++- Modules/TOF/include/TOF/CheckDiagnostics.h | 4 +++- Modules/TOF/include/TOF/CheckHitMap.h | 1 - Modules/TOF/include/TOF/CheckLostOrbits.h | 4 +++- Modules/TOF/include/TOF/CheckNoise.h | 1 - Modules/TOF/include/TOF/CheckRaw.h | 4 +++- Modules/TOF/include/TOF/CheckRawMultiplicity.h | 1 - Modules/TOF/include/TOF/CheckRawTime.h | 1 - Modules/TOF/include/TOF/CheckRawToT.h | 1 - Modules/TOF/include/TOF/CheckSlotPartMask.h | 4 +++- Modules/TOF/src/CheckCompressedData.cxx | 2 -- Modules/TOF/src/CheckDRMDiagnostics.cxx | 2 -- Modules/TOF/src/CheckDiagnostics.cxx | 2 -- Modules/TOF/src/CheckHitMap.cxx | 6 ++++-- Modules/TOF/src/CheckLostOrbits.cxx | 2 -- Modules/TOF/src/CheckNoise.cxx | 6 ++++-- Modules/TOF/src/CheckRaw.cxx | 2 -- Modules/TOF/src/CheckRawMultiplicity.cxx | 6 ++++-- Modules/TOF/src/CheckRawTime.cxx | 6 ++++-- Modules/TOF/src/CheckRawToT.cxx | 6 ++++-- Modules/TOF/src/CheckSlotPartMask.cxx | 1 - Modules/TPC/include/TPC/CheckForEmptyPads.h | 4 +++- Modules/TPC/include/TPC/CheckOfPads.h | 4 +++- Modules/TPC/include/TPC/CheckOfSlices.h | 1 - Modules/TPC/include/TPC/CheckOfTrendings.h | 4 +++- Modules/TPC/include/TPC/GenericHistogramCheck.h | 4 +++- Modules/TPC/include/TPC/PadCalibrationCheck.h | 4 +++- Modules/TPC/src/CheckForEmptyPads.cxx | 1 - Modules/TPC/src/CheckOfPads.cxx | 1 - Modules/TPC/src/CheckOfTrendings.cxx | 2 -- Modules/TPC/src/GenericHistogramCheck.cxx | 2 -- Modules/TPC/src/PadCalibrationCheck.cxx | 1 - Modules/TRD/include/TRD/PulseHeightCheck.h | 3 ++- Modules/TRD/include/TRD/PulsePositionCheck.h | 3 ++- Modules/TRD/include/TRD/RawDataCheck.h | 6 ++++-- Modules/TRD/include/TRD/TrackletCountCheck.h | 3 ++- Modules/TRD/src/PulseHeightCheck.cxx | 2 -- Modules/TRD/src/PulsePositionCheck.cxx | 2 -- Modules/TRD/src/RawDataCheck.cxx | 4 ---- Modules/TRD/src/TrackletCountCheck.cxx | 2 -- Modules/ZDC/include/ZDC/ZDCRawDataCheck.h | 3 ++- Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h | 3 ++- Modules/ZDC/include/ZDC/ZDCRecDataCheck.h | 3 ++- Modules/ZDC/src/ZDCRawDataCheck.cxx | 2 -- Modules/ZDC/src/ZDCRecBeautifyPlots.cxx | 2 -- Modules/ZDC/src/ZDCRecDataCheck.cxx | 2 -- 185 files changed, 232 insertions(+), 279 deletions(-) diff --git a/Framework/include/QualityControl/CheckInterface.h b/Framework/include/QualityControl/CheckInterface.h index 1b4c543966..7d78fd4bc3 100644 --- a/Framework/include/QualityControl/CheckInterface.h +++ b/Framework/include/QualityControl/CheckInterface.h @@ -69,8 +69,6 @@ class CheckInterface : public core::UserCodeInterface /// then this should be reset here. virtual void reset(); // not fully abstract because we don't want to change all the existing subclasses - - virtual void startOfActivity(const core::Activity& activity); // not fully abstract because we don't want to change all the existing subclasses virtual void endOfActivity(const core::Activity& activity); // not fully abstract because we don't want to change all the existing subclasses diff --git a/Framework/src/CheckInterface.cxx b/Framework/src/CheckInterface.cxx index 44fa2cf0f0..36d01d6a2f 100644 --- a/Framework/src/CheckInterface.cxx +++ b/Framework/src/CheckInterface.cxx @@ -24,8 +24,6 @@ using namespace o2::quality_control::core; namespace o2::quality_control::checker { - - void CheckInterface::configure() { // noop, override it if you want. diff --git a/Framework/test/testCheckInterface.cxx b/Framework/test/testCheckInterface.cxx index 3b06479755..901e074423 100644 --- a/Framework/test/testCheckInterface.cxx +++ b/Framework/test/testCheckInterface.cxx @@ -62,8 +62,6 @@ class TestCheck : public checker::CheckInterface str->String().Append(" is beautiful now"); } - - string mValidString; }; @@ -87,6 +85,4 @@ TEST_CASE("test_invoke_all_interface_methods") testCheck.beautify(mo); CHECK(reinterpret_cast(mo->getObject())->String() == "A string is beautiful now"); - - } diff --git a/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h b/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h index 45a7565034..82b061533c 100644 --- a/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h +++ b/Modules/Benchmark/include/Benchmark/AlwaysGoodCheck.h @@ -36,7 +36,8 @@ class AlwaysGoodCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(AlwaysGoodCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(AlwaysGoodCheck, 2); }; } // namespace o2::quality_control_modules::benchmark diff --git a/Modules/Benchmark/src/AlwaysGoodCheck.cxx b/Modules/Benchmark/src/AlwaysGoodCheck.cxx index 42a17a8cf3..ec70974d48 100644 --- a/Modules/Benchmark/src/AlwaysGoodCheck.cxx +++ b/Modules/Benchmark/src/AlwaysGoodCheck.cxx @@ -33,8 +33,6 @@ Quality AlwaysGoodCheck::check(std::map, Quality) { } diff --git a/Modules/CPV/include/CPV/PedestalCheck.h b/Modules/CPV/include/CPV/PedestalCheck.h index c89bee1755..fe36aa6111 100644 --- a/Modules/CPV/include/CPV/PedestalCheck.h +++ b/Modules/CPV/include/CPV/PedestalCheck.h @@ -36,7 +36,9 @@ class PedestalCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: int getRunNumberFromMO(std::shared_ptr mo); // configurable parameters and their default values diff --git a/Modules/CPV/include/CPV/PhysicsCheck.h b/Modules/CPV/include/CPV/PhysicsCheck.h index ba9aa7e0d4..b40a2bdb29 100644 --- a/Modules/CPV/include/CPV/PhysicsCheck.h +++ b/Modules/CPV/include/CPV/PhysicsCheck.h @@ -38,7 +38,6 @@ class PhysicsCheck : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - private: int getRunNumberFromMO(std::shared_ptr mo); diff --git a/Modules/CPV/src/PedestalCheck.cxx b/Modules/CPV/src/PedestalCheck.cxx index 6e708bad5a..9cf29b5b4d 100644 --- a/Modules/CPV/src/PedestalCheck.cxx +++ b/Modules/CPV/src/PedestalCheck.cxx @@ -279,8 +279,7 @@ Quality PedestalCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/CTP/include/CTP/RawDataReaderCheck.h b/Modules/CTP/include/CTP/RawDataReaderCheck.h index c738d3bb57..bcbf37f985 100644 --- a/Modules/CTP/include/CTP/RawDataReaderCheck.h +++ b/Modules/CTP/include/CTP/RawDataReaderCheck.h @@ -41,7 +41,8 @@ class RawDataReaderCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; const double_t nofOrbitsPerTF = o2::base::GRPGeomHelper::instance().getNHBFPerTF(); const double_t TimeTF = nofOrbitsPerTF * o2::constants::lhc::LHCOrbitMUS / 1e6; // in seconds diff --git a/Modules/CTP/src/RawDataReaderCheck.cxx b/Modules/CTP/src/RawDataReaderCheck.cxx index a1860f1d84..ea3353dbe4 100644 --- a/Modules/CTP/src/RawDataReaderCheck.cxx +++ b/Modules/CTP/src/RawDataReaderCheck.cxx @@ -201,8 +201,6 @@ float RawDataReaderCheck::setTextPosition(float iPos, std::shared_ptr ms return MessagePos; } - - void RawDataReaderCheck::beautify(std::shared_ptr mo, Quality checkResult) { std::shared_ptr msg; diff --git a/Modules/Common/include/Common/CcdbInspectorCheck.h b/Modules/Common/include/Common/CcdbInspectorCheck.h index 9d40d49148..0db9ac96ec 100644 --- a/Modules/Common/include/Common/CcdbInspectorCheck.h +++ b/Modules/Common/include/Common/CcdbInspectorCheck.h @@ -36,7 +36,8 @@ class CcdbInspectorCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/Common/include/Common/EverIncreasingGraph.h b/Modules/Common/include/Common/EverIncreasingGraph.h index 5e0c29e93c..985408ed1f 100644 --- a/Modules/Common/include/Common/EverIncreasingGraph.h +++ b/Modules/Common/include/Common/EverIncreasingGraph.h @@ -34,7 +34,9 @@ class EverIncreasingGraph : public o2::quality_control::checker::CheckInterface ~EverIncreasingGraph() override = default; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: ClassDefOverride(EverIncreasingGraph, 2); }; diff --git a/Modules/Common/include/Common/IncreasingEntries.h b/Modules/Common/include/Common/IncreasingEntries.h index bcae01a55a..63ea546dbd 100644 --- a/Modules/Common/include/Common/IncreasingEntries.h +++ b/Modules/Common/include/Common/IncreasingEntries.h @@ -38,7 +38,9 @@ class IncreasingEntries : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: std::map mLastEntries; // moName -> number of entries // count the number of faults we have seen in a row for each object diff --git a/Modules/Common/include/Common/MeanIsAbove.h b/Modules/Common/include/Common/MeanIsAbove.h index 9af428af22..cc1704ab3d 100644 --- a/Modules/Common/include/Common/MeanIsAbove.h +++ b/Modules/Common/include/Common/MeanIsAbove.h @@ -37,7 +37,9 @@ class MeanIsAbove : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: float mThreshold = 0.0f; ClassDefOverride(MeanIsAbove, 2) diff --git a/Modules/Common/include/Common/NonEmpty.h b/Modules/Common/include/Common/NonEmpty.h index e0cb885174..40b2d51190 100644 --- a/Modules/Common/include/Common/NonEmpty.h +++ b/Modules/Common/include/Common/NonEmpty.h @@ -34,7 +34,8 @@ class NonEmpty : public o2::quality_control::checker::CheckInterface ~NonEmpty() override = default; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; ClassDefOverride(NonEmpty, 2); + void beautify(std::shared_ptr mo, Quality checkResult) override; + ClassDefOverride(NonEmpty, 2); }; } // namespace o2::quality_control_modules::common diff --git a/Modules/Common/include/Common/ReferenceComparatorCheck.h b/Modules/Common/include/Common/ReferenceComparatorCheck.h index ef599c6220..070e97e69f 100644 --- a/Modules/Common/include/Common/ReferenceComparatorCheck.h +++ b/Modules/Common/include/Common/ReferenceComparatorCheck.h @@ -44,7 +44,8 @@ class ReferenceComparatorCheck : public o2::quality_control::checker::CheckInter void configure() override; Quality check(std::map>* moMap) override; void reset() override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; private: diff --git a/Modules/Common/include/Common/TrendCheck.h b/Modules/Common/include/Common/TrendCheck.h index c9209eceb2..8edf62a622 100644 --- a/Modules/Common/include/Common/TrendCheck.h +++ b/Modules/Common/include/Common/TrendCheck.h @@ -47,7 +47,8 @@ class TrendCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; ClassDefOverride(TrendCheck, 1); diff --git a/Modules/Common/src/CcdbInspectorCheck.cxx b/Modules/Common/src/CcdbInspectorCheck.cxx index dc71cbb634..4ceafd568f 100644 --- a/Modules/Common/src/CcdbInspectorCheck.cxx +++ b/Modules/Common/src/CcdbInspectorCheck.cxx @@ -71,8 +71,6 @@ Quality CcdbInspectorCheck::check(std::map mo, Quality checkResult) { } diff --git a/Modules/Common/src/EverIncreasingGraph.cxx b/Modules/Common/src/EverIncreasingGraph.cxx index f61ac56f02..e08759b3fd 100644 --- a/Modules/Common/src/EverIncreasingGraph.cxx +++ b/Modules/Common/src/EverIncreasingGraph.cxx @@ -55,8 +55,6 @@ Quality EverIncreasingGraph::check(std::map mo, Quality checkResult) { ILOG(Info, Support) << "EverIncreasingGraph::Beautify" << ENDM; diff --git a/Modules/Common/src/IncreasingEntries.cxx b/Modules/Common/src/IncreasingEntries.cxx index b06fb780e2..c76167b8f0 100644 --- a/Modules/Common/src/IncreasingEntries.cxx +++ b/Modules/Common/src/IncreasingEntries.cxx @@ -93,8 +93,6 @@ Quality IncreasingEntries::check(std::map mo, Quality checkResult) { // only add the pavetext on the faulty plots diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx index 271529242c..c288477435 100644 --- a/Modules/Common/src/MeanIsAbove.cxx +++ b/Modules/Common/src/MeanIsAbove.cxx @@ -38,8 +38,6 @@ void MeanIsAbove::configure() mThreshold = stof(mCustomParameters.at("meanThreshold")); } - - Quality MeanIsAbove::check(std::map>* moMap) { auto mo = moMap->begin()->second; diff --git a/Modules/Common/src/NonEmpty.cxx b/Modules/Common/src/NonEmpty.cxx index 643ac107e0..9e6bef0319 100644 --- a/Modules/Common/src/NonEmpty.cxx +++ b/Modules/Common/src/NonEmpty.cxx @@ -46,8 +46,6 @@ ClassImp(o2::quality_control_modules::common::NonEmpty) return result; } - - void NonEmpty::beautify(std::shared_ptr /*mo*/, Quality /*checkResult*/) { // NOOP diff --git a/Modules/Common/src/ReferenceComparatorCheck.cxx b/Modules/Common/src/ReferenceComparatorCheck.cxx index 3d01f43eab..d582403c44 100644 --- a/Modules/Common/src/ReferenceComparatorCheck.cxx +++ b/Modules/Common/src/ReferenceComparatorCheck.cxx @@ -211,8 +211,6 @@ void ReferenceComparatorCheck::reset() mQualityFlags.clear(); } - - // return the ROOT color index associated to a give quality level static int getQualityColor(const Quality& q) { diff --git a/Modules/Common/src/TrendCheck.cxx b/Modules/Common/src/TrendCheck.cxx index 1934668605..68f30fe0fc 100644 --- a/Modules/Common/src/TrendCheck.cxx +++ b/Modules/Common/src/TrendCheck.cxx @@ -356,8 +356,6 @@ Quality TrendCheck::check(std::map>* return result; } - - static void drawThresholds(TGraph* graph, const std::vector>>& thresholds, int lineColor, int lineStyle) { if (thresholds.empty()) { diff --git a/Modules/Common/test/testMeanIsAbove.cxx b/Modules/Common/test/testMeanIsAbove.cxx index a87325c003..89c856fb28 100644 --- a/Modules/Common/test/testMeanIsAbove.cxx +++ b/Modules/Common/test/testMeanIsAbove.cxx @@ -72,7 +72,6 @@ BOOST_AUTO_TEST_CASE(test_types) MeanIsAbove check; - Quality quality = check.check(&moMap); BOOST_CHECK_EQUAL(quality, Quality::Null); } diff --git a/Modules/Common/test/testNonEmpty.cxx b/Modules/Common/test/testNonEmpty.cxx index ad2796fba5..ba2fdf5847 100644 --- a/Modules/Common/test/testNonEmpty.cxx +++ b/Modules/Common/test/testNonEmpty.cxx @@ -33,8 +33,6 @@ BOOST_AUTO_TEST_CASE(checkable) MonitorObject monitorObject(&histo, "task", "testClass", "TST"); monitorObject.setIsOwner(false); NonEmpty myCheck; - - } BOOST_AUTO_TEST_CASE(beautify) diff --git a/Modules/EMCAL/include/EMCAL/CalibCheck.h b/Modules/EMCAL/include/EMCAL/CalibCheck.h index 9fed860e63..5c48fa091c 100644 --- a/Modules/EMCAL/include/EMCAL/CalibCheck.h +++ b/Modules/EMCAL/include/EMCAL/CalibCheck.h @@ -36,7 +36,9 @@ class CalibCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/CellAmpCheck.h b/Modules/EMCAL/include/EMCAL/CellAmpCheck.h index b742f99637..e46acf4b29 100644 --- a/Modules/EMCAL/include/EMCAL/CellAmpCheck.h +++ b/Modules/EMCAL/include/EMCAL/CellAmpCheck.h @@ -40,7 +40,9 @@ class CellAmpCheck : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, - Quality checkResult = Quality::Null) override; private: + Quality checkResult = Quality::Null) override; + + private: // /************************************************ // * reference histograms * // ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/CellCheck.h b/Modules/EMCAL/include/EMCAL/CellCheck.h index d4d4a2b418..1463a538e7 100644 --- a/Modules/EMCAL/include/EMCAL/CellCheck.h +++ b/Modules/EMCAL/include/EMCAL/CellCheck.h @@ -35,7 +35,8 @@ class CellCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CellCheck, 1); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(CellCheck, 1); }; } // namespace o2::quality_control_modules::emcal diff --git a/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h b/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h index 13459b33c4..5a4eb91363 100644 --- a/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h +++ b/Modules/EMCAL/include/EMCAL/CellTimeCalibCheck.h @@ -36,7 +36,9 @@ class CellTimeCalibCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/DigitCheck.h b/Modules/EMCAL/include/EMCAL/DigitCheck.h index 029ccd3d40..9ff210e8c5 100644 --- a/Modules/EMCAL/include/EMCAL/DigitCheck.h +++ b/Modules/EMCAL/include/EMCAL/DigitCheck.h @@ -32,7 +32,8 @@ class DigitCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(DigitCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(DigitCheck, 2); }; } // namespace o2::quality_control_modules::emcal diff --git a/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h b/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h index 08533f94f4..6b71830b6d 100644 --- a/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h +++ b/Modules/EMCAL/include/EMCAL/NumPatchesPerFastORCheck.h @@ -40,7 +40,8 @@ class NumPatchesPerFastORCheck : public o2::quality_control::checker::CheckInter // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; struct FastORNoiseInfo { + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + struct FastORNoiseInfo { int mCounts; int mTRUIndex; int mFastORIndex; diff --git a/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h b/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h index f335c64b20..79325018d1 100644 --- a/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h +++ b/Modules/EMCAL/include/EMCAL/PayloadPerEventDDLCheck.h @@ -37,7 +37,9 @@ class PayloadPerEventDDLCheck : public o2::quality_control::checker::CheckInterf // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: // /************************************************ // * reference histograms * // ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h b/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h index dbacaf8e28..89abfa1f33 100644 --- a/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h +++ b/Modules/EMCAL/include/EMCAL/PedestalChannelCheck.h @@ -36,7 +36,9 @@ class PedestalChannelCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/RawCheck.h b/Modules/EMCAL/include/EMCAL/RawCheck.h index af438a5be8..1d24d5ca29 100644 --- a/Modules/EMCAL/include/EMCAL/RawCheck.h +++ b/Modules/EMCAL/include/EMCAL/RawCheck.h @@ -41,7 +41,9 @@ class RawCheck final : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: Quality runPedestalCheck1D(TH1* adcdist, double minentries, double signalfraction) const; std::vector runPedestalCheck2D(TH2* adchist, double minentries, double signalfraction) const; std::array, 20> reduceBadFECs(std::vector fecids) const; diff --git a/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h b/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h index 32ea9f67ee..89283a7314 100644 --- a/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h +++ b/Modules/EMCAL/include/EMCAL/RawErrorCheckAll.h @@ -36,7 +36,9 @@ class RawErrorCheckAll : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h b/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h index 119ebe8ae3..39e9f91ccf 100644 --- a/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h +++ b/Modules/EMCAL/include/EMCAL/TrendGraphCheck.h @@ -38,7 +38,9 @@ class TrendGraphCheck : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, - Quality checkResult = Quality::Null) override; private: + Quality checkResult = Quality::Null) override; + + private: /************************************************ * threshold cuts * ************************************************/ diff --git a/Modules/EMCAL/src/CalibCheck.cxx b/Modules/EMCAL/src/CalibCheck.cxx index d6177c8c2e..c59708c402 100644 --- a/Modules/EMCAL/src/CalibCheck.cxx +++ b/Modules/EMCAL/src/CalibCheck.cxx @@ -372,8 +372,6 @@ Quality CalibCheck::check(std::map>* return result; } - - void CalibCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == "MaskStatsAllHisto" || mo->getName() == "MaskStatsEMCALHisto" || mo->getName() == "MaskStatsDCALHisto") { diff --git a/Modules/EMCAL/src/CellAmpCheck.cxx b/Modules/EMCAL/src/CellAmpCheck.cxx index 04095d2dc1..7bdef5ce1a 100644 --- a/Modules/EMCAL/src/CellAmpCheck.cxx +++ b/Modules/EMCAL/src/CellAmpCheck.cxx @@ -77,8 +77,6 @@ Quality CellAmpCheck::check( return result; } - - void CellAmpCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/EMCAL/src/CellCheck.cxx b/Modules/EMCAL/src/CellCheck.cxx index 186ac4b7fc..241f4ea977 100644 --- a/Modules/EMCAL/src/CellCheck.cxx +++ b/Modules/EMCAL/src/CellCheck.cxx @@ -97,8 +97,6 @@ Quality CellCheck::check(std::map>* return result; } - - void CellCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName().find("Time") != std::string::npos) { diff --git a/Modules/EMCAL/src/CellTimeCalibCheck.cxx b/Modules/EMCAL/src/CellTimeCalibCheck.cxx index d0a804383b..a2d5041cc1 100644 --- a/Modules/EMCAL/src/CellTimeCalibCheck.cxx +++ b/Modules/EMCAL/src/CellTimeCalibCheck.cxx @@ -76,8 +76,6 @@ Quality CellTimeCalibCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == "cellTimeCalib_PHYS") { diff --git a/Modules/EMCAL/src/DigitCheck.cxx b/Modules/EMCAL/src/DigitCheck.cxx index 45a2dc2361..b770dab03d 100644 --- a/Modules/EMCAL/src/DigitCheck.cxx +++ b/Modules/EMCAL/src/DigitCheck.cxx @@ -94,8 +94,6 @@ Quality DigitCheck::check(std::map>* return result; } - - void DigitCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName().find("Time") != std::string::npos) { diff --git a/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx b/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx index c9e7c2b298..86f9a8a690 100644 --- a/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx +++ b/Modules/EMCAL/src/NumPatchesPerFastORCheck.cxx @@ -236,8 +236,6 @@ Quality NumPatchesPerFastORCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == "NumberOfPatchesWithFastOR") { diff --git a/Modules/EMCAL/src/NumPhysTriggCheck.cxx b/Modules/EMCAL/src/NumPhysTriggCheck.cxx index 7167ac0275..428001f544 100644 --- a/Modules/EMCAL/src/NumPhysTriggCheck.cxx +++ b/Modules/EMCAL/src/NumPhysTriggCheck.cxx @@ -81,8 +81,6 @@ Quality NumPhysTriggCheck::check(std::map mo, Quality checkResult) { if (mo->getName().find("NPhysTriggersTFSlice") != std::string::npos) { diff --git a/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx b/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx index 02042912fd..853d6bdf15 100644 --- a/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx +++ b/Modules/EMCAL/src/PayloadPerEventDDLCheck.cxx @@ -77,8 +77,6 @@ Quality PayloadPerEventDDLCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == "PayloadSizePerDDL") { diff --git a/Modules/EMCAL/src/PedestalChannelCheck.cxx b/Modules/EMCAL/src/PedestalChannelCheck.cxx index adbbdff2f1..a9c96be80a 100644 --- a/Modules/EMCAL/src/PedestalChannelCheck.cxx +++ b/Modules/EMCAL/src/PedestalChannelCheck.cxx @@ -164,8 +164,6 @@ Quality PedestalChannelCheck::check(std::map mo, Quality checkResult) { std::array channelHists = { { "mPedestalChannelFECHG", "mPedestalChannelFECLG", "mPedestalChannelLEDMONHG", "mPedestalChannelLEDMONLG" } }; diff --git a/Modules/EMCAL/src/RawCheck.cxx b/Modules/EMCAL/src/RawCheck.cxx index cd3249a5c3..809762685a 100644 --- a/Modules/EMCAL/src/RawCheck.cxx +++ b/Modules/EMCAL/src/RawCheck.cxx @@ -226,8 +226,6 @@ Quality RawCheck::check(std::map>* m return result; } - - void RawCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName().find("Error") != std::string::npos) { diff --git a/Modules/EMCAL/src/RawErrorCheck.cxx b/Modules/EMCAL/src/RawErrorCheck.cxx index 5245a592d2..25910aad31 100644 --- a/Modules/EMCAL/src/RawErrorCheck.cxx +++ b/Modules/EMCAL/src/RawErrorCheck.cxx @@ -355,8 +355,6 @@ Quality RawErrorCheck::check(std::map mo, Quality checkResult) { auto* h = dynamic_cast(mo->getObject()); diff --git a/Modules/EMCAL/src/RawErrorCheckAll.cxx b/Modules/EMCAL/src/RawErrorCheckAll.cxx index f520b57dd4..7367a8fe29 100644 --- a/Modules/EMCAL/src/RawErrorCheckAll.cxx +++ b/Modules/EMCAL/src/RawErrorCheckAll.cxx @@ -90,8 +90,6 @@ Quality RawErrorCheckAll::check(std::map mo, Quality checkResult) { if (mo->getName() == "TrendRawDataError") { diff --git a/Modules/EMCAL/src/TrendGraphCheck.cxx b/Modules/EMCAL/src/TrendGraphCheck.cxx index e65026905d..302e88c1d1 100644 --- a/Modules/EMCAL/src/TrendGraphCheck.cxx +++ b/Modules/EMCAL/src/TrendGraphCheck.cxx @@ -117,8 +117,6 @@ Quality TrendGraphCheck::check( return result; } - - void TrendGraphCheck::beautify(std::shared_ptr mo, Quality checkResult) { diff --git a/Modules/Example/include/Example/FakeCheck.h b/Modules/Example/include/Example/FakeCheck.h index 84858f9c54..28c1fd9c73 100644 --- a/Modules/Example/include/Example/FakeCheck.h +++ b/Modules/Example/include/Example/FakeCheck.h @@ -35,7 +35,8 @@ class FakeCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(FakeCheck, 1); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(FakeCheck, 1); }; } // namespace o2::quality_control_modules::example diff --git a/Modules/Example/src/FakeCheck.cxx b/Modules/Example/src/FakeCheck.cxx index c33d7f9e50..9bd5bbe34b 100644 --- a/Modules/Example/src/FakeCheck.cxx +++ b/Modules/Example/src/FakeCheck.cxx @@ -34,8 +34,6 @@ ClassImp(o2::quality_control_modules::example::FakeCheck) return result; } - - void FakeCheck::beautify(std::shared_ptr /*mo*/, Quality /*checkResult*/) { // NOOP diff --git a/Modules/FIT/FDD/include/FDD/CFDEffCheck.h b/Modules/FIT/FDD/include/FDD/CFDEffCheck.h index b5bd3b516e..de84e59dd1 100644 --- a/Modules/FIT/FDD/include/FDD/CFDEffCheck.h +++ b/Modules/FIT/FDD/include/FDD/CFDEffCheck.h @@ -39,7 +39,8 @@ class CFDEffCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CFDEffCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(CFDEffCheck, 2); private: template >* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(GenericCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(GenericCheck, 2); private: SingleCheck getCheckFromConfig(std::string); diff --git a/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h b/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h index 9ed3437c1f..6550ee45c1 100644 --- a/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h +++ b/Modules/FIT/FDD/include/FDD/OutOfBunchCollCheck.h @@ -36,7 +36,8 @@ class OutOfBunchCollCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; ClassDefOverride(OutOfBunchCollCheck, 2); diff --git a/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h b/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h index bc7df6a293..8a66d1bcba 100644 --- a/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h +++ b/Modules/FIT/FDD/include/FDD/OutOfBunchCollFeeModulesCheck.h @@ -30,7 +30,8 @@ class OutOfBunchCollFeeModulesCheck : public o2::quality_control::checker::Check void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(OutOfBunchCollFeeModulesCheck, 1); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(OutOfBunchCollFeeModulesCheck, 1); private: float mThreshWarning; diff --git a/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h b/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h index 33b9636292..1f8b59e3c6 100644 --- a/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h +++ b/Modules/FIT/FDD/include/FDD/TriggersSwVsTcmCheck.h @@ -30,7 +30,8 @@ class TriggersSwVsTcmCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(TriggersSwVsTcmCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(TriggersSwVsTcmCheck, 2); private: std::array mPositionMsgBox; diff --git a/Modules/FIT/FDD/src/CFDEffCheck.cxx b/Modules/FIT/FDD/src/CFDEffCheck.cxx index eb30b31661..9b74665f1e 100644 --- a/Modules/FIT/FDD/src/CFDEffCheck.cxx +++ b/Modules/FIT/FDD/src/CFDEffCheck.cxx @@ -146,8 +146,6 @@ Quality CFDEffCheck::check(std::map> return result; } - - void CFDEffCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == "CFD_efficiency") { diff --git a/Modules/FIT/FDD/src/GenericCheck.cxx b/Modules/FIT/FDD/src/GenericCheck.cxx index b61c3347b2..26d67bc695 100644 --- a/Modules/FIT/FDD/src/GenericCheck.cxx +++ b/Modules/FIT/FDD/src/GenericCheck.cxx @@ -262,8 +262,6 @@ Quality GenericCheck::check(std::map return result; } - - void GenericCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (!mo) { diff --git a/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx b/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx index bb8a38b6e7..9b377f2f97 100644 --- a/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx +++ b/Modules/FIT/FDD/src/OutOfBunchCollCheck.cxx @@ -128,8 +128,6 @@ Quality OutOfBunchCollCheck::check(std::map mo, Quality checkResult) { auto* h = dynamic_cast(mo->getObject()); diff --git a/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx b/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx index c558180e33..4e924f6e31 100644 --- a/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx +++ b/Modules/FIT/FDD/src/OutOfBunchCollFeeModulesCheck.cxx @@ -120,8 +120,6 @@ Quality OutOfBunchCollFeeModulesCheck::check(std::map mo, Quality checkResult) { if (mo->getName().find("OutOfBunchColl_BCvsFeeModules") != std::string::npos) { diff --git a/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx b/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx index 0a407b8894..da8b9045a5 100644 --- a/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx +++ b/Modules/FIT/FDD/src/TriggersSwVsTcmCheck.cxx @@ -103,8 +103,6 @@ Quality TriggersSwVsTcmCheck::check(std::map mo, Quality checkResult) { if (!mo) { diff --git a/Modules/FIT/FIT/include/FIT/LevelCheck.h b/Modules/FIT/FIT/include/FIT/LevelCheck.h index 4433fb1dcb..423efd8edf 100644 --- a/Modules/FIT/FIT/include/FIT/LevelCheck.h +++ b/Modules/FIT/FIT/include/FIT/LevelCheck.h @@ -34,7 +34,8 @@ class LevelCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; private: void updateBinsToIgnoreWithDCM(); diff --git a/Modules/FIT/FIT/include/FIT/MIPCheck.h b/Modules/FIT/FIT/include/FIT/MIPCheck.h index 4094b14e38..b5f5a99c23 100644 --- a/Modules/FIT/FIT/include/FIT/MIPCheck.h +++ b/Modules/FIT/FIT/include/FIT/MIPCheck.h @@ -33,7 +33,8 @@ class MIPCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; private: std::shared_ptr mActivity; diff --git a/Modules/FIT/FIT/src/LevelCheck.cxx b/Modules/FIT/FIT/src/LevelCheck.cxx index c70b9de750..469b0deaa1 100644 --- a/Modules/FIT/FIT/src/LevelCheck.cxx +++ b/Modules/FIT/FIT/src/LevelCheck.cxx @@ -204,8 +204,6 @@ Quality LevelCheck::check(std::map>* return result; } - - void LevelCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == mNameObjectToCheck) { diff --git a/Modules/FIT/FIT/src/MIPCheck.cxx b/Modules/FIT/FIT/src/MIPCheck.cxx index 9d93f72808..5983b97dd1 100644 --- a/Modules/FIT/FIT/src/MIPCheck.cxx +++ b/Modules/FIT/FIT/src/MIPCheck.cxx @@ -242,8 +242,6 @@ Quality MIPCheck::check(std::map>* m return result; } - - void MIPCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == mNameObjectToCheck) { diff --git a/Modules/FIT/FT0/include/FT0/CFDEffCheck.h b/Modules/FIT/FT0/include/FT0/CFDEffCheck.h index 7c85882ef7..ab92c0caa1 100644 --- a/Modules/FIT/FT0/include/FT0/CFDEffCheck.h +++ b/Modules/FIT/FT0/include/FT0/CFDEffCheck.h @@ -38,7 +38,8 @@ class CFDEffCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CFDEffCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(CFDEffCheck, 2); private: template >* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: template ::value || std::is_same::value || (std::is_integral::value && !std::is_same::value)>::type> diff --git a/Modules/FIT/FT0/include/FT0/GenericCheck.h b/Modules/FIT/FT0/include/FT0/GenericCheck.h index 2bbf78388f..14f8aa2aea 100644 --- a/Modules/FIT/FT0/include/FT0/GenericCheck.h +++ b/Modules/FIT/FT0/include/FT0/GenericCheck.h @@ -102,7 +102,8 @@ class GenericCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(GenericCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(GenericCheck, 2); private: SingleCheck getCheckFromConfig(std::string); diff --git a/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h b/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h index 0f32488619..ecae98349e 100644 --- a/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h +++ b/Modules/FIT/FT0/include/FT0/MergedTreeCheck.h @@ -33,7 +33,8 @@ class MergedTreeCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(MergedTreeCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(MergedTreeCheck, 2); }; } // namespace o2::quality_control_modules::ft0 diff --git a/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h b/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h index 0801f53629..4feae605c3 100644 --- a/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h +++ b/Modules/FIT/FT0/include/FT0/OutOfBunchCollCheck.h @@ -36,7 +36,8 @@ class OutOfBunchCollCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; ClassDefOverride(OutOfBunchCollCheck, 2); diff --git a/Modules/FIT/FT0/src/CFDEffCheck.cxx b/Modules/FIT/FT0/src/CFDEffCheck.cxx index 145816dc3d..dbafb7bfda 100644 --- a/Modules/FIT/FT0/src/CFDEffCheck.cxx +++ b/Modules/FIT/FT0/src/CFDEffCheck.cxx @@ -150,8 +150,6 @@ Quality CFDEffCheck::check(std::map> return result; } - - void CFDEffCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == "CFD_efficiency") { diff --git a/Modules/FIT/FT0/src/FractionCheck.cxx b/Modules/FIT/FT0/src/FractionCheck.cxx index 476a4df2ec..61c47088c0 100644 --- a/Modules/FIT/FT0/src/FractionCheck.cxx +++ b/Modules/FIT/FT0/src/FractionCheck.cxx @@ -117,8 +117,6 @@ Quality FractionCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == mNameObjectToCheck) { diff --git a/Modules/FIT/FT0/src/GenericCheck.cxx b/Modules/FIT/FT0/src/GenericCheck.cxx index cc42ec1dc3..15b60482c0 100644 --- a/Modules/FIT/FT0/src/GenericCheck.cxx +++ b/Modules/FIT/FT0/src/GenericCheck.cxx @@ -187,8 +187,6 @@ Quality GenericCheck::check(std::map return result; } - - void GenericCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (!mo) { diff --git a/Modules/FIT/FT0/src/MergedTreeCheck.cxx b/Modules/FIT/FT0/src/MergedTreeCheck.cxx index 42a15425a3..55834f7e10 100644 --- a/Modules/FIT/FT0/src/MergedTreeCheck.cxx +++ b/Modules/FIT/FT0/src/MergedTreeCheck.cxx @@ -56,8 +56,6 @@ Quality MergedTreeCheck::check(std::map, Quality) { } diff --git a/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx b/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx index 8d3d42816f..6aeacb8958 100644 --- a/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx +++ b/Modules/FIT/FT0/src/OutOfBunchCollCheck.cxx @@ -128,8 +128,6 @@ Quality OutOfBunchCollCheck::check(std::map mo, Quality checkResult) { auto* h = dynamic_cast(mo->getObject()); diff --git a/Modules/FIT/FV0/include/FV0/CFDEffCheck.h b/Modules/FIT/FV0/include/FV0/CFDEffCheck.h index c1f1ebb7cd..b7a794a9d7 100644 --- a/Modules/FIT/FV0/include/FV0/CFDEffCheck.h +++ b/Modules/FIT/FV0/include/FV0/CFDEffCheck.h @@ -38,7 +38,8 @@ class CFDEffCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(CFDEffCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(CFDEffCheck, 2); private: template >* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(GenericCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(GenericCheck, 2); private: SingleCheck getCheckFromConfig(std::string); diff --git a/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h b/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h index 524abbf116..46787b2985 100644 --- a/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h +++ b/Modules/FIT/FV0/include/FV0/OutOfBunchCollCheck.h @@ -36,7 +36,8 @@ class OutOfBunchCollCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + constexpr static std::size_t sBCperOrbit = o2::constants::lhc::LHCMaxBunches; ClassDefOverride(OutOfBunchCollCheck, 2); diff --git a/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h b/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h index 778188ad0a..e2c1c4eba8 100644 --- a/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h +++ b/Modules/FIT/FV0/include/FV0/OutOfBunchCollFeeModulesCheck.h @@ -35,7 +35,8 @@ class OutOfBunchCollFeeModulesCheck : public o2::quality_control::checker::Check void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(OutOfBunchCollFeeModulesCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(OutOfBunchCollFeeModulesCheck, 2); private: float mThreshWarning; diff --git a/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h b/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h index 70d21367f5..4ceb0a70bd 100644 --- a/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h +++ b/Modules/FIT/FV0/include/FV0/TriggersSwVsTcmCheck.h @@ -34,7 +34,8 @@ class TriggersSwVsTcmCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(TriggersSwVsTcmCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(TriggersSwVsTcmCheck, 2); private: std::array mPositionMsgBox; diff --git a/Modules/FIT/FV0/src/CFDEffCheck.cxx b/Modules/FIT/FV0/src/CFDEffCheck.cxx index 92d91c9e6c..04a986d3b0 100644 --- a/Modules/FIT/FV0/src/CFDEffCheck.cxx +++ b/Modules/FIT/FV0/src/CFDEffCheck.cxx @@ -145,8 +145,6 @@ Quality CFDEffCheck::check(std::map> return result; } - - void CFDEffCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == "CFD_efficiency") { diff --git a/Modules/FIT/FV0/src/GenericCheck.cxx b/Modules/FIT/FV0/src/GenericCheck.cxx index f0207ebd4d..596771c446 100644 --- a/Modules/FIT/FV0/src/GenericCheck.cxx +++ b/Modules/FIT/FV0/src/GenericCheck.cxx @@ -265,8 +265,6 @@ Quality GenericCheck::check(std::map return result; } - - void GenericCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (!mo) { diff --git a/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx b/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx index f25722548e..d0e439858e 100644 --- a/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx +++ b/Modules/FIT/FV0/src/OutOfBunchCollCheck.cxx @@ -130,8 +130,6 @@ Quality OutOfBunchCollCheck::check(std::map mo, Quality checkResult) { auto* h = dynamic_cast(mo->getObject()); diff --git a/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx b/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx index 0126871d29..9db128ace4 100644 --- a/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx +++ b/Modules/FIT/FV0/src/OutOfBunchCollFeeModulesCheck.cxx @@ -125,8 +125,6 @@ Quality OutOfBunchCollFeeModulesCheck::check(std::map mo, Quality checkResult) { if (mo->getName().find("OutOfBunchColl_BCvsFeeModules") != std::string::npos) { diff --git a/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx b/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx index f6d0fd703c..fb5e5f14b8 100644 --- a/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx +++ b/Modules/FIT/FV0/src/TriggersSwVsTcmCheck.cxx @@ -103,8 +103,6 @@ Quality TriggersSwVsTcmCheck::check(std::map mo, Quality checkResult) { if (!mo) { diff --git a/Modules/GLO/include/GLO/MeanVertexCheck.h b/Modules/GLO/include/GLO/MeanVertexCheck.h index ff4a4c63c6..d8d955207b 100644 --- a/Modules/GLO/include/GLO/MeanVertexCheck.h +++ b/Modules/GLO/include/GLO/MeanVertexCheck.h @@ -40,7 +40,8 @@ class MeanVertexCheck : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; ClassDefOverride(MeanVertexCheck, 1); diff --git a/Modules/GLO/src/MeanVertexCheck.cxx b/Modules/GLO/src/MeanVertexCheck.cxx index fec4a044a8..7742d3928e 100644 --- a/Modules/GLO/src/MeanVertexCheck.cxx +++ b/Modules/GLO/src/MeanVertexCheck.cxx @@ -166,8 +166,6 @@ Quality MeanVertexCheck::check(std::map mo, Quality checkResult) { auto moName = mo->getName(); diff --git a/Modules/ITS/include/ITS/ITSClusterCheck.h b/Modules/ITS/include/ITS/ITSClusterCheck.h index b2a7cf7f82..ea06e6f779 100644 --- a/Modules/ITS/include/ITS/ITSClusterCheck.h +++ b/Modules/ITS/include/ITS/ITSClusterCheck.h @@ -41,7 +41,9 @@ class ITSClusterCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(ITSClusterCheck, 2); std::shared_ptr tInfoSummary; diff --git a/Modules/ITS/include/ITS/ITSFeeCheck.h b/Modules/ITS/include/ITS/ITSFeeCheck.h index 14f5249a09..b6b676719a 100644 --- a/Modules/ITS/include/ITS/ITSFeeCheck.h +++ b/Modules/ITS/include/ITS/ITSFeeCheck.h @@ -39,7 +39,8 @@ class ITSFeeCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; bool checkReason(Quality checkResult, TString text); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + bool checkReason(Quality checkResult, TString text); private: ClassDefOverride(ITSFeeCheck, 2); diff --git a/Modules/ITS/include/ITS/ITSFhrCheck.h b/Modules/ITS/include/ITS/ITSFhrCheck.h index e667d426c0..903cd0a13a 100644 --- a/Modules/ITS/include/ITS/ITSFhrCheck.h +++ b/Modules/ITS/include/ITS/ITSFhrCheck.h @@ -38,7 +38,8 @@ class ITSFhrCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; bool checkReason(Quality checkResult, TString text); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + bool checkReason(Quality checkResult, TString text); private: int mNPixelPerStave[3] = { 4718592, 58720256, 102760448 }; // IB, ML, OL diff --git a/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h b/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h index 6e186001f9..771bb3a018 100644 --- a/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h +++ b/Modules/ITS/include/ITS/ITSThresholdCalibrationCheck.h @@ -35,7 +35,9 @@ class ITSThresholdCalibrationCheck : public o2::quality_control::checker::CheckI // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(ITSThresholdCalibrationCheck, 2); }; diff --git a/Modules/ITS/include/ITS/ITSTrackCheck.h b/Modules/ITS/include/ITS/ITSTrackCheck.h index 172ae0d4de..377bc40ce8 100644 --- a/Modules/ITS/include/ITS/ITSTrackCheck.h +++ b/Modules/ITS/include/ITS/ITSTrackCheck.h @@ -38,7 +38,8 @@ class ITSTrackCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; int getDigit(int number, int digit); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + int getDigit(int number, int digit); private: float mEtaRatio = 0.1, mPhiRatio = 0.1; diff --git a/Modules/ITS/src/ITSClusterCheck.cxx b/Modules/ITS/src/ITSClusterCheck.cxx index eb1e80eeac..bd50c2daa1 100644 --- a/Modules/ITS/src/ITSClusterCheck.cxx +++ b/Modules/ITS/src/ITSClusterCheck.cxx @@ -136,8 +136,6 @@ Quality ITSClusterCheck::check(std::map mo, Quality checkResult) { std::vector vPlotWithTextMessage = convertToArray(o2::quality_control_modules::common::getFromConfig(mCustomParameters, "plotWithTextMessage", "")); diff --git a/Modules/ITS/src/ITSFeeCheck.cxx b/Modules/ITS/src/ITSFeeCheck.cxx index 889abb4b4c..7b48d56627 100644 --- a/Modules/ITS/src/ITSFeeCheck.cxx +++ b/Modules/ITS/src/ITSFeeCheck.cxx @@ -272,8 +272,6 @@ Quality ITSFeeCheck::check(std::map> return result; } // end check - - void ITSFeeCheck::beautify(std::shared_ptr mo, Quality checkResult) { std::vector vPlotWithTextMessage = convertToArray(o2::quality_control_modules::common::getFromConfig(mCustomParameters, "plotWithTextMessage", "")); diff --git a/Modules/ITS/src/ITSFhrCheck.cxx b/Modules/ITS/src/ITSFhrCheck.cxx index dff6beb46d..1b8a0e5577 100644 --- a/Modules/ITS/src/ITSFhrCheck.cxx +++ b/Modules/ITS/src/ITSFhrCheck.cxx @@ -169,8 +169,6 @@ Quality ITSFhrCheck::check(std::map> return result; } - - void ITSFhrCheck::beautify(std::shared_ptr mo, Quality checkResult) { std::vector vPlotWithTextMessage = convertToArray(o2::quality_control_modules::common::getFromConfig(mCustomParameters, "plotWithTextMessage", "")); diff --git a/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx b/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx index 2fc2d2fd3a..8c03bffa08 100644 --- a/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx +++ b/Modules/ITS/src/ITSThresholdCalibrationCheck.cxx @@ -31,8 +31,6 @@ Quality ITSThresholdCalibrationCheck::check(std::map mo, Quality checkResult) { } diff --git a/Modules/ITS/src/ITSTrackCheck.cxx b/Modules/ITS/src/ITSTrackCheck.cxx index 6be60aa869..da71918c9c 100644 --- a/Modules/ITS/src/ITSTrackCheck.cxx +++ b/Modules/ITS/src/ITSTrackCheck.cxx @@ -196,8 +196,6 @@ Quality ITSTrackCheck::check(std::map mo, Quality checkResult) { std::vector vPlotWithTextMessage = convertToArray(o2::quality_control_modules::common::getFromConfig(mCustomParameters, "plotWithTextMessage", "")); diff --git a/Modules/MFT/include/MFT/QcMFTClusterCheck.h b/Modules/MFT/include/MFT/QcMFTClusterCheck.h index 7ac999fe1e..01abc719a6 100644 --- a/Modules/MFT/include/MFT/QcMFTClusterCheck.h +++ b/Modules/MFT/include/MFT/QcMFTClusterCheck.h @@ -39,7 +39,9 @@ class QcMFTClusterCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: int mLadderThresholdMedium; int mLadderThresholdBad; diff --git a/Modules/MFT/include/MFT/QcMFTDigitCheck.h b/Modules/MFT/include/MFT/QcMFTDigitCheck.h index 783f9b03b0..e799719816 100644 --- a/Modules/MFT/include/MFT/QcMFTDigitCheck.h +++ b/Modules/MFT/include/MFT/QcMFTDigitCheck.h @@ -38,7 +38,9 @@ class QcMFTDigitCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: int mLadderThresholdMedium; int mLadderThresholdBad; diff --git a/Modules/MFT/include/MFT/QcMFTReadoutCheck.h b/Modules/MFT/include/MFT/QcMFTReadoutCheck.h index 39034573f4..42209a056a 100644 --- a/Modules/MFT/include/MFT/QcMFTReadoutCheck.h +++ b/Modules/MFT/include/MFT/QcMFTReadoutCheck.h @@ -41,7 +41,9 @@ class QcMFTReadoutCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: int mWarningThresholdMedium; int mWarningThresholdBad; int mErrorThresholdMedium; diff --git a/Modules/MFT/include/MFT/QcMFTTrackCheck.h b/Modules/MFT/include/MFT/QcMFTTrackCheck.h index f08b7f4db3..739ea54b72 100644 --- a/Modules/MFT/include/MFT/QcMFTTrackCheck.h +++ b/Modules/MFT/include/MFT/QcMFTTrackCheck.h @@ -39,7 +39,9 @@ class QcMFTTrackCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: // ROF check bool mFirstCall; int mROF; diff --git a/Modules/MFT/src/QcMFTClusterCheck.cxx b/Modules/MFT/src/QcMFTClusterCheck.cxx index a21379bbb0..8d3878dbc6 100644 --- a/Modules/MFT/src/QcMFTClusterCheck.cxx +++ b/Modules/MFT/src/QcMFTClusterCheck.cxx @@ -217,8 +217,6 @@ Quality QcMFTClusterCheck::check(std::map mo) { long timestamp = mo->getValidity().getMin(); diff --git a/Modules/MFT/src/QcMFTDigitCheck.cxx b/Modules/MFT/src/QcMFTDigitCheck.cxx index 7f45b927d9..a3a371c479 100644 --- a/Modules/MFT/src/QcMFTDigitCheck.cxx +++ b/Modules/MFT/src/QcMFTDigitCheck.cxx @@ -271,7 +271,6 @@ Quality QcMFTDigitCheck::check(std::map mo) { long timestamp = mo->getValidity().getMin(); diff --git a/Modules/MFT/src/QcMFTReadoutCheck.cxx b/Modules/MFT/src/QcMFTReadoutCheck.cxx index 0f67a34f3c..c0e0cf474d 100644 --- a/Modules/MFT/src/QcMFTReadoutCheck.cxx +++ b/Modules/MFT/src/QcMFTReadoutCheck.cxx @@ -210,8 +210,6 @@ Quality QcMFTReadoutCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == "mSummaryChipFault") { diff --git a/Modules/MFT/src/QcMFTTrackCheck.cxx b/Modules/MFT/src/QcMFTTrackCheck.cxx index a0ffc32520..fb065e51a1 100644 --- a/Modules/MFT/src/QcMFTTrackCheck.cxx +++ b/Modules/MFT/src/QcMFTTrackCheck.cxx @@ -68,8 +68,6 @@ Quality QcMFTTrackCheck::check(std::map mo) { mROF = 0; diff --git a/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h b/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h index 3c1716eb09..ecdf355d9b 100644 --- a/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h +++ b/Modules/MUON/Common/include/MUONCommon/MatchingEfficiencyCheck.h @@ -37,7 +37,8 @@ class MatchingEfficiencyCheck : public o2::quality_control::checker::CheckInterf void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void startOfActivity(const Activity& activity) override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; ClassDefOverride(MatchingEfficiencyCheck, 1); diff --git a/Modules/MUON/Common/include/MUONCommon/TracksCheck.h b/Modules/MUON/Common/include/MUONCommon/TracksCheck.h index 45d8cd8194..49d9553588 100644 --- a/Modules/MUON/Common/include/MUONCommon/TracksCheck.h +++ b/Modules/MUON/Common/include/MUONCommon/TracksCheck.h @@ -38,7 +38,9 @@ class TracksCheck : public o2::quality_control::checker::CheckInterface void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: std::unordered_map mQualities; int mMinTracksPerTF{ 50 }; int mMaxTracksPerTF{ 500 }; diff --git a/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx b/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx index d53d41918b..810a414db8 100644 --- a/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx +++ b/Modules/MUON/Common/src/MatchingEfficiencyCheck.cxx @@ -166,8 +166,6 @@ Quality MatchingEfficiencyCheck::check(std::map mo, Quality checkResult) { TH1* hist = dynamic_cast(mo->getObject()); diff --git a/Modules/MUON/Common/src/TracksCheck.cxx b/Modules/MUON/Common/src/TracksCheck.cxx index 8cd2531eb5..64dab85719 100644 --- a/Modules/MUON/Common/src/TracksCheck.cxx +++ b/Modules/MUON/Common/src/TracksCheck.cxx @@ -161,8 +161,6 @@ Quality TracksCheck::check(std::map> return result; } - - static void updateTitle(TH1* hist, std::string suffix) { if (!hist) { diff --git a/Modules/MUON/MCH/include/MCH/ClustersCheck.h b/Modules/MUON/MCH/include/MCH/ClustersCheck.h index f6e6ea2fcf..045a7764c2 100644 --- a/Modules/MUON/MCH/include/MCH/ClustersCheck.h +++ b/Modules/MUON/MCH/include/MCH/ClustersCheck.h @@ -44,7 +44,9 @@ class ClustersCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: /// quality flag associated to each input plot std::unordered_map mQualities; /// acceptable limits for the average number of clusters associated tracks diff --git a/Modules/MUON/MCH/include/MCH/DecodingCheck.h b/Modules/MUON/MCH/include/MCH/DecodingCheck.h index 01f1d5aaa5..ce49749769 100644 --- a/Modules/MUON/MCH/include/MCH/DecodingCheck.h +++ b/Modules/MUON/MCH/include/MCH/DecodingCheck.h @@ -43,7 +43,9 @@ class DecodingCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: std::string mGoodFracHistName{ "DecodingErrors/GoodBoardsFractionPerDE" }; std::string mGoodFracPerSolarHistName{ "DecodingErrors/GoodBoardsFractionPerSolar" }; std::string mSyncFracHistName{ "SyncErrors/SyncedBoardsFractionPerDE" }; diff --git a/Modules/MUON/MCH/include/MCH/DigitsCheck.h b/Modules/MUON/MCH/include/MCH/DigitsCheck.h index f6d272289e..fe0a48b296 100644 --- a/Modules/MUON/MCH/include/MCH/DigitsCheck.h +++ b/Modules/MUON/MCH/include/MCH/DigitsCheck.h @@ -46,7 +46,9 @@ class DigitsCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: std::array checkMeanRates(TH1* h); std::array checkBadChannels(TH1* h); std::array checkMeanRateRatios(TH1* h); diff --git a/Modules/MUON/MCH/include/MCH/PedestalsCheck.h b/Modules/MUON/MCH/include/MCH/PedestalsCheck.h index bb19476264..5a7ea8fc70 100644 --- a/Modules/MUON/MCH/include/MCH/PedestalsCheck.h +++ b/Modules/MUON/MCH/include/MCH/PedestalsCheck.h @@ -35,7 +35,9 @@ class PedestalsCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: /// Maximum number of bad detection elements for "good" quality status int mMaxBadST12{ 1 }; int mMaxBadST345{ 3 }; diff --git a/Modules/MUON/MCH/include/MCH/PreclustersCheck.h b/Modules/MUON/MCH/include/MCH/PreclustersCheck.h index 54ae1809ef..fb3085bc27 100644 --- a/Modules/MUON/MCH/include/MCH/PreclustersCheck.h +++ b/Modules/MUON/MCH/include/MCH/PreclustersCheck.h @@ -44,7 +44,9 @@ class PreclustersCheck : public o2::quality_control::checker::CheckInterface void configure() override; void startOfActivity(const Activity& activity) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: std::array checkMeanEfficiencies(TH1* h); std::array checkMeanEfficiencyRatios(TH1* h); void checkSolarMeanEfficiencies(TH1* h); diff --git a/Modules/MUON/MCH/src/ClustersCheck.cxx b/Modules/MUON/MCH/src/ClustersCheck.cxx index 3bd5645fa1..851df5102d 100644 --- a/Modules/MUON/MCH/src/ClustersCheck.cxx +++ b/Modules/MUON/MCH/src/ClustersCheck.cxx @@ -130,8 +130,6 @@ Quality ClustersCheck::check(std::map mo, Quality checkResult) { if ((mo->getName().find("RefComp/") != std::string::npos)) { diff --git a/Modules/MUON/MCH/src/DigitsCheck.cxx b/Modules/MUON/MCH/src/DigitsCheck.cxx index ee89a18662..2c9322ed9b 100644 --- a/Modules/MUON/MCH/src/DigitsCheck.cxx +++ b/Modules/MUON/MCH/src/DigitsCheck.cxx @@ -322,8 +322,6 @@ Quality DigitsCheck::check(std::map> return mQualityChecker.getQuality(); } - - static void updateTitle(TH1* hist, std::string suffix) { if (!hist) { diff --git a/Modules/MUON/MCH/src/PedestalsCheck.cxx b/Modules/MUON/MCH/src/PedestalsCheck.cxx index 105d58fcef..c6e69d5f2f 100644 --- a/Modules/MUON/MCH/src/PedestalsCheck.cxx +++ b/Modules/MUON/MCH/src/PedestalsCheck.cxx @@ -223,8 +223,6 @@ Quality PedestalsCheck::check(std::map mo, Quality checkResult) { if ((mo->getName().find("RefComp/") != std::string::npos)) { diff --git a/Modules/MUON/MID/include/MID/CalibMQcCheck.h b/Modules/MUON/MID/include/MID/CalibMQcCheck.h index 24dfa4fe3a..e41fcd262f 100644 --- a/Modules/MUON/MID/include/MID/CalibMQcCheck.h +++ b/Modules/MUON/MID/include/MID/CalibMQcCheck.h @@ -34,7 +34,9 @@ class CalibMQcCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: HistoHelper mHistoHelper; ///! Histogram helper ClassDefOverride(CalibMQcCheck, 3); }; diff --git a/Modules/MUON/MID/include/MID/CalibQcCheck.h b/Modules/MUON/MID/include/MID/CalibQcCheck.h index a693ad0e34..a31ba7de86 100644 --- a/Modules/MUON/MID/include/MID/CalibQcCheck.h +++ b/Modules/MUON/MID/include/MID/CalibQcCheck.h @@ -35,7 +35,9 @@ class CalibQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: float mDeadRof = 0; HistoHelper mHistoHelper; ///! Histogram helper diff --git a/Modules/MUON/MID/include/MID/ClustQcCheck.h b/Modules/MUON/MID/include/MID/ClustQcCheck.h index 7ae8c1ff13..172a905e19 100644 --- a/Modules/MUON/MID/include/MID/ClustQcCheck.h +++ b/Modules/MUON/MID/include/MID/ClustQcCheck.h @@ -33,7 +33,9 @@ class ClustQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: float mClusterTF = 0; int mOrbTF = 32; // float scaleTime = 0.0114048; // 128 orb/TF * 3564 BC/orb * 25ns diff --git a/Modules/MUON/MID/include/MID/DigitsQcCheck.h b/Modules/MUON/MID/include/MID/DigitsQcCheck.h index 2da3ee666d..946e905fe2 100644 --- a/Modules/MUON/MID/include/MID/DigitsQcCheck.h +++ b/Modules/MUON/MID/include/MID/DigitsQcCheck.h @@ -39,7 +39,9 @@ class DigitsQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: double mMeanMultThreshold = 10.; ///! Upper threshold on mean multiplicity double mMinMultThreshold = 0.001; ///! Lower threshold on mean multiplicity double mLocalBoardScale = 100.; ///! Local board scale in kHz diff --git a/Modules/MUON/MID/include/MID/RawQcCheck.h b/Modules/MUON/MID/include/MID/RawQcCheck.h index 316d2c119c..8203c50d59 100644 --- a/Modules/MUON/MID/include/MID/RawQcCheck.h +++ b/Modules/MUON/MID/include/MID/RawQcCheck.h @@ -34,7 +34,8 @@ class RawQcCheck : public o2::quality_control::checker::CheckInterface // Override interface Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(RawQcCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(RawQcCheck, 2); }; } // namespace o2::quality_control_modules::mid diff --git a/Modules/MUON/MID/include/MID/TracksQcCheck.h b/Modules/MUON/MID/include/MID/TracksQcCheck.h index d45b731cb8..a7b435775e 100644 --- a/Modules/MUON/MID/include/MID/TracksQcCheck.h +++ b/Modules/MUON/MID/include/MID/TracksQcCheck.h @@ -35,7 +35,9 @@ class TracksQcCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: double mRatio44Threshold; float mTracksTF = 0; int mOrbTF = 32; diff --git a/Modules/MUON/MID/src/CalibMQcCheck.cxx b/Modules/MUON/MID/src/CalibMQcCheck.cxx index da675018b0..f0530133fa 100644 --- a/Modules/MUON/MID/src/CalibMQcCheck.cxx +++ b/Modules/MUON/MID/src/CalibMQcCheck.cxx @@ -45,8 +45,6 @@ Quality CalibMQcCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/MUON/MID/src/CalibQcCheck.cxx b/Modules/MUON/MID/src/CalibQcCheck.cxx index d045d94496..69f9db1207 100644 --- a/Modules/MUON/MID/src/CalibQcCheck.cxx +++ b/Modules/MUON/MID/src/CalibQcCheck.cxx @@ -56,8 +56,6 @@ Quality CalibQcCheck::check(std::map return result; } - - void CalibQcCheck::beautify(std::shared_ptr mo, Quality checkResult) { auto currentTime = mHistoHelper.getCurrentTime(); diff --git a/Modules/MUON/MID/src/ClustQcCheck.cxx b/Modules/MUON/MID/src/ClustQcCheck.cxx index e682947fc8..9978086583 100644 --- a/Modules/MUON/MID/src/ClustQcCheck.cxx +++ b/Modules/MUON/MID/src/ClustQcCheck.cxx @@ -79,8 +79,6 @@ Quality ClustQcCheck::check(std::map return result; } - - static void updateTitle(TH1* hist, std::string suffix) { if (!hist) { diff --git a/Modules/MUON/MID/src/DigitsQcCheck.cxx b/Modules/MUON/MID/src/DigitsQcCheck.cxx index 16e915ac38..43bf5a44f4 100644 --- a/Modules/MUON/MID/src/DigitsQcCheck.cxx +++ b/Modules/MUON/MID/src/DigitsQcCheck.cxx @@ -220,8 +220,6 @@ Quality DigitsQcCheck::check(std::map mo, Quality checkResult) { gStyle->SetPalette(kRainBow); diff --git a/Modules/MUON/MID/src/RawQcCheck.cxx b/Modules/MUON/MID/src/RawQcCheck.cxx index 653e5c1167..9b715d25fd 100644 --- a/Modules/MUON/MID/src/RawQcCheck.cxx +++ b/Modules/MUON/MID/src/RawQcCheck.cxx @@ -72,8 +72,6 @@ Quality RawQcCheck::check(std::map>* return result; } - - void RawQcCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == "mDetElemID") { diff --git a/Modules/MUON/MID/src/TracksQcCheck.cxx b/Modules/MUON/MID/src/TracksQcCheck.cxx index 38bd4bd0f6..1a004aea50 100644 --- a/Modules/MUON/MID/src/TracksQcCheck.cxx +++ b/Modules/MUON/MID/src/TracksQcCheck.cxx @@ -105,8 +105,6 @@ Quality TracksQcCheck::check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; protected: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + protected: int mDeadThreshold[5] = { 10, 10, 10, 10, 10 }; /// Number of new dead channels per module to decalre bad int mNoisyThreshold[5] = { 2, 2, 2, 2, 2 }; /// Number of new noisy channels per module to send warning int mMaxOccupancyCut[5] = { 10, 10, 10, 10, 10 }; /// occupancy in noisy channel wrt mean over module diff --git a/Modules/PHOS/include/PHOS/RawCheck.h b/Modules/PHOS/include/PHOS/RawCheck.h index b339c1e39c..4f8fb19780 100644 --- a/Modules/PHOS/include/PHOS/RawCheck.h +++ b/Modules/PHOS/include/PHOS/RawCheck.h @@ -41,7 +41,9 @@ class RawCheck final : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override {} protected: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override {} + + protected: bool checkErrHistograms(MonitorObject* mo); bool checkPhysicsHistograms(MonitorObject* mo); bool checkPedestalHistograms(MonitorObject* mo); diff --git a/Modules/PHOS/src/ClusterCheck.cxx b/Modules/PHOS/src/ClusterCheck.cxx index 5d603d869c..55b9f8f592 100644 --- a/Modules/PHOS/src/ClusterCheck.cxx +++ b/Modules/PHOS/src/ClusterCheck.cxx @@ -257,8 +257,6 @@ Quality ClusterCheck::check(std::map return result; } // namespace o2::quality_control_modules::phos - - void ClusterCheck::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName().find("ClusterOccupancyM") != std::string::npos) { diff --git a/Modules/PHOS/src/RawCheck.cxx b/Modules/PHOS/src/RawCheck.cxx index da2c02a874..b15eeeb556 100644 --- a/Modules/PHOS/src/RawCheck.cxx +++ b/Modules/PHOS/src/RawCheck.cxx @@ -146,8 +146,6 @@ Quality RawCheck::check(std::map>* m return mCheckResult; } - - bool RawCheck::checkErrHistograms(MonitorObject* mo) { // Return true if mo found and handled diff --git a/Modules/Skeleton/include/Skeleton/SkeletonCheck.h b/Modules/Skeleton/include/Skeleton/SkeletonCheck.h index dd1c114867..660984d72c 100644 --- a/Modules/Skeleton/include/Skeleton/SkeletonCheck.h +++ b/Modules/Skeleton/include/Skeleton/SkeletonCheck.h @@ -35,7 +35,8 @@ class SkeletonCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/Skeleton/src/SkeletonCheck.cxx b/Modules/Skeleton/src/SkeletonCheck.cxx index 7374f9665e..f5deb755ca 100644 --- a/Modules/Skeleton/src/SkeletonCheck.cxx +++ b/Modules/Skeleton/src/SkeletonCheck.cxx @@ -81,8 +81,6 @@ Quality SkeletonCheck::check(std::map mo, Quality checkResult) { // THUS FUNCTION BODY IS AN EXAMPLE. PLEASE REMOVE EVERYTHING YOU DO NOT NEED. diff --git a/Modules/TOF/include/TOF/CheckCompressedData.h b/Modules/TOF/include/TOF/CheckCompressedData.h index 21871def49..00c2f0ea16 100644 --- a/Modules/TOF/include/TOF/CheckCompressedData.h +++ b/Modules/TOF/include/TOF/CheckCompressedData.h @@ -38,7 +38,9 @@ class CheckCompressedData : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: float mDiagnosticThresholdPerSlot = 0; /// Messages to print on the output PAD diff --git a/Modules/TOF/include/TOF/CheckDRMDiagnostics.h b/Modules/TOF/include/TOF/CheckDRMDiagnostics.h index 71c5ecf467..76ffa4a42a 100644 --- a/Modules/TOF/include/TOF/CheckDRMDiagnostics.h +++ b/Modules/TOF/include/TOF/CheckDRMDiagnostics.h @@ -38,7 +38,9 @@ class CheckDRMDiagnostics : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: /// Messages to print on the output PAD MessagePad mShifterMessages; diff --git a/Modules/TOF/include/TOF/CheckDiagnostics.h b/Modules/TOF/include/TOF/CheckDiagnostics.h index 2268177516..55b856e36e 100644 --- a/Modules/TOF/include/TOF/CheckDiagnostics.h +++ b/Modules/TOF/include/TOF/CheckDiagnostics.h @@ -38,7 +38,9 @@ class CheckDiagnostics : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: /// Messages to print on the output PAD MessagePad mShifterMessages; diff --git a/Modules/TOF/include/TOF/CheckHitMap.h b/Modules/TOF/include/TOF/CheckHitMap.h index 68e6ce298e..835d7ffaae 100644 --- a/Modules/TOF/include/TOF/CheckHitMap.h +++ b/Modules/TOF/include/TOF/CheckHitMap.h @@ -38,7 +38,6 @@ class CheckHitMap : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - private: /// Reference hit map taken from the CCDB and translated into QC binning std::shared_ptr mHistoRefHitMap = nullptr; /// TOF reference hit map diff --git a/Modules/TOF/include/TOF/CheckLostOrbits.h b/Modules/TOF/include/TOF/CheckLostOrbits.h index 6f37bf46ea..f8b4def582 100644 --- a/Modules/TOF/include/TOF/CheckLostOrbits.h +++ b/Modules/TOF/include/TOF/CheckLostOrbits.h @@ -35,7 +35,9 @@ class CheckLostOrbits : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: MessagePad mShifterMessages{ "", 0.15, 0.65, 0.4, 0.85 }; /// To select to check link inefficiencies (if recovery does not work) double mFractionThr = 0.9; diff --git a/Modules/TOF/include/TOF/CheckNoise.h b/Modules/TOF/include/TOF/CheckNoise.h index 4d0ebd1cd3..e6949508eb 100644 --- a/Modules/TOF/include/TOF/CheckNoise.h +++ b/Modules/TOF/include/TOF/CheckNoise.h @@ -38,7 +38,6 @@ class CheckNoise : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - private: /// Messages to print on the output PAD MessagePad mShifterMessages; diff --git a/Modules/TOF/include/TOF/CheckRaw.h b/Modules/TOF/include/TOF/CheckRaw.h index e65d0096c2..0ced914eb2 100644 --- a/Modules/TOF/include/TOF/CheckRaw.h +++ b/Modules/TOF/include/TOF/CheckRaw.h @@ -38,7 +38,9 @@ class CheckRaw : public o2::quality_control::checker::CheckInterface // Override interface void configure(std::string name) override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: float mDiagnosticThresholdPerSlot = 0; ClassDefOverride(CheckRaw, 1); diff --git a/Modules/TOF/include/TOF/CheckRawMultiplicity.h b/Modules/TOF/include/TOF/CheckRawMultiplicity.h index 264af8929f..bbb15733e7 100644 --- a/Modules/TOF/include/TOF/CheckRawMultiplicity.h +++ b/Modules/TOF/include/TOF/CheckRawMultiplicity.h @@ -37,7 +37,6 @@ class CheckRawMultiplicity : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - /// Running modes available static constexpr int kModeCollisions = 0; /// Standard running mode with collisions static constexpr int kModeCosmics = 1; /// Running mode with cosmics diff --git a/Modules/TOF/include/TOF/CheckRawTime.h b/Modules/TOF/include/TOF/CheckRawTime.h index 53d235eaa4..dac4967a14 100644 --- a/Modules/TOF/include/TOF/CheckRawTime.h +++ b/Modules/TOF/include/TOF/CheckRawTime.h @@ -37,7 +37,6 @@ class CheckRawTime : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - private: // Running configurable parameters /// Minimum number of entries in MO before message can be printed diff --git a/Modules/TOF/include/TOF/CheckRawToT.h b/Modules/TOF/include/TOF/CheckRawToT.h index 2838aaa52d..3800bdcdf6 100644 --- a/Modules/TOF/include/TOF/CheckRawToT.h +++ b/Modules/TOF/include/TOF/CheckRawToT.h @@ -37,7 +37,6 @@ class CheckRawToT : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult) override; - private: // Running configurable parameters /// Minimum number of entries in MO before message can be printed diff --git a/Modules/TOF/include/TOF/CheckSlotPartMask.h b/Modules/TOF/include/TOF/CheckSlotPartMask.h index d4aa8dc2e3..ec819dc421 100644 --- a/Modules/TOF/include/TOF/CheckSlotPartMask.h +++ b/Modules/TOF/include/TOF/CheckSlotPartMask.h @@ -35,7 +35,9 @@ class CheckSlotPartMask : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult) override; private: + void beautify(std::shared_ptr mo, Quality checkResult) override; + + private: // Threshold number of crates missing int mNCrates = 36; // Threshold number of inefficient links diff --git a/Modules/TOF/src/CheckCompressedData.cxx b/Modules/TOF/src/CheckCompressedData.cxx index 8604300fee..cbb2eb3946 100644 --- a/Modules/TOF/src/CheckCompressedData.cxx +++ b/Modules/TOF/src/CheckCompressedData.cxx @@ -60,8 +60,6 @@ Quality CheckCompressedData::check(std::map mo, Quality checkResult) { if (mo->getName() == "hDiagnostic") { diff --git a/Modules/TOF/src/CheckDRMDiagnostics.cxx b/Modules/TOF/src/CheckDRMDiagnostics.cxx index 32aa6902f7..9403313a4b 100644 --- a/Modules/TOF/src/CheckDRMDiagnostics.cxx +++ b/Modules/TOF/src/CheckDRMDiagnostics.cxx @@ -62,8 +62,6 @@ Quality CheckDRMDiagnostics::check(std::map mo, Quality checkResult) { if (mo->getName() == "DRMCounter") { diff --git a/Modules/TOF/src/CheckDiagnostics.cxx b/Modules/TOF/src/CheckDiagnostics.cxx index ba9b4c6155..199fe8aae2 100644 --- a/Modules/TOF/src/CheckDiagnostics.cxx +++ b/Modules/TOF/src/CheckDiagnostics.cxx @@ -50,8 +50,6 @@ Quality CheckDiagnostics::check(std::map mo, Quality checkResult) { if (mo->getName() == "RDHCounter") { diff --git a/Modules/TOF/src/CheckHitMap.cxx b/Modules/TOF/src/CheckHitMap.cxx index f2a34a62c5..2e21ec0743 100644 --- a/Modules/TOF/src/CheckHitMap.cxx +++ b/Modules/TOF/src/CheckHitMap.cxx @@ -48,7 +48,8 @@ Quality CheckHitMap::check(std::map> Quality result = Quality::Null; - for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) { + ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; const auto* h = static_cast(mo->getObject()); if (h->GetEntries() == 0) { // Histogram is empty result = Quality::Medium; @@ -126,7 +127,8 @@ Quality CheckHitMap::check(std::map> void CheckHitMap::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (1) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (1) { auto* h = static_cast(mo->getObject()); if (checkResult != Quality::Good) { auto msg = mShifterMessages.MakeMessagePad(h, checkResult); diff --git a/Modules/TOF/src/CheckLostOrbits.cxx b/Modules/TOF/src/CheckLostOrbits.cxx index 48866871b3..eafc4e88e8 100644 --- a/Modules/TOF/src/CheckLostOrbits.cxx +++ b/Modules/TOF/src/CheckLostOrbits.cxx @@ -55,8 +55,6 @@ Quality CheckLostOrbits::check(std::map mo, Quality checkResult) { if (mo->getName() == "OrbitsInTFEfficiency") { diff --git a/Modules/TOF/src/CheckNoise.cxx b/Modules/TOF/src/CheckNoise.cxx index 3e98aec181..83ce669c5c 100644 --- a/Modules/TOF/src/CheckNoise.cxx +++ b/Modules/TOF/src/CheckNoise.cxx @@ -35,7 +35,8 @@ Quality CheckNoise::check(std::map>* Quality result = Quality::Null; - for (auto& [moName, mo] : *moMap) {if (mo->getName() != mAcceptedName) { + for (auto& [moName, mo] : *moMap) { + if (mo->getName() != mAcceptedName) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which does not have name " << mAcceptedName << ENDM; continue; } @@ -59,7 +60,8 @@ Quality CheckNoise::check(std::map>* void CheckNoise::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName() == mAcceptedName) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (mo->getName() == mAcceptedName) { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { diff --git a/Modules/TOF/src/CheckRaw.cxx b/Modules/TOF/src/CheckRaw.cxx index de1d6394f5..85192f10b5 100644 --- a/Modules/TOF/src/CheckRaw.cxx +++ b/Modules/TOF/src/CheckRaw.cxx @@ -73,8 +73,6 @@ Quality CheckRaw::check(std::map>* m return result; } - - void CheckRaw::beautify(std::shared_ptr mo, Quality checkResult) { if (mo->getName() == "hDiagnostic") { diff --git a/Modules/TOF/src/CheckRawMultiplicity.cxx b/Modules/TOF/src/CheckRawMultiplicity.cxx index fddfa1b805..0446a9340c 100644 --- a/Modules/TOF/src/CheckRawMultiplicity.cxx +++ b/Modules/TOF/src/CheckRawMultiplicity.cxx @@ -66,7 +66,8 @@ Quality CheckRawMultiplicity::check(std::map 0 float hitsIntegral = 0.f; - for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) { + ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName() == "Multiplicity/Integrated") { const auto* h = static_cast(mo->getObject()); if (h->GetEntries() == 0) { // Histogram is empty @@ -149,7 +150,8 @@ Quality CheckRawMultiplicity::check(std::map mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName() == "Multiplicity/Integrated") { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (mo->getName() == "Multiplicity/Integrated") { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { diff --git a/Modules/TOF/src/CheckRawTime.cxx b/Modules/TOF/src/CheckRawTime.cxx index 6de4d07e63..851fae3a7b 100644 --- a/Modules/TOF/src/CheckRawTime.cxx +++ b/Modules/TOF/src/CheckRawTime.cxx @@ -43,7 +43,8 @@ Quality CheckRawTime::check(std::map Quality result = Quality::Null; - for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) { + ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName().find("Time/") != std::string::npos) { auto* h = static_cast(mo->getObject()); @@ -80,7 +81,8 @@ Quality CheckRawTime::check(std::map void CheckRawTime::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName().find("Time/") != std::string::npos) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (mo->getName().find("Time/") != std::string::npos) { auto* h = static_cast(mo->getObject()); if (h->GetEntries() < mMinEntriesBeforeMessage) { // Checking that the histogram has enough entries before printing messages return; diff --git a/Modules/TOF/src/CheckRawToT.cxx b/Modules/TOF/src/CheckRawToT.cxx index 76bd7630a2..ca87273418 100644 --- a/Modules/TOF/src/CheckRawToT.cxx +++ b/Modules/TOF/src/CheckRawToT.cxx @@ -50,7 +50,8 @@ Quality CheckRawToT::check(std::map> /// Number of events with ToT > 0 (excluding orphans) float ToTIntegral = 0.f; - for (auto& [moName, mo] : *moMap) {ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; + for (auto& [moName, mo] : *moMap) { + ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName().find("ToT/") != std::string::npos) { auto* h = static_cast(mo->getObject()); @@ -90,7 +91,8 @@ Quality CheckRawToT::check(std::map> void CheckRawToT::beautify(std::shared_ptr mo, Quality checkResult) { - ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM;if (mo->getName().find("ToT/") != std::string::npos) { + ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (mo->getName().find("ToT/") != std::string::npos) { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { diff --git a/Modules/TOF/src/CheckSlotPartMask.cxx b/Modules/TOF/src/CheckSlotPartMask.cxx index d5181d5179..4ef54cce53 100644 --- a/Modules/TOF/src/CheckSlotPartMask.cxx +++ b/Modules/TOF/src/CheckSlotPartMask.cxx @@ -90,7 +90,6 @@ Quality CheckSlotPartMask::check(std::map mo, Quality checkResult) { if (mo->getName() == "hSlotPartMask") { diff --git a/Modules/TPC/include/TPC/CheckForEmptyPads.h b/Modules/TPC/include/TPC/CheckForEmptyPads.h index 219fefe9e0..99d7ab9534 100644 --- a/Modules/TPC/include/TPC/CheckForEmptyPads.h +++ b/Modules/TPC/include/TPC/CheckForEmptyPads.h @@ -36,7 +36,9 @@ class CheckForEmptyPads : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(CheckForEmptyPads, 1); std::string summarizeMetaData(Quality quality); std::vector mSectorsName; diff --git a/Modules/TPC/include/TPC/CheckOfPads.h b/Modules/TPC/include/TPC/CheckOfPads.h index 28f7a64585..452dc82043 100644 --- a/Modules/TPC/include/TPC/CheckOfPads.h +++ b/Modules/TPC/include/TPC/CheckOfPads.h @@ -36,7 +36,9 @@ class CheckOfPads : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(CheckOfPads, 1); static constexpr std::string_view CheckChoiceMean = "Mean"; static constexpr std::string_view CheckChoiceExpectedValue = "ExpectedValue"; diff --git a/Modules/TPC/include/TPC/CheckOfSlices.h b/Modules/TPC/include/TPC/CheckOfSlices.h index b936d9b2db..138df05a60 100644 --- a/Modules/TPC/include/TPC/CheckOfSlices.h +++ b/Modules/TPC/include/TPC/CheckOfSlices.h @@ -42,7 +42,6 @@ class CheckOfSlices : public o2::quality_control::checker::CheckInterface Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - private: ClassDefOverride(CheckOfSlices, 3); std::string createMetaData(const std::vector& pointMetaData); diff --git a/Modules/TPC/include/TPC/CheckOfTrendings.h b/Modules/TPC/include/TPC/CheckOfTrendings.h index cea6d628f0..8fca751011 100644 --- a/Modules/TPC/include/TPC/CheckOfTrendings.h +++ b/Modules/TPC/include/TPC/CheckOfTrendings.h @@ -41,7 +41,9 @@ class CheckOfTrendings : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(CheckOfTrendings, 2); void getGraphs(TCanvas* canv, std::vector& graphs, const std::string moName); std::string createMetaData(const std::vector& pointMetaData); diff --git a/Modules/TPC/include/TPC/GenericHistogramCheck.h b/Modules/TPC/include/TPC/GenericHistogramCheck.h index df6168cde0..2999480bad 100644 --- a/Modules/TPC/include/TPC/GenericHistogramCheck.h +++ b/Modules/TPC/include/TPC/GenericHistogramCheck.h @@ -35,7 +35,9 @@ class GenericHistogramCheck : public o2::quality_control::checker::CheckInterfac // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(GenericHistogramCheck, 2); std::string mAxisName; float mMeanX = 0; diff --git a/Modules/TPC/include/TPC/PadCalibrationCheck.h b/Modules/TPC/include/TPC/PadCalibrationCheck.h index a43ca5c6f3..685482aa45 100644 --- a/Modules/TPC/include/TPC/PadCalibrationCheck.h +++ b/Modules/TPC/include/TPC/PadCalibrationCheck.h @@ -36,7 +36,9 @@ class PadCalibrationCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; private: + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + + private: ClassDefOverride(PadCalibrationCheck, 2); std::vector mSectorsName; std::vector mSectorsQuality; diff --git a/Modules/TPC/src/CheckForEmptyPads.cxx b/Modules/TPC/src/CheckForEmptyPads.cxx index cddd3cd6fd..bd909aa7bd 100644 --- a/Modules/TPC/src/CheckForEmptyPads.cxx +++ b/Modules/TPC/src/CheckForEmptyPads.cxx @@ -221,7 +221,6 @@ std::string CheckForEmptyPads::summarizeMetaData(Quality quality) //______________________________________________________________________________ - //______________________________________________________________________________ void CheckForEmptyPads::beautify(std::shared_ptr mo, Quality) { diff --git a/Modules/TPC/src/CheckOfPads.cxx b/Modules/TPC/src/CheckOfPads.cxx index 0b4f00e38d..2379612459 100644 --- a/Modules/TPC/src/CheckOfPads.cxx +++ b/Modules/TPC/src/CheckOfPads.cxx @@ -255,7 +255,6 @@ Quality CheckOfPads::check(std::map> //______________________________________________________________________________ - //______________________________________________________________________________ void CheckOfPads::beautify(std::shared_ptr mo, Quality) { diff --git a/Modules/TPC/src/CheckOfTrendings.cxx b/Modules/TPC/src/CheckOfTrendings.cxx index 6509db099d..c60642ea0b 100644 --- a/Modules/TPC/src/CheckOfTrendings.cxx +++ b/Modules/TPC/src/CheckOfTrendings.cxx @@ -379,8 +379,6 @@ Quality CheckOfTrendings::check(std::map mo, Quality checkResult) { auto* canv = dynamic_cast(mo->getObject()); diff --git a/Modules/TPC/src/GenericHistogramCheck.cxx b/Modules/TPC/src/GenericHistogramCheck.cxx index 9a63270509..702e988162 100644 --- a/Modules/TPC/src/GenericHistogramCheck.cxx +++ b/Modules/TPC/src/GenericHistogramCheck.cxx @@ -238,8 +238,6 @@ Quality GenericHistogramCheck::check(std::map mo, Quality checkResult) { TPaveText* msg = new TPaveText(0.11, 0.85, 0.9, 0.95, "NDC"); diff --git a/Modules/TPC/src/PadCalibrationCheck.cxx b/Modules/TPC/src/PadCalibrationCheck.cxx index b9cabc6fad..e282d57168 100644 --- a/Modules/TPC/src/PadCalibrationCheck.cxx +++ b/Modules/TPC/src/PadCalibrationCheck.cxx @@ -123,7 +123,6 @@ Quality PadCalibrationCheck::check(std::map mo, Quality) { diff --git a/Modules/TRD/include/TRD/PulseHeightCheck.h b/Modules/TRD/include/TRD/PulseHeightCheck.h index 7609d9764a..88612da0c4 100644 --- a/Modules/TRD/include/TRD/PulseHeightCheck.h +++ b/Modules/TRD/include/TRD/PulseHeightCheck.h @@ -36,7 +36,8 @@ class PulseHeightCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; std::pair mDriftRegion; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + std::pair mDriftRegion; std::pair mPulseHeightPeakRegion; unsigned int mPulseHeightMinSum; float mPulseHeightRatio; diff --git a/Modules/TRD/include/TRD/PulsePositionCheck.h b/Modules/TRD/include/TRD/PulsePositionCheck.h index c7f539058b..bd3cbd84b6 100644 --- a/Modules/TRD/include/TRD/PulsePositionCheck.h +++ b/Modules/TRD/include/TRD/PulsePositionCheck.h @@ -35,7 +35,8 @@ class PulsePositionCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; std::pair mPulseHeightPeakRegion; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + std::pair mPulseHeightPeakRegion; double chi2byNDF_threshold; double FitParam0; double FitParam1; diff --git a/Modules/TRD/include/TRD/RawDataCheck.h b/Modules/TRD/include/TRD/RawDataCheck.h index d941bf7b34..ef5f7054ec 100644 --- a/Modules/TRD/include/TRD/RawDataCheck.h +++ b/Modules/TRD/include/TRD/RawDataCheck.h @@ -37,7 +37,8 @@ class RawDataCheckStats : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; @@ -63,7 +64,8 @@ class RawDataCheckSizes : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/TRD/include/TRD/TrackletCountCheck.h b/Modules/TRD/include/TRD/TrackletCountCheck.h index 13f5ba09b8..2685d7962b 100644 --- a/Modules/TRD/include/TRD/TrackletCountCheck.h +++ b/Modules/TRD/include/TRD/TrackletCountCheck.h @@ -34,7 +34,8 @@ class TrackletCountCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/TRD/src/PulseHeightCheck.cxx b/Modules/TRD/src/PulseHeightCheck.cxx index ce58d6c05d..421388d43d 100644 --- a/Modules/TRD/src/PulseHeightCheck.cxx +++ b/Modules/TRD/src/PulseHeightCheck.cxx @@ -145,8 +145,6 @@ Quality PulseHeightCheck::check(std::map mo, Quality checkResult) { if ((mo->getName() == "PulseHeight/mPulseHeight") || (mo->getName() == "PulseHeight/mPulseHeightpro")) { diff --git a/Modules/TRD/src/PulsePositionCheck.cxx b/Modules/TRD/src/PulsePositionCheck.cxx index abf7513115..e8cf93ca98 100644 --- a/Modules/TRD/src/PulsePositionCheck.cxx +++ b/Modules/TRD/src/PulsePositionCheck.cxx @@ -207,8 +207,6 @@ Quality PulsePositionCheck::check(std::map mo, Quality checkResult) { diff --git a/Modules/TRD/src/RawDataCheck.cxx b/Modules/TRD/src/RawDataCheck.cxx index ca8f3b8c04..2bffd33a39 100644 --- a/Modules/TRD/src/RawDataCheck.cxx +++ b/Modules/TRD/src/RawDataCheck.cxx @@ -130,8 +130,6 @@ void RawDataCheckStats::beautify(std::shared_ptr mo, Quality chec } } - - void RawDataCheckStats::reset() { ILOG(Debug, Devel) << "RawDataCheckStats::reset" << ENDM; @@ -206,8 +204,6 @@ void RawDataCheckSizes::beautify(std::shared_ptr mo, Quality chec } } - - void RawDataCheckSizes::reset() { ILOG(Debug, Devel) << "RawDataCheckSizes::reset" << ENDM; diff --git a/Modules/TRD/src/TrackletCountCheck.cxx b/Modules/TRD/src/TrackletCountCheck.cxx index 538e73377e..19a216faa2 100644 --- a/Modules/TRD/src/TrackletCountCheck.cxx +++ b/Modules/TRD/src/TrackletCountCheck.cxx @@ -151,8 +151,6 @@ Quality TrackletCountCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == "trackletsperevent") { diff --git a/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h b/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h index cbd4914e05..fc50ec39d9 100644 --- a/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h +++ b/Modules/ZDC/include/ZDC/ZDCRawDataCheck.h @@ -35,7 +35,8 @@ class ZDCRawDataCheck : public o2::quality_control::checker::CheckInterface ~ZDCRawDataCheck() override = default; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(ZDCRawDataCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(ZDCRawDataCheck, 2); struct sCheck { std::string ch; float minW; diff --git a/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h b/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h index 1b36a5f6a0..4dd4f47ae9 100644 --- a/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h +++ b/Modules/ZDC/include/ZDC/ZDCRecBeautifyPlots.h @@ -35,7 +35,8 @@ class ZDCRecBeautifyPlots : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; void reset() override; + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + void reset() override; void startOfActivity(const Activity& activity) override; void endOfActivity(const Activity& activity) override; diff --git a/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h b/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h index b12fd52025..94c0390422 100644 --- a/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h +++ b/Modules/ZDC/include/ZDC/ZDCRecDataCheck.h @@ -35,7 +35,8 @@ class ZDCRecDataCheck : public o2::quality_control::checker::CheckInterface // Override interface void configure() override; Quality check(std::map>* moMap) override; - void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; ClassDefOverride(ZDCRecDataCheck, 2); + void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; + ClassDefOverride(ZDCRecDataCheck, 2); struct sCheck { std::string ch; diff --git a/Modules/ZDC/src/ZDCRawDataCheck.cxx b/Modules/ZDC/src/ZDCRawDataCheck.cxx index 66d1a02b6d..5239a82f5e 100644 --- a/Modules/ZDC/src/ZDCRawDataCheck.cxx +++ b/Modules/ZDC/src/ZDCRawDataCheck.cxx @@ -222,8 +222,6 @@ Quality ZDCRawDataCheck::check(std::map mo, Quality checkResult) { for (int ih = 0; ih < (int)mVectHistoCheck.size(); ih++) { diff --git a/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx b/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx index f5443adab7..3f9117515c 100644 --- a/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx +++ b/Modules/ZDC/src/ZDCRecBeautifyPlots.cxx @@ -48,8 +48,6 @@ Quality ZDCRecBeautifyPlots::check(std::map mo, Quality checkResult) { if (mo->getName() == "h_CENTR_ZNA" || mo->getName() == "h_CENTR_ZNC" || mo->getName() == "h_CENTR_ZNA_cut_ZEM" || mo->getName() == "h_CENTR_ZNC_cut_ZEM") { diff --git a/Modules/ZDC/src/ZDCRecDataCheck.cxx b/Modules/ZDC/src/ZDCRecDataCheck.cxx index 709cdcd26c..f83bebb9ea 100644 --- a/Modules/ZDC/src/ZDCRecDataCheck.cxx +++ b/Modules/ZDC/src/ZDCRecDataCheck.cxx @@ -305,8 +305,6 @@ Quality ZDCRecDataCheck::check(std::map mo, Quality checkResult) { if (mo->getName() == "h_summary_ADC") { From 8997573441bfe25d56e98d736694fcab8505bfea Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 20 Aug 2025 09:40:00 +0000 Subject: [PATCH 4/8] Address review comments: Add encapsulatedInheritFrom method and fix cosmetic issues Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- Framework/include/QualityControl/MonitorObject.h | 5 +++++ Framework/src/MonitorObject.cxx | 8 ++++++++ Modules/CPV/src/PedestalCheck.cxx | 2 -- Modules/Common/src/MeanIsAbove.cxx | 9 ++++++++- Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h | 3 +-- Modules/EMCAL/include/EMCAL/RawErrorCheck.h | 3 +-- Modules/HMPID/include/HMPID/HmpidRawChecks.h | 3 ++- Modules/TOF/src/CheckHitMap.cxx | 8 ++++++++ Modules/TOF/src/CheckNoise.cxx | 8 ++++++++ Modules/TOF/src/CheckRawMultiplicity.cxx | 8 ++++++++ Modules/TOF/src/CheckRawTime.cxx | 8 ++++++++ Modules/TOF/src/CheckRawToT.cxx | 8 ++++++++ Modules/TPC/src/CheckForEmptyPads.cxx | 3 --- Modules/TPC/src/PadCalibrationCheck.cxx | 3 --- 14 files changed, 65 insertions(+), 14 deletions(-) diff --git a/Framework/include/QualityControl/MonitorObject.h b/Framework/include/QualityControl/MonitorObject.h index f4bbc7e36d..6220b6d59b 100644 --- a/Framework/include/QualityControl/MonitorObject.h +++ b/Framework/include/QualityControl/MonitorObject.h @@ -117,6 +117,11 @@ class MonitorObject : public TObject /// \brief Get metadata value of given key, returns std::nullopt if none exists; std::optional getMetadata(const std::string& key); + /// \brief Check if the encapsulated object inherits from the given class name + /// \param className Name of the class to check inheritance from + /// \return true if the encapsulated object inherits from the given class, false otherwise + bool encapsulatedInheritFrom(std::string_view className) const; + void Draw(Option_t* option) override; TObject* DrawClone(Option_t* option) const override; diff --git a/Framework/src/MonitorObject.cxx b/Framework/src/MonitorObject.cxx index 077b7f7807..8676ea7723 100644 --- a/Framework/src/MonitorObject.cxx +++ b/Framework/src/MonitorObject.cxx @@ -162,6 +162,14 @@ std::optional MonitorObject::getMetadata(const std::string& key) return std::nullopt; } +bool MonitorObject::encapsulatedInheritFrom(std::string_view className) const +{ + if (!mObject) { + return false; + } + return mObject->IsA()->InheritsFrom(className.data()); +} + std::string MonitorObject::getPath() const { return RepoPathUtils::getMoPath(this); diff --git a/Modules/CPV/src/PedestalCheck.cxx b/Modules/CPV/src/PedestalCheck.cxx index 9cf29b5b4d..6a436013c4 100644 --- a/Modules/CPV/src/PedestalCheck.cxx +++ b/Modules/CPV/src/PedestalCheck.cxx @@ -279,8 +279,6 @@ Quality PedestalCheck::check(std::map mo, Quality checkResult) { return; // do noting for the time being. Maybe in the future we will do something sofisticated diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx index c288477435..dbf2e61010 100644 --- a/Modules/Common/src/MeanIsAbove.cxx +++ b/Modules/Common/src/MeanIsAbove.cxx @@ -55,7 +55,14 @@ Quality MeanIsAbove::check(std::map> void MeanIsAbove::beautify(std::shared_ptr mo, Quality checkResult) { // A line is drawn at the level of the threshold. - // Its colour depends on the quality.auto* th1 = dynamic_cast(mo->getObject()); + // Its colour depends on the quality. + + if (!mo->encapsulatedInheritFrom("TH1")) { + ILOG(Error, Support) << "object not checkable" << ENDM; + return; + } + + auto* th1 = dynamic_cast(mo->getObject()); Double_t xMin = th1->GetXaxis()->GetXmin(); Double_t xMax = th1->GetXaxis()->GetXmax(); diff --git a/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h b/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h index 6984a67db2..03b44abda8 100644 --- a/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h +++ b/Modules/EMCAL/include/EMCAL/NumPhysTriggCheck.h @@ -46,8 +46,7 @@ class NumPhysTriggCheck : public o2::quality_control::checker::CheckInterface /// \param checkResult Quality status of this checker void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - /// \brief Accept only TH1 histograms as input - /// \return Name of the accepted object: TH1 ClassDefOverride(NumPhysTriggCheck, 1); + ClassDefOverride(NumPhysTriggCheck, 1); private: double mFracToMaxGood = 0.5; ///< Thresholds for minimum fraction of physics triggers compared to maximum diff --git a/Modules/EMCAL/include/EMCAL/RawErrorCheck.h b/Modules/EMCAL/include/EMCAL/RawErrorCheck.h index 9cdf7d3bdf..7417cffb6e 100644 --- a/Modules/EMCAL/include/EMCAL/RawErrorCheck.h +++ b/Modules/EMCAL/include/EMCAL/RawErrorCheck.h @@ -56,8 +56,7 @@ class RawErrorCheck : public o2::quality_control::checker::CheckInterface /// \param checkResult Quality status of this checker void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - /// \brief Accept only TH2 histograms as input - /// \return Name of the accepted object: TH2 ClassDefOverride(RawErrorCheck, 2); + ClassDefOverride(RawErrorCheck, 2); private: /// \brief Decode key of a configurable parameter as boolean diff --git a/Modules/HMPID/include/HMPID/HmpidRawChecks.h b/Modules/HMPID/include/HMPID/HmpidRawChecks.h index db49607768..7883662c18 100644 --- a/Modules/HMPID/include/HMPID/HmpidRawChecks.h +++ b/Modules/HMPID/include/HMPID/HmpidRawChecks.h @@ -48,7 +48,8 @@ class HmpidRawChecks : public o2::quality_control::checker::CheckInterface void configure() override; Quality check(std::map>* moMap) override; void beautify(std::shared_ptr mo, Quality checkResult = Quality::Null) override; - // private: + + private: std::array check_hHmpBigMap(TProfile2D* h); // <-- Dimensione da chiarire std::array check_hHmpHvSectorQ(TH2F* h); std::array check_hHmpPadOccPrf(TProfile* h); diff --git a/Modules/TOF/src/CheckHitMap.cxx b/Modules/TOF/src/CheckHitMap.cxx index 2e21ec0743..8be95baafc 100644 --- a/Modules/TOF/src/CheckHitMap.cxx +++ b/Modules/TOF/src/CheckHitMap.cxx @@ -49,6 +49,10 @@ Quality CheckHitMap::check(std::map> Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { + if (!mo->encapsulatedInheritFrom("TH2F")) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH2F" << ENDM; + continue; + } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; const auto* h = static_cast(mo->getObject()); if (h->GetEntries() == 0) { // Histogram is empty @@ -128,6 +132,10 @@ Quality CheckHitMap::check(std::map> void CheckHitMap::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (!mo->encapsulatedInheritFrom("TH2F")) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH2F" << ENDM; + return; + } if (1) { auto* h = static_cast(mo->getObject()); if (checkResult != Quality::Good) { diff --git a/Modules/TOF/src/CheckNoise.cxx b/Modules/TOF/src/CheckNoise.cxx index 83ce669c5c..989c3df2b9 100644 --- a/Modules/TOF/src/CheckNoise.cxx +++ b/Modules/TOF/src/CheckNoise.cxx @@ -36,6 +36,10 @@ Quality CheckNoise::check(std::map>* Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { + if (!mo->encapsulatedInheritFrom("TH1F")) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1F" << ENDM; + continue; + } if (mo->getName() != mAcceptedName) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which does not have name " << mAcceptedName << ENDM; continue; @@ -61,6 +65,10 @@ Quality CheckNoise::check(std::map>* void CheckNoise::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (!mo->encapsulatedInheritFrom("TH2F")) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH2F" << ENDM; + return; + } if (mo->getName() == mAcceptedName) { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); diff --git a/Modules/TOF/src/CheckRawMultiplicity.cxx b/Modules/TOF/src/CheckRawMultiplicity.cxx index 0446a9340c..fe73164bce 100644 --- a/Modules/TOF/src/CheckRawMultiplicity.cxx +++ b/Modules/TOF/src/CheckRawMultiplicity.cxx @@ -67,6 +67,10 @@ Quality CheckRawMultiplicity::check(std::mapencapsulatedInheritFrom("TH1")) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1" << ENDM; + continue; + } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName() == "Multiplicity/Integrated") { const auto* h = static_cast(mo->getObject()); @@ -151,6 +155,10 @@ Quality CheckRawMultiplicity::check(std::map mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (!mo->encapsulatedInheritFrom("TH1")) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH1" << ENDM; + return; + } if (mo->getName() == "Multiplicity/Integrated") { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); diff --git a/Modules/TOF/src/CheckRawTime.cxx b/Modules/TOF/src/CheckRawTime.cxx index 851fae3a7b..4b4014219f 100644 --- a/Modules/TOF/src/CheckRawTime.cxx +++ b/Modules/TOF/src/CheckRawTime.cxx @@ -44,6 +44,10 @@ Quality CheckRawTime::check(std::map Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { + if (!mo->encapsulatedInheritFrom("TH1F")) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1F" << ENDM; + continue; + } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName().find("Time/") != std::string::npos) { @@ -82,6 +86,10 @@ Quality CheckRawTime::check(std::map void CheckRawTime::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (!mo->encapsulatedInheritFrom("TH1F")) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH1F" << ENDM; + return; + } if (mo->getName().find("Time/") != std::string::npos) { auto* h = static_cast(mo->getObject()); if (h->GetEntries() < mMinEntriesBeforeMessage) { // Checking that the histogram has enough entries before printing messages diff --git a/Modules/TOF/src/CheckRawToT.cxx b/Modules/TOF/src/CheckRawToT.cxx index ca87273418..5f3773ee25 100644 --- a/Modules/TOF/src/CheckRawToT.cxx +++ b/Modules/TOF/src/CheckRawToT.cxx @@ -51,6 +51,10 @@ Quality CheckRawToT::check(std::map> float ToTIntegral = 0.f; for (auto& [moName, mo] : *moMap) { + if (!mo->encapsulatedInheritFrom("TH1F")) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1F" << ENDM; + continue; + } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; if (mo->getName().find("ToT/") != std::string::npos) { @@ -92,6 +96,10 @@ Quality CheckRawToT::check(std::map> void CheckRawToT::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; + if (!mo->encapsulatedInheritFrom("TH1F")) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH1F" << ENDM; + return; + } if (mo->getName().find("ToT/") != std::string::npos) { auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); diff --git a/Modules/TPC/src/CheckForEmptyPads.cxx b/Modules/TPC/src/CheckForEmptyPads.cxx index bd909aa7bd..44220062dd 100644 --- a/Modules/TPC/src/CheckForEmptyPads.cxx +++ b/Modules/TPC/src/CheckForEmptyPads.cxx @@ -219,9 +219,6 @@ std::string CheckForEmptyPads::summarizeMetaData(Quality quality) return sumMetaData; } -//______________________________________________________________________________ - -//______________________________________________________________________________ void CheckForEmptyPads::beautify(std::shared_ptr mo, Quality) { std::string checkMessage; diff --git a/Modules/TPC/src/PadCalibrationCheck.cxx b/Modules/TPC/src/PadCalibrationCheck.cxx index e282d57168..875e77cc58 100644 --- a/Modules/TPC/src/PadCalibrationCheck.cxx +++ b/Modules/TPC/src/PadCalibrationCheck.cxx @@ -121,9 +121,6 @@ Quality PadCalibrationCheck::check(std::map mo, Quality) { auto moName = mo->getName(); From 4131c92c7fc79b3a708ab50bca7e2daab8a86af0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 20 Aug 2025 09:58:37 +0000 Subject: [PATCH 5/8] Fix TOF check classes to use consistent types and add mAcceptedType constants Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- Modules/TOF/include/TOF/CheckHitMap.h | 2 ++ Modules/TOF/include/TOF/CheckNoise.h | 2 ++ Modules/TOF/include/TOF/CheckRawMultiplicity.h | 2 ++ Modules/TOF/include/TOF/CheckRawTime.h | 2 ++ Modules/TOF/include/TOF/CheckRawToT.h | 2 ++ Modules/TOF/src/CheckHitMap.cxx | 8 ++++---- Modules/TOF/src/CheckNoise.cxx | 10 +++++----- Modules/TOF/src/CheckRawMultiplicity.cxx | 8 ++++---- Modules/TOF/src/CheckRawTime.cxx | 8 ++++---- Modules/TOF/src/CheckRawToT.cxx | 8 ++++---- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/Modules/TOF/include/TOF/CheckHitMap.h b/Modules/TOF/include/TOF/CheckHitMap.h index 835d7ffaae..5cc94c3b77 100644 --- a/Modules/TOF/include/TOF/CheckHitMap.h +++ b/Modules/TOF/include/TOF/CheckHitMap.h @@ -60,6 +60,8 @@ class CheckHitMap : public o2::quality_control::checker::CheckInterface int mMaxHitMoreThanRef = 2; /// Maximum number of Hits more than Ref that is accepted int mMaxRefMoreThanHit = 317; /// Maximum number of Refs more than Hits that is accepted (usual 5%of enabled channels) bool mEnablePadPerMismatch = false; /// Flag to enable showing where the mismatch happens in the plot with TPads + /// Accepted type for this check + static constexpr char mAcceptedType[] = "TH2F"; ClassDefOverride(CheckHitMap, 2); }; diff --git a/Modules/TOF/include/TOF/CheckNoise.h b/Modules/TOF/include/TOF/CheckNoise.h index e6949508eb..3f031f510b 100644 --- a/Modules/TOF/include/TOF/CheckNoise.h +++ b/Modules/TOF/include/TOF/CheckNoise.h @@ -43,6 +43,8 @@ class CheckNoise : public o2::quality_control::checker::CheckInterface MessagePad mShifterMessages; /// Name of the accepted MO static constexpr char mAcceptedName[] = "hIndexEOHitRate"; + /// Accepted type for this check + static constexpr char mAcceptedType[] = "TH1F"; /// Maximum rate allowed before declaring a channel noisy float mMaxNoiseRate = 50.f; // Hz diff --git a/Modules/TOF/include/TOF/CheckRawMultiplicity.h b/Modules/TOF/include/TOF/CheckRawMultiplicity.h index bbb15733e7..3a11590aed 100644 --- a/Modules/TOF/include/TOF/CheckRawMultiplicity.h +++ b/Modules/TOF/include/TOF/CheckRawMultiplicity.h @@ -59,6 +59,8 @@ class CheckRawMultiplicity : public o2::quality_control::checker::CheckInterface // User variables /// Messages to print on the output PAD MessagePad mShifterMessages; + /// Accepted type for this check + static constexpr char mAcceptedType[] = "TH1I"; ClassDefOverride(CheckRawMultiplicity, 2); }; diff --git a/Modules/TOF/include/TOF/CheckRawTime.h b/Modules/TOF/include/TOF/CheckRawTime.h index dac4967a14..63749d5b21 100644 --- a/Modules/TOF/include/TOF/CheckRawTime.h +++ b/Modules/TOF/include/TOF/CheckRawTime.h @@ -58,6 +58,8 @@ class CheckRawTime : public o2::quality_control::checker::CheckInterface /// Messages to print on the output PAD MessagePad mShifterMessages; + /// Accepted type for this check + static constexpr char mAcceptedType[] = "TH1F"; ClassDefOverride(CheckRawTime, 2); }; diff --git a/Modules/TOF/include/TOF/CheckRawToT.h b/Modules/TOF/include/TOF/CheckRawToT.h index 3800bdcdf6..6ab2d57bba 100644 --- a/Modules/TOF/include/TOF/CheckRawToT.h +++ b/Modules/TOF/include/TOF/CheckRawToT.h @@ -49,6 +49,8 @@ class CheckRawToT : public o2::quality_control::checker::CheckInterface // User variables /// Messages to print on the output PAD MessagePad mShifterMessages; + /// Accepted type for this check + static constexpr char mAcceptedType[] = "TH1F"; ClassDefOverride(CheckRawToT, 2); }; diff --git a/Modules/TOF/src/CheckHitMap.cxx b/Modules/TOF/src/CheckHitMap.cxx index 8be95baafc..75e102c000 100644 --- a/Modules/TOF/src/CheckHitMap.cxx +++ b/Modules/TOF/src/CheckHitMap.cxx @@ -49,8 +49,8 @@ Quality CheckHitMap::check(std::map> Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom("TH2F")) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH2F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; @@ -132,8 +132,8 @@ Quality CheckHitMap::check(std::map> void CheckHitMap::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom("TH2F")) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH2F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } if (1) { diff --git a/Modules/TOF/src/CheckNoise.cxx b/Modules/TOF/src/CheckNoise.cxx index 989c3df2b9..f4beb9f9a4 100644 --- a/Modules/TOF/src/CheckNoise.cxx +++ b/Modules/TOF/src/CheckNoise.cxx @@ -36,8 +36,8 @@ Quality CheckNoise::check(std::map>* Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom("TH1F")) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } if (mo->getName() != mAcceptedName) { @@ -65,12 +65,12 @@ Quality CheckNoise::check(std::map>* void CheckNoise::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom("TH2F")) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH2F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } if (mo->getName() == mAcceptedName) { - auto* h = static_cast(mo->getObject()); + auto* h = static_cast(mo->getObject()); auto msg = mShifterMessages.MakeMessagePad(h, checkResult); if (!msg) { return; diff --git a/Modules/TOF/src/CheckRawMultiplicity.cxx b/Modules/TOF/src/CheckRawMultiplicity.cxx index fe73164bce..881a192e27 100644 --- a/Modules/TOF/src/CheckRawMultiplicity.cxx +++ b/Modules/TOF/src/CheckRawMultiplicity.cxx @@ -67,8 +67,8 @@ Quality CheckRawMultiplicity::check(std::mapencapsulatedInheritFrom("TH1")) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; @@ -155,8 +155,8 @@ Quality CheckRawMultiplicity::check(std::map mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom("TH1")) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH1" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } if (mo->getName() == "Multiplicity/Integrated") { diff --git a/Modules/TOF/src/CheckRawTime.cxx b/Modules/TOF/src/CheckRawTime.cxx index 4b4014219f..6cfb4eeb80 100644 --- a/Modules/TOF/src/CheckRawTime.cxx +++ b/Modules/TOF/src/CheckRawTime.cxx @@ -44,8 +44,8 @@ Quality CheckRawTime::check(std::map Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom("TH1F")) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; @@ -86,8 +86,8 @@ Quality CheckRawTime::check(std::map void CheckRawTime::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom("TH1F")) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH1F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } if (mo->getName().find("Time/") != std::string::npos) { diff --git a/Modules/TOF/src/CheckRawToT.cxx b/Modules/TOF/src/CheckRawToT.cxx index 5f3773ee25..af1c8d1833 100644 --- a/Modules/TOF/src/CheckRawToT.cxx +++ b/Modules/TOF/src/CheckRawToT.cxx @@ -51,8 +51,8 @@ Quality CheckRawToT::check(std::map> float ToTIntegral = 0.f; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom("TH1F")) { - ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type TH1F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } ILOG(Debug, Devel) << "Checking " << mo->getName() << ENDM; @@ -96,8 +96,8 @@ Quality CheckRawToT::check(std::map> void CheckRawToT::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom("TH1F")) { - ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type TH1F" << ENDM; + if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } if (mo->getName().find("ToT/") != std::string::npos) { From 6d590d8175dfbf72906ad9f06281fa44aa64e435 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 20 Aug 2025 10:16:58 +0000 Subject: [PATCH 6/8] Rename encapsulatedInheritFrom to encapsulatedInheritsFrom method Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- Framework/include/QualityControl/MonitorObject.h | 2 +- Framework/src/MonitorObject.cxx | 2 +- Modules/Common/src/MeanIsAbove.cxx | 2 +- Modules/TOF/src/CheckHitMap.cxx | 4 ++-- Modules/TOF/src/CheckNoise.cxx | 4 ++-- Modules/TOF/src/CheckRawMultiplicity.cxx | 4 ++-- Modules/TOF/src/CheckRawTime.cxx | 4 ++-- Modules/TOF/src/CheckRawToT.cxx | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Framework/include/QualityControl/MonitorObject.h b/Framework/include/QualityControl/MonitorObject.h index 6220b6d59b..ba7abc1954 100644 --- a/Framework/include/QualityControl/MonitorObject.h +++ b/Framework/include/QualityControl/MonitorObject.h @@ -120,7 +120,7 @@ class MonitorObject : public TObject /// \brief Check if the encapsulated object inherits from the given class name /// \param className Name of the class to check inheritance from /// \return true if the encapsulated object inherits from the given class, false otherwise - bool encapsulatedInheritFrom(std::string_view className) const; + bool encapsulatedInheritsFrom(std::string_view className) const; void Draw(Option_t* option) override; TObject* DrawClone(Option_t* option) const override; diff --git a/Framework/src/MonitorObject.cxx b/Framework/src/MonitorObject.cxx index 8676ea7723..9b2868f1a5 100644 --- a/Framework/src/MonitorObject.cxx +++ b/Framework/src/MonitorObject.cxx @@ -162,7 +162,7 @@ std::optional MonitorObject::getMetadata(const std::string& key) return std::nullopt; } -bool MonitorObject::encapsulatedInheritFrom(std::string_view className) const +bool MonitorObject::encapsulatedInheritsFrom(std::string_view className) const { if (!mObject) { return false; diff --git a/Modules/Common/src/MeanIsAbove.cxx b/Modules/Common/src/MeanIsAbove.cxx index dbf2e61010..c59be784dc 100644 --- a/Modules/Common/src/MeanIsAbove.cxx +++ b/Modules/Common/src/MeanIsAbove.cxx @@ -57,7 +57,7 @@ void MeanIsAbove::beautify(std::shared_ptr mo, Quality checkResul // A line is drawn at the level of the threshold. // Its colour depends on the quality. - if (!mo->encapsulatedInheritFrom("TH1")) { + if (!mo->encapsulatedInheritsFrom("TH1")) { ILOG(Error, Support) << "object not checkable" << ENDM; return; } diff --git a/Modules/TOF/src/CheckHitMap.cxx b/Modules/TOF/src/CheckHitMap.cxx index 75e102c000..523f75a22c 100644 --- a/Modules/TOF/src/CheckHitMap.cxx +++ b/Modules/TOF/src/CheckHitMap.cxx @@ -49,7 +49,7 @@ Quality CheckHitMap::check(std::map> Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } @@ -132,7 +132,7 @@ Quality CheckHitMap::check(std::map> void CheckHitMap::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } diff --git a/Modules/TOF/src/CheckNoise.cxx b/Modules/TOF/src/CheckNoise.cxx index f4beb9f9a4..e4d73ed6e2 100644 --- a/Modules/TOF/src/CheckNoise.cxx +++ b/Modules/TOF/src/CheckNoise.cxx @@ -36,7 +36,7 @@ Quality CheckNoise::check(std::map>* Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } @@ -65,7 +65,7 @@ Quality CheckNoise::check(std::map>* void CheckNoise::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } diff --git a/Modules/TOF/src/CheckRawMultiplicity.cxx b/Modules/TOF/src/CheckRawMultiplicity.cxx index 881a192e27..cf99b6b185 100644 --- a/Modules/TOF/src/CheckRawMultiplicity.cxx +++ b/Modules/TOF/src/CheckRawMultiplicity.cxx @@ -67,7 +67,7 @@ Quality CheckRawMultiplicity::check(std::mapencapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } @@ -155,7 +155,7 @@ Quality CheckRawMultiplicity::check(std::map mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } diff --git a/Modules/TOF/src/CheckRawTime.cxx b/Modules/TOF/src/CheckRawTime.cxx index 6cfb4eeb80..95fbea806d 100644 --- a/Modules/TOF/src/CheckRawTime.cxx +++ b/Modules/TOF/src/CheckRawTime.cxx @@ -44,7 +44,7 @@ Quality CheckRawTime::check(std::map Quality result = Quality::Null; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } @@ -86,7 +86,7 @@ Quality CheckRawTime::check(std::map void CheckRawTime::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } diff --git a/Modules/TOF/src/CheckRawToT.cxx b/Modules/TOF/src/CheckRawToT.cxx index af1c8d1833..932674d726 100644 --- a/Modules/TOF/src/CheckRawToT.cxx +++ b/Modules/TOF/src/CheckRawToT.cxx @@ -51,7 +51,7 @@ Quality CheckRawToT::check(std::map> float ToTIntegral = 0.f; for (auto& [moName, mo] : *moMap) { - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot check MO " << mo->getName() << " " << moName << " which is not of type " << mAcceptedType << ENDM; continue; } @@ -96,7 +96,7 @@ Quality CheckRawToT::check(std::map> void CheckRawToT::beautify(std::shared_ptr mo, Quality checkResult) { ILOG(Debug, Devel) << "Beautifying " << mo->getName() << ENDM; - if (!mo->encapsulatedInheritFrom(mAcceptedType)) { + if (!mo->encapsulatedInheritsFrom(mAcceptedType)) { ILOG(Error, Support) << "Cannot beautify MO " << mo->getName() << " which is not of type " << mAcceptedType << ENDM; return; } From d8d6b117fbeab48db4b0a6be4b63609b2d8a1a25 Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Wed, 20 Aug 2025 12:21:06 +0200 Subject: [PATCH 7/8] bump MonitorObject version --- Framework/include/QualityControl/MonitorObject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/include/QualityControl/MonitorObject.h b/Framework/include/QualityControl/MonitorObject.h index ba7abc1954..c4663b7a60 100644 --- a/Framework/include/QualityControl/MonitorObject.h +++ b/Framework/include/QualityControl/MonitorObject.h @@ -154,7 +154,7 @@ class MonitorObject : public TObject void releaseObject(); void cloneAndSetObject(const MonitorObject&); - ClassDefOverride(MonitorObject, 14); + ClassDefOverride(MonitorObject, 15); }; } // namespace o2::quality_control::core From 25998781adb59ad1f2ac3c225e4027471877527a Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Wed, 20 Aug 2025 13:26:40 +0200 Subject: [PATCH 8/8] missing TClass inclusion --- Framework/src/MonitorObject.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Framework/src/MonitorObject.cxx b/Framework/src/MonitorObject.cxx index 9b2868f1a5..bbc7b5c194 100644 --- a/Framework/src/MonitorObject.cxx +++ b/Framework/src/MonitorObject.cxx @@ -16,6 +16,7 @@ #include "QualityControl/MonitorObject.h" #include +#include #include "QualityControl/RepoPathUtils.h" #include "QualityControl/QcInfoLogger.h"