diff --git a/Framework/include/QualityControl/Quality.h b/Framework/include/QualityControl/Quality.h index b05871aee5..cac8c85632 100644 --- a/Framework/include/QualityControl/Quality.h +++ b/Framework/include/QualityControl/Quality.h @@ -35,7 +35,7 @@ class Quality { public: /// Default constructor - Quality(unsigned int level = Quality::NullLevel, std::string name = ""); + explicit Quality(unsigned int level = Quality::NullLevel, std::string name = ""); /// Destructor virtual ~Quality() = default; diff --git a/Framework/test/testAggregatorInterface.cxx b/Framework/test/testAggregatorInterface.cxx index f2cd1924dc..e71cc57f57 100644 --- a/Framework/test/testAggregatorInterface.cxx +++ b/Framework/test/testAggregatorInterface.cxx @@ -78,10 +78,10 @@ TEST_CASE("test_invoke_all_methods") test::SimpleTestAggregator testAggregator; // prepare data - std::shared_ptr qo_null = make_shared(0, "testCheckNull", "TST"); - std::shared_ptr qo_good = make_shared(1, "testCheckGood", "TST"); - std::shared_ptr qo_medium = make_shared(2, "testCheckMedium", "TST"); - std::shared_ptr qo_bad = make_shared(3, "testCheckBad", "TST"); + std::shared_ptr qo_null = make_shared(Quality::Null, "testCheckNull", "TST"); + std::shared_ptr qo_good = make_shared(Quality::Good, "testCheckGood", "TST"); + std::shared_ptr qo_medium = make_shared(Quality::Medium, "testCheckMedium", "TST"); + std::shared_ptr qo_bad = make_shared(Quality::Bad, "testCheckBad", "TST"); QualityObjectsMapType input; std::map result1 = testAggregator.aggregate(input); diff --git a/Framework/test/testBookkeepingQualitySink.cxx b/Framework/test/testBookkeepingQualitySink.cxx index 319a3e366f..2862d6627d 100644 --- a/Framework/test/testBookkeepingQualitySink.cxx +++ b/Framework/test/testBookkeepingQualitySink.cxx @@ -15,13 +15,11 @@ /// #include -#include #include "QualityControl/BookkeepingQualitySink.h" #include "QualityControl/InfrastructureGenerator.h" using namespace o2; using namespace o2::framework; -using namespace o2::utilities; void customize(std::vector& policies) { @@ -30,12 +28,8 @@ void customize(std::vector& policies) #include #include -#include -#include -#include -#include - -using namespace o2::configuration; +#include "QualityControl/QualityObject.h" +#include "QualityControl/Quality.h" void compareFatal(const quality_control::QualityControlFlag& got, const quality_control::QualityControlFlag& expected) { @@ -57,7 +51,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const&) Inputs{}, Outputs{ { { "tst-qo" }, "TST", "DATA" } }, AlgorithmSpec{ [](ProcessingContext& ctx) { - auto obj = std::make_unique(0, "testCheckNull", "TST"); + auto obj = std::make_unique(core::Quality::Null, "testCheckNull", "TST"); obj->getActivity().mValidity = core::ValidityInterval{ 10, 500 }; obj->addFlag(FlagTypeFactory::Good(), "I am comment"); ctx.outputs().snapshot(Output{ "TST", "DATA", 0 }, *obj); diff --git a/Modules/TRD/src/PulsePositionCheck.cxx b/Modules/TRD/src/PulsePositionCheck.cxx index 7fefd4d7f7..4787d1276d 100644 --- a/Modules/TRD/src/PulsePositionCheck.cxx +++ b/Modules/TRD/src/PulsePositionCheck.cxx @@ -229,9 +229,6 @@ void PulsePositionCheck::beautify(std::shared_ptr mo, Quality che } else if (checkResult == Quality::Null) { ILOG(Debug, Devel) << "Quality::Null, setting to Blue" << ENDM; h->SetFillColor(kBlue); - } else if (checkResult == Quality::NullLevel) { - ILOG(Debug, Devel) << "Quality::Null, setting to Pink" << ENDM; - h->SetFillColor(kPink); } h->SetLineColor(kBlack); h->Draw();