Follow changes of OutputSpec in O2 (#183)

Author: knopers8

Framework/src/Checker.cxx

@@ -24,6 +24,7 @@
 #include <Common/Exceptions.h>
 #include <Configuration/ConfigurationFactory.h>
 #include <Framework/DataRefUtils.h>
+#include <Framework/DataSpecUtils.h>
 #include <TMap.h>
 // QC
 #include "QualityControl/DatabaseFactory.h"
@@ -188,9 +189,9 @@ void Checker::store(std::shared_ptr<MonitorObject> mo)
 void Checker::send(std::unique_ptr<TObjArray>& moArray, framework::DataAllocator& allocator)
 {
   mLogger << "Sending Monitor Object array with " << moArray->GetEntries() << " objects inside." << AliceO2::InfoLogger::InfoLogger::endm;
-
+  auto concreteOutput = framework::DataSpecUtils::asConcreteDataMatcher(mOutputSpec);
   allocator.adopt(
-    framework::Output{ mOutputSpec.origin, mOutputSpec.description, mOutputSpec.subSpec, mOutputSpec.lifetime }, moArray.release());
+    framework::Output{ concreteOutput.origin, concreteOutput.description, concreteOutput.subSpec, mOutputSpec.lifetime }, moArray.release());
 }
 
 void Checker::loadLibrary(const std::string libraryName)

Framework/src/HistoMerger.cxx

@@ -14,7 +14,7 @@
 ///
 
 #include "QualityControl/HistoMerger.h"
-
+#include <Framework/DataSpecUtils.h>
 #include <Framework/DataRefUtils.h>
 #include <TObjArray.h>
 
@@ -64,7 +64,8 @@ void HistoMerger::run(framework::ProcessingContext& ctx)
   }
   if (mPublicationTimer.isTimeout()) {
     if (!mMergedArray.IsEmpty()) {
-      ctx.outputs().snapshot(Output{ mOutputSpec.origin, mOutputSpec.description, mOutputSpec.subSpec }, mMergedArray);
+      auto concreteOutput = framework::DataSpecUtils::asConcreteDataMatcher(mOutputSpec);
+      ctx.outputs().snapshot(Output{ concreteOutput.origin, concreteOutput.description, concreteOutput.subSpec }, mMergedArray);
     }
     // avoid publishing mo many times consecutively because of too long initial waiting time
     do {

Framework/src/TaskRunner.cxx

@@ -26,6 +26,7 @@
 #include <Framework/DataSamplingPolicy.h>
 #include <Framework/CallbackService.h>
 #include <Framework/TimesliceIndex.h>
+#include <Framework/DataSpecUtils.h>
 #include <Headers/DataHeader.h>
 #include <Monitoring/MonitoringFactory.h>
 #include "QualityControl/QcInfoLogger.h"
@@ -378,10 +379,11 @@ void TaskRunner::finishCycle(DataAllocator& outputs)
 
 unsigned long TaskRunner::publish(DataAllocator& outputs)
 {
+  auto concreteOutput = framework::DataSpecUtils::asConcreteDataMatcher(mMonitorObjectsSpec);
   outputs.adopt(
-    Output{ mMonitorObjectsSpec.origin,
-            mMonitorObjectsSpec.description,
-            mMonitorObjectsSpec.subSpec,
+    Output{ concreteOutput.origin,
+            concreteOutput.description,
+            concreteOutput.subSpec,
             mMonitorObjectsSpec.lifetime },
     dynamic_cast<TObject*>(mObjectsManager->getNonOwningArray()));
 

Framework/test/testInfrastructureGenerator.cxx

@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(qc_factory_local_test)
     BOOST_CHECK_EQUAL(workflow[0].name, "skeletonTask");
     BOOST_CHECK_EQUAL(workflow[0].inputs.size(), 1);
     BOOST_CHECK_EQUAL(workflow[0].outputs.size(), 1);
-    BOOST_CHECK_EQUAL(workflow[0].outputs[0].subSpec, 1);
+    BOOST_CHECK_EQUAL(DataSpecUtils::getOptionalSubSpec(workflow[0].outputs[0]).value_or(-1), 1);
   }
 
   {
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(qc_factory_local_test)
     BOOST_CHECK_EQUAL(workflow[0].name, "skeletonTask");
     BOOST_CHECK_EQUAL(workflow[0].inputs.size(), 1);
     BOOST_CHECK_EQUAL(workflow[0].outputs.size(), 1);
-    BOOST_CHECK_EQUAL(workflow[0].outputs[0].subSpec, 2);
+    BOOST_CHECK_EQUAL(DataSpecUtils::getOptionalSubSpec(workflow[0].outputs[0]).value_or(-1), 2);
   }
 
   {
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(qc_factory_remote_test)
       auto concreteInput1 = DataSpecUtils::asConcreteDataMatcher(d.inputs[1]);
       return d.name == "skeletonTask-merger" &&
              d.inputs.size() == 2 && concreteInput0.subSpec == 1 && concreteInput1.subSpec == 2 &&
-             d.outputs.size() == 1 && d.outputs[0].subSpec == 0;
+             d.outputs.size() == 1 && DataSpecUtils::getOptionalSubSpec(d.outputs[0]).value_or(-1) == 0;
     });
   BOOST_CHECK(mergerSkeletonTask != workflow.end());