Skip to content

Commit b1e196b

Browse files
committed
Revert "[QC-1031]: changed origin for QC Check (AliceO2Group#2170)"
This reverts commit cd342d8.
1 parent 219f86c commit b1e196b

File tree

5 files changed

+8
-21
lines changed

5 files changed

+8
-21
lines changed

Framework/include/QualityControl/Check.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,13 @@ class Check
7979
// TODO: Unique Input string
8080
static o2::header::DataDescription createCheckDataDescription(const std::string& checkName);
8181

82-
/// \brief creates DataOrigin for Check task in form CDET
83-
///
84-
/// \param detector Name of the detector to be used. If longer than 3B it will be truncated
85-
static o2::header::DataOrigin createCheckDataOrigin(const std::string& detector);
86-
8782
UpdatePolicyType getUpdatePolicyType() const;
8883
std::vector<std::string> getObjectsNames() const;
8984
bool getAllObjectsOption() const;
9085

9186
// todo: probably make CheckFactory
9287
static CheckConfig extractConfig(const core::CommonSpec&, const CheckSpec&);
93-
static framework::OutputSpec createOutputSpec(const std::string& detector, const std::string& checkName);
88+
static framework::OutputSpec createOutputSpec(const std::string& checkName);
9489

9590
private:
9691
void beautify(std::map<std::string, std::shared_ptr<core::MonitorObject>>& moMap, const core::Quality& quality);

Framework/src/Check.cxx

+3-11
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ o2::header::DataDescription Check::createCheckDataDescription(const std::string&
5353
return quality_control::core::createDataDescription(checkName, Check::descriptionHashLength);
5454
}
5555

56-
o2::header::DataOrigin Check::createCheckDataOrigin(const std::string& detector)
57-
{
58-
using Origin = o2::header::DataOrigin;
59-
Origin header;
60-
header.runtimeInit(std::string{ "C" }.append(detector.substr(0, Origin::size - 1)).c_str());
61-
return header;
62-
}
63-
6456
/// Members
6557
Check::Check(CheckConfig config)
6658
: mCheckConfig(std::move(config))
@@ -268,14 +260,14 @@ CheckConfig Check::extractConfig(const CommonSpec& commonSpec, const CheckSpec&
268260
checkAllObjects,
269261
allowBeautify,
270262
std::move(inputs),
271-
createOutputSpec(checkSpec.detectorName, checkSpec.checkName),
263+
createOutputSpec(checkSpec.checkName),
272264
commonSpec.conditionDBUrl
273265
};
274266
}
275267

276-
framework::OutputSpec Check::createOutputSpec(const std::string& detector, const std::string& checkName)
268+
framework::OutputSpec Check::createOutputSpec(const std::string& checkName)
277269
{
278-
return { createCheckDataOrigin(detector), createCheckDataDescription(checkName), 0, framework::Lifetime::Sporadic };
270+
return { "QC", createCheckDataDescription(checkName), 0, framework::Lifetime::Sporadic };
279271
}
280272

281273
void Check::startOfActivity(const core::Activity& activity)

Framework/test/testCheck.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(test_check_specs)
6666
BOOST_REQUIRE_EQUAL(check.getInputs().size(), 1);
6767
BOOST_CHECK_EQUAL(check.getInputs()[0], (InputSpec{ { "mo" }, "QTST", "skeletonTask", 0, Lifetime::Sporadic }));
6868

69-
BOOST_CHECK_EQUAL(check.getOutputSpec(), (OutputSpec{ "CDET", "singleCheck", 0, Lifetime::Sporadic }));
69+
BOOST_CHECK_EQUAL(check.getOutputSpec(), (OutputSpec{ "QC", "singleCheck", 0, Lifetime::Sporadic }));
7070
}
7171

7272
BOOST_AUTO_TEST_CASE(test_check_long_description)
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(test_check_long_description)
7878
BOOST_REQUIRE_EQUAL(check.getInputs().size(), 1);
7979
BOOST_CHECK_EQUAL(check.getInputs()[0], (InputSpec{ { "mo" }, "QTST", "skeletonTask", 0, Lifetime::Sporadic }));
8080

81-
BOOST_CHECK_EQUAL(check.getOutputSpec(), (OutputSpec{ "CDET", "singleCheckL9fdb", 0, Lifetime::Sporadic }));
81+
BOOST_CHECK_EQUAL(check.getOutputSpec(), (OutputSpec{ "QC", "singleCheckL9fdb", 0, Lifetime::Sporadic }));
8282
}
8383

8484
std::shared_ptr<MonitorObject> dummyMO(const std::string& objName)

Framework/test/testCheckWorkflow.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class Receiver : public framework::Task
110110
{
111111
Inputs inputs;
112112
for (auto& checkName : mNames) {
113-
inputs.push_back({ checkName, "CTST", Check::createCheckDataDescription(checkName), Lifetime::Sporadic });
113+
inputs.push_back({ checkName, "QC", Check::createCheckDataDescription(checkName), Lifetime::Sporadic });
114114
}
115115
return inputs;
116116
}

Framework/test/testWorkflow.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
7474
DataProcessorSpec receiver{
7575
"receiver",
7676
Inputs{
77-
{ "checked-mo", "CTST", Check::createCheckDataDescription(getFirstCheckName(qcConfigurationSource)), 0, Lifetime::Sporadic } },
77+
{ "checked-mo", "QC", Check::createCheckDataDescription(getFirstCheckName(qcConfigurationSource)), 0, Lifetime::Sporadic } },
7878
Outputs{},
7979
AlgorithmSpec{
8080
[](ProcessingContext& pctx) {

0 commit comments

Comments
 (0)