Skip to content

Commit 12f7dfa

Browse files
ktfBarthelemy
ktf
and
Barthelemy
authored
Use Lifetime::QA for sampled quantities (#7383)
This will make sure that sampled data will not be used to do counting of in-fly timeframes. Co-authored-by: Barthelemy <barthelemy.von.haller@cern.ch>
1 parent 02276bf commit 12f7dfa

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

‎Utilities/DataSampling/src/DataSamplingPolicy.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ DataSamplingPolicy DataSamplingPolicy::fromConfiguration(const ptree& config)
6969
}
7070
for (const auto& outputAsInputSpec : outputsAsInputSpecs) {
7171
outputSpecs.emplace_back(DataSpecUtils::asOutputSpec(outputAsInputSpec));
72+
outputSpecs.back().lifetime = Lifetime::QA;
7273
}
7374
} else { // otherwise default format will be used
7475
for (const auto& inputSpec : inputSpecs) {
@@ -78,12 +79,12 @@ DataSamplingPolicy DataSamplingPolicy::fromConfiguration(const ptree& config)
7879
createPolicyDataOrigin(),
7980
createPolicyDataDescription(name, outputId++),
8081
DataSpecUtils::getOptionalSubSpec(inputSpec).value(),
81-
inputSpec.lifetime});
82+
Lifetime::QA});
8283
} else {
8384
outputSpecs.emplace_back(OutputSpec{
8485
{inputSpec.binding},
8586
{createPolicyDataOrigin(), createPolicyDataDescription(name, outputId++)},
86-
inputSpec.lifetime});
87+
Lifetime::QA});
8788
}
8889
}
8990
}

‎Utilities/DataSampling/test/test_DataSampling.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ BOOST_AUTO_TEST_CASE(DataSamplingSimpleFlow)
6666

6767
auto output = std::find_if(disp->outputs.begin(), disp->outputs.end(),
6868
[](const OutputSpec& out) {
69-
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters0", 0}) && out.lifetime == Lifetime::Timeframe;
69+
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters0", 0}) && out.lifetime == Lifetime::QA;
7070
});
7171
BOOST_CHECK(output != disp->outputs.end());
7272

7373
output = std::find_if(disp->outputs.begin(), disp->outputs.end(),
7474
[](const OutputSpec& out) {
75-
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters1", 0}) && out.lifetime == Lifetime::Timeframe;
75+
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters1", 0}) && out.lifetime == Lifetime::QA;
7676
});
7777
BOOST_CHECK(output != disp->outputs.end());
7878

@@ -125,13 +125,13 @@ BOOST_AUTO_TEST_CASE(DataSamplingParallelFlow)
125125

126126
auto output = std::find_if(disp->outputs.begin(), disp->outputs.end(),
127127
[](const OutputSpec& out) {
128-
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters0", 0}) && out.lifetime == Lifetime::Timeframe;
128+
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters0", 0}) && out.lifetime == Lifetime::QA;
129129
});
130130
BOOST_CHECK(output != disp->outputs.end());
131131

132132
output = std::find_if(disp->outputs.begin(), disp->outputs.end(),
133133
[](const OutputSpec& out) {
134-
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters1", 0}) && out.lifetime == Lifetime::Timeframe;
134+
return DataSpecUtils::match(out, ConcreteDataMatcher{"DS", "tpcclusters1", 0}) && out.lifetime == Lifetime::QA;
135135
});
136136
BOOST_CHECK(output != disp->outputs.end());
137137

‎Utilities/DataSampling/test/test_DataSamplingPolicy.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ BOOST_AUTO_TEST_CASE(DataSamplingPolicyFromConfiguration)
6868
BOOST_CHECK((policy.prepareOutput(ConcreteDataMatcher{"TST", "CHLEB", 33})) == (Output{"DS", "my_policy0", 33}));
6969
BOOST_CHECK((policy.prepareOutput(ConcreteDataMatcher{"TST", "MLEKO", 33})) == (Output{"DS", "my_policy1", 33}));
7070
const auto& map = policy.getPathMap();
71-
BOOST_CHECK((*map.find(ConcreteDataMatcher{"TST", "CHLEB", 33})).second == (OutputSpec{"DS", "my_policy0", 33}));
72-
BOOST_CHECK((*map.find(ConcreteDataMatcher{"TST", "MLEKO", 33})).second == (OutputSpec{"DS", "my_policy1", 33}));
71+
BOOST_CHECK_EQUAL((*map.find(ConcreteDataMatcher{"TST", "CHLEB", 33})).second, (OutputSpec{"DS", "my_policy0", 33, Lifetime::QA}));
72+
BOOST_CHECK_EQUAL((*map.find(ConcreteDataMatcher{"TST", "MLEKO", 33})).second, (OutputSpec{"DS", "my_policy1", 33, Lifetime::QA}));
7373
BOOST_CHECK_EQUAL(map.size(), 2);
7474

