Skip to content

QC-1246 Explicit Quality constructor to avoid implicit casts from int #2472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Barthelemy merged 1 commit into from
Nov 7, 2024
Merged

QC-1246 Explicit Quality constructor to avoid implicit casts from int #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Framework/include/QualityControl/Quality.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions Framework/test/testAggregatorInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ TEST_CASE("test_invoke_all_methods")
test::SimpleTestAggregator testAggregator;

// prepare data
std::shared_ptr<QualityObject> qo_null = make_shared<QualityObject>(0, "testCheckNull", "TST");
std::shared_ptr<QualityObject> qo_good = make_shared<QualityObject>(1, "testCheckGood", "TST");
std::shared_ptr<QualityObject> qo_medium = make_shared<QualityObject>(2, "testCheckMedium", "TST");
std::shared_ptr<QualityObject> qo_bad = make_shared<QualityObject>(3, "testCheckBad", "TST");
std::shared_ptr<QualityObject> qo_null = make_shared<QualityObject>(Quality::Null, "testCheckNull", "TST");
std::shared_ptr<QualityObject> qo_good = make_shared<QualityObject>(Quality::Good, "testCheckGood", "TST");
std::shared_ptr<QualityObject> qo_medium = make_shared<QualityObject>(Quality::Medium, "testCheckMedium", "TST");
std::shared_ptr<QualityObject> qo_bad = make_shared<QualityObject>(Quality::Bad, "testCheckBad", "TST");
QualityObjectsMapType input;

std::map<std::string, Quality> result1 = testAggregator.aggregate(input);
Expand Down
12 changes: 3 additions & 9 deletions Framework/test/testBookkeepingQualitySink.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
///

#include <DataFormatsQualityControl/QualityControlFlag.h>
#include <DataSampling/DataSampling.h>
#include "QualityControl/BookkeepingQualitySink.h"
#include "QualityControl/InfrastructureGenerator.h"

using namespace o2;
using namespace o2::framework;
using namespace o2::utilities;

void customize(std::vector<CompletionPolicy>& policies)
{
Expand All @@ -30,12 +28,8 @@ void customize(std::vector<CompletionPolicy>& policies)

#include <Framework/runDataProcessing.h>
#include <Framework/ControlService.h>
#include <Configuration/ConfigurationFactory.h>
#include <Configuration/ConfigurationInterface.h>
#include <QualityControl/BookkeepingQualitySink.h>
#include <QualityControl/QualityObject.h>

using namespace o2::configuration;
#include "QualityControl/QualityObject.h"
#include "QualityControl/Quality.h"

void compareFatal(const quality_control::QualityControlFlag& got, const quality_control::QualityControlFlag& expected)
{
Expand All @@ -57,7 +51,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
Inputs{},
Outputs{ { { "tst-qo" }, "TST", "DATA" } },
AlgorithmSpec{ [](ProcessingContext& ctx) {
auto obj = std::make_unique<core::QualityObject>(0, "testCheckNull", "TST");
auto obj = std::make_unique<core::QualityObject>(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);
Expand Down
3 changes: 0 additions & 3 deletions Modules/TRD/src/PulsePositionCheck.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,6 @@ void PulsePositionCheck::beautify(std::shared_ptr<MonitorObject> 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();
Expand Down
Loading