diff --git a/Framework/include/QualityControl/TrendingTaskConfig.h b/Framework/include/QualityControl/TrendingTaskConfig.h index 5f4e3969ff..86181e8840 100644 --- a/Framework/include/QualityControl/TrendingTaskConfig.h +++ b/Framework/include/QualityControl/TrendingTaskConfig.h @@ -61,7 +61,7 @@ struct TrendingTaskConfig : PostProcessingConfig { bool producePlotsOnUpdate{}; bool resumeTrend{}; - bool trendOnlyIfAllInputsAreAvailable{ false }; + bool trendIfAllInputs{ false }; std::vector plots; std::vector dataSources; }; diff --git a/Framework/src/TrendingTask.cxx b/Framework/src/TrendingTask.cxx index c3ccbd2101..b999f8541a 100644 --- a/Framework/src/TrendingTask.cxx +++ b/Framework/src/TrendingTask.cxx @@ -159,7 +159,7 @@ void TrendingTask::update(Trigger t, framework::ServiceRegistryRef services) auto& qcdb = services.get(); const auto allSourcesInvoked = trendValues(t, qcdb); - if (mConfig.producePlotsOnUpdate && (!mConfig.trendOnlyIfAllInputsAreAvailable || allSourcesInvoked)) { + if (mConfig.producePlotsOnUpdate && (!mConfig.trendIfAllInputs || allSourcesInvoked)) { generatePlots(); } } @@ -189,7 +189,7 @@ bool TrendingTask::trendValues(const Trigger& t, repository::DatabaseInterface& } } - if (!mConfig.trendOnlyIfAllInputsAreAvailable || wereAllSourcesInvoked) { + if (!mConfig.trendIfAllInputs || wereAllSourcesInvoked) { mTrend->Fill(); } diff --git a/Framework/src/TrendingTaskConfig.cxx b/Framework/src/TrendingTaskConfig.cxx index e34b58307d..8d484151ba 100644 --- a/Framework/src/TrendingTaskConfig.cxx +++ b/Framework/src/TrendingTaskConfig.cxx @@ -25,7 +25,7 @@ TrendingTaskConfig::TrendingTaskConfig(std::string id, const boost::property_tre { producePlotsOnUpdate = config.get("qc.postprocessing." + id + ".producePlotsOnUpdate", true); resumeTrend = config.get("qc.postprocessing." + id + ".resumeTrend", false); - trendOnlyIfAllInputsAreAvailable = config.get("qc.postprocessing." + id + ".trendOnlyIfAllInputsAreAvailable", false); + trendIfAllInputs = config.get("qc.postprocessing." + id + ".trendIfAllInputs", false); for (const auto& [_, plotConfig] : config.get_child("qc.postprocessing." + id + ".plots")) { // since QC-1155 we allow for more than one graph in a single plot (canvas). we support both the new and old ways diff --git a/Framework/test/testTrendingTask.cxx b/Framework/test/testTrendingTask.cxx index 6350f0c0f9..bbe1530041 100644 --- a/Framework/test/testTrendingTask.cxx +++ b/Framework/test/testTrendingTask.cxx @@ -78,7 +78,7 @@ TEST_CASE("test_trending_task") "active": "true", "taskName": "TestTrendingTask", "className": "o2::quality_control::postprocessing::TrendingTask", - "trendOnlyIfAllInputsAreAvailable": true, + "trendIfAllInputs": true, "moduleName": "QualityControl", "detectorName": "TST", "dataSources": [ @@ -134,7 +134,7 @@ TEST_CASE("test_trending_task") repository->truncate("qc/TST/MO/" + taskName, "*"); repository->truncate("qc/TST/QO", checkName); - // Test "trendOnlyIfAllInputsAreAvailable". There should not be anything in DB so we don't have any input sources available + // Test "trendIfAllInputs". There should not be anything in DB so we don't have any input sources available { auto objectManager = std::make_shared(taskName, "o2::quality_control::postprocessing::TrendingTask", "TST", ""); ServiceRegistry services; diff --git a/doc/PostProcessing.md b/doc/PostProcessing.md index a3d1dc3334..aa1cd289c3 100644 --- a/doc/PostProcessing.md +++ b/doc/PostProcessing.md @@ -389,7 +389,7 @@ use the boolean flag `"producePlotsOnUpdate"`. To pick up the last existing trend which matches the specified Activity, set `"resumeTrend"` to `"true"`. -To generate plots only when all input objects are available, set `"trendOnlyIfAllInputsAreAvailable"`. +To generate plots only when all input objects are available, set `"trendIfAllInputs"`. ### The SliceTrendingTask class The `SliceTrendingTask` is a complementary task to the standard `TrendingTask`. This task allows the trending of canvas objects that hold multiple histograms (which have to be of the same dimension, e.g. TH1) and the slicing of histograms. The latter option allows the user to divide a histogram into multiple subsections along one or two dimensions which are trended in parallel to each other. The task has specific reductors for `TH1` and `TH2` objects which are `o2::quality_control_modules::common::TH1SliceReductor` and `o2::quality_control_modules::common::TH2SliceReductor`.