DPL: mechanical change to the new PartsRange API

Author: ktf

Detectors/TOF/workflow/src/CompressedAnalysisTask.cxx

@@ -82,7 +82,7 @@ void CompressedAnalysisTask::run(ProcessingContext& pc)
     }
 
     /** loop over input parts **/
-    for (auto const& ref : iit) {
+    for (auto const& ref : iit.parts()) {
 
       const auto* headerIn = DataRefUtils::getHeader<o2::header::DataHeader*>(ref);
       auto payloadIn = ref.payload;

Detectors/TOF/workflow/src/CompressedInspectorTask.cxx

@@ -100,7 +100,7 @@ void CompressedInspectorTask<RDH>::run(ProcessingContext& pc)
     }
 
     /** loop over input parts **/
-    for (auto const& ref : iit) {
+    for (auto const& ref : iit.parts()) {
 
       const auto* headerIn = DataRefUtils::getHeader<o2::header::DataHeader*>(ref);
       auto payloadIn = ref.payload;

Framework/Core/src/ExternalFairMQDeviceProxy.cxx

@@ -1028,8 +1028,7 @@ DataProcessorSpec specifyFairMQDeviceOutputProxy(char const* name,
 
     return adaptStateless([lastDataProcessingHeader](InputRecord& inputs) {
       for (auto it = inputs.begin(); it != inputs.end(); it++) {
-        for (auto indices = it.initialIndices(); indices != it.endIndices(); indices = it.nextIndices(indices)) {
-          auto part = it.getAtIndices(indices);
+        for (auto const& part : it.parts()) {
           const auto* dph = o2::header::get<DataProcessingHeader*>(part.header);
           if (dph) {
             // FIXME: should we implement an assignment operator for DataProcessingHeader?
@@ -1164,8 +1163,7 @@ DataProcessorSpec specifyFairMQDeviceMultiOutputProxy(char const* name,
       // as forward routes but we need to keep a copy of the last DataProcessingHeader
       // for sending the EOS
       for (auto it = inputs.begin(); it != inputs.end(); it++) {
-        for (auto indices = it.initialIndices(); indices != it.endIndices(); indices = it.nextIndices(indices)) {
-          auto part = it.getAtIndices(indices);
+        for (auto const& part : it.parts()) {
           const auto* dph = o2::header::get<DataProcessingHeader*>(part.header);
           if (dph) {
             // FIXME: should we implement an assignment operator for DataProcessingHeader?

Framework/Core/test/test_DataAllocator.cxx

@@ -220,9 +220,9 @@ DataProcessorSpec getSinkSpec()
       dumpStack(dh);
 
       if ((*iit).spec->binding == "inputMP") {
-        LOG(info) << "inputMP with " << iit.size() << " part(s)";
+        LOG(info) << "inputMP with " << iit.parts().size() << " part(s)";
         int nPart = 0;
-        for (auto const& ref : iit) {
+        for (auto const& ref : iit.parts()) {
           LOG(info) << "accessing part " << nPart++ << " of input slot 'inputMP':"
                     << pc.inputs().get<int>(ref);
           ASSERT_ERROR(pc.inputs().get<int>(ref) == nPart * 10);
@@ -407,8 +407,8 @@ DataProcessorSpec getSpectatorSinkSpec()
                 << " payload size " << dh->payloadSize;
 
       if ((*iit).spec->binding == "inputMP") {
-        LOG(info) << "inputMP with " << iit.size() << " part(s)";
-        for (auto const& ref : iit) {
+        LOG(info) << "inputMP with " << iit.parts().size() << " part(s)";
+        for (auto const& ref : iit.parts()) {
           LOG(info) << "accessing part " << nPart << " of input slot 'inputMP':"
                     << pc.inputs().get<int>(ref);
           nPart++;

Framework/Core/test/test_InputRecord.cxx

@@ -160,11 +160,11 @@ TEST_CASE("TestInputRecord")
 
   // the 2-level iterator to access inputs and their parts
   // all inputs have 1 part, we check the first input
-  REQUIRE(record.begin().size() == 1);
+  REQUIRE(record.begin().parts().size() == 1);
   // the end-instance of the inputs has no parts
-  REQUIRE(record.end().size() == 0);
+  REQUIRE(record.end().parts().size() == 0);
   // thus there is no element and begin == end
-  REQUIRE(record.end().begin() == record.end().end());
+  REQUIRE(record.end().parts().begin() == record.end().parts().end());
 }
 
 // TODO:

Steer/DigitizerWorkflow/src/TPCDigitizerSpec.cxx

@@ -260,7 +260,7 @@ class TPCDPLDigitizerTask : public BaseDPLDigitizer
     }
 
     for (auto it = pc.inputs().begin(), end = pc.inputs().end(); it != end; ++it) {
-      for (auto const& inputref : it) {
+      for (auto const& inputref : it.parts()) {
         if (inputref.spec->lifetime == o2::framework::Lifetime::Condition) { // process does not need conditions
           continue;
         }

Utilities/DataSampling/src/Dispatcher.cxx

@@ -137,7 +137,7 @@ void Dispatcher::run(ProcessingContext& ctx)
       if (auto route = policy->match(inputMatcher); route != nullptr && policy->decide(firstPart)) {
         auto routeAsConcreteDataType = DataSpecUtils::asConcreteDataTypeMatcher(*route);
         auto dsheader = prepareDataSamplingHeader(*policy, *firstInputHeader);
-        for (const auto& part : inputIt) {
+        for (const auto& part : inputIt.parts()) {
           if (part.header != nullptr) {
             // We copy every header which is not DataHeader or DataProcessingHeader,
             // so that custom data-dependent headers are passed forward,