Merge branch 'master' into fixes-refactors-ppconfig

Author: Barthelemy

CMakeLists.txt

@@ -13,7 +13,7 @@ include(GNUInstallDirs)
 # ---- Project ----
 
 project(QualityControl
-        VERSION 1.171.0
+        VERSION 1.172.0
         DESCRIPTION "O2 Data Quality Control Framework"
         LANGUAGES C CXX)
 

Framework/CMakeLists.txt

@@ -116,7 +116,6 @@ add_library(O2QualityControl
   src/UpdatePolicyManager.cxx
   src/AdvancedWorkflow.cxx
   src/QualitiesToFlagCollectionConverter.cxx
-  src/Calculators.cxx
   src/DataSourceSpec.cxx
   src/RootFileSink.cxx
   src/RootFileSource.cxx
@@ -201,8 +200,6 @@ set(EXE_SRCS
   src/runRepositoryBenchmark.cxx
   src/runPostProcessing.cxx
   src/runPostProcessingOCC.cxx
-  src/runLocationCalculator.cxx
-  src/runMergerCalculator.cxx
   src/runUploadRootObjects.cxx
   src/runFileMerger.cxx
   src/runMetadataUpdater.cxx
@@ -219,8 +216,6 @@ set(EXE_NAMES
   o2-qc-repository-benchmark
   o2-qc-run-postprocessing
   o2-qc-run-postprocessing-occ
-  o2-qc-location-calculator
-  o2-qc-merger-calculator
   o2-qc-upload-root-objects
   o2-qc-file-merger
   o2-qc-metadata-updater
@@ -239,8 +234,6 @@ set(EXE_OLD_NAMES
   repositoryBenchmark
   qcRunPostProcessing
   qcRunPostProcessingOCC
-  o2-qc-location-calculator
-  o2-qc-merger-calculator
   o2-qc-upload-root-objects
   o2-qc-file-merger
   o2-qc-metadata-updater

Framework/example-default.json

@@ -184,9 +184,6 @@
       }
     }
   },
-  "dataSamplingPoliciesFile_comment": "In case that policies are stored in different file, specify its path below. When both dataSamplingPolicies and dataSamplingPoliciesFile are specified, the latter has higher priority",
-  "dataSamplingPoliciesFile": "json:///home/genghiskhan/alice/QualityControl/dataSamplingConfig.json",
-  "dataSamplingPolicies_comment": "this is ignored when dataSamplingPoliciesFile is specified",
   "dataSamplingPolicies": [
     {
       "id": "ex1",
@@ -215,4 +212,4 @@
       ]
     }
   ]
-}
+}

Framework/include/QualityControl/Calculators.h

@@ -68,6 +68,7 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p
       customParameters.set(key, value.get_value<std::string>());
     }
   }
+  validityFromLastTriggerOnly = ppTree.get<bool>("validityFromLastTriggerOnly", false);
 }
 
 } // namespace o2::quality_control::postprocessing

Framework/src/Calculators.cxx

@@ -251,6 +251,10 @@ void PostProcessingRunner::reset()
 
 void PostProcessingRunner::updateValidity(const Trigger& trigger)
 {
+  if (mTaskConfig.validityFromLastTriggerOnly) {
+    mActivity.mValidity = gInvalidValidityInterval;
+  }
+
   if (trigger == TriggerType::UserOrControl) {
     // we ignore it, because it would not make sense to use current time in tracking objects from the past,
     // especially in asynchronous postprocessing