7575
BOOST_CHECK(policy.match(ConcreteDataMatcher{"TST", "CHLEB", 33}));
@@ -97,8 +97,8 @@ BOOST_AUTO_TEST_CASE(DataSamplingPolicyFromConfiguration)
9797
BOOST_CHECK((policy.prepareOutput(ConcreteDataMatcher{"TST", "CHLEB", 33})) == (Output{"TST", "CHLEB_S", 33}));
9898
BOOST_CHECK((policy.prepareOutput(ConcreteDataMatcher{"TST", "MLEKO", 33})) == (Output{"TST", "MLEKO_S", 33}));
9999
const auto& map = policy.getPathMap();
100-
BOOST_CHECK((*map.find(ConcreteDataMatcher{"TST", "CHLEB", 33})).second == (OutputSpec{"TST", "CHLEB_S", 33}));
101-
BOOST_CHECK((*map.find(ConcreteDataMatcher{"TST", "MLEKO", 33})).second == (OutputSpec{"TST", "MLEKO_S", 33}));
100+
BOOST_CHECK_EQUAL((*map.find(ConcreteDataMatcher{"TST", "CHLEB", 33})).second, (OutputSpec{"TST", "CHLEB_S", 33, Lifetime::QA}));
101+
BOOST_CHECK_EQUAL((*map.find(ConcreteDataMatcher{"TST", "MLEKO", 33})).second, (OutputSpec{"TST", "MLEKO_S", 33, Lifetime::QA}));
102102
BOOST_CHECK_EQUAL(map.size(), 2);
103103
}
104104
// with custom outputs which are wildcards
@@ -109,8 +109,8 @@ BOOST_AUTO_TEST_CASE(DataSamplingPolicyFromConfiguration)
109109
BOOST_CHECK((policy.prepareOutput(ConcreteDataMatcher{"TST", "CHLEB", 33})) == (Output{"TST", "CHLEB_S", 33}));
110110
BOOST_CHECK((policy.prepareOutput(ConcreteDataMatcher{"TST", "MLEKO", 33})) == (Output{"TST", "MLEKO_S", 33}));
111111
const auto& map = policy.getPathMap();
112-
BOOST_CHECK((*map.find(ConcreteDataMatcher{"TST", "CHLEB", 33})).second == (OutputSpec{{"TST", "CHLEB_S"}}));
113-
BOOST_CHECK((*map.find(ConcreteDataMatcher{"TST", "MLEKO", 33})).second == (OutputSpec{{"TST", "MLEKO_S"}}));
112+
BOOST_CHECK_EQUAL((*map.find(ConcreteDataMatcher{"TST", "CHLEB", 33})).second, (OutputSpec{{"TST", "CHLEB_S"}, Lifetime::QA}));
113+
BOOST_CHECK_EQUAL((*map.find(ConcreteDataMatcher{"TST", "MLEKO", 33})).second, (OutputSpec{{"TST", "MLEKO_S"}, Lifetime::QA}));
114114
BOOST_CHECK_EQUAL(map.size(), 2);
115115
}
116116
}
@@ -138,4 +138,4 @@ BOOST_AUTO_TEST_CASE(DataSamplingPolicyStaticMethods)
138138
BOOST_CHECK(DataSamplingPolicy::createPolicyDataDescription("asdf", 0) == DataDescription("asdf0"));
139139
BOOST_CHECK(DataSamplingPolicy::createPolicyDataDescription("asdfasdfasdfasdf", 0) == DataDescription("asdfasdfasdfas0"));
140140
BOOST_CHECK(DataSamplingPolicy::createPolicyDataDescription("asdfasdfasdfasdf", 10) == DataDescription("asdfasdfasdfas10"));
141-
}
141+
}

0 commit comments

Comments
 (0)