simplifying logic and accounting for multiple pipelines

Author: ehellbar

Framework/Core/src/runDataProcessing.cxx

@@ -2956,14 +2956,11 @@ int doMain(int argc, char** argv, o2::framework::WorkflowSpec const& workflow,
     // We remove the duplicates because for the moment child get themself twice:
     // once from the actual definition in the child, a second time from the
     // configuration they get passed by their parents.
+    std::regex pipe_pattern{"_t[0-9][0-9]*$"};
     for (auto& dp : importedWorkflow) {
-      auto found = std::find_if(physicalWorkflow.begin(), physicalWorkflow.end(),
-                                [&name = dp.name](DataProcessorSpec const& spec) { return spec.name == name; });
-      // also checking the workflow for processors with the same name but from a different executable,
-      // adding them to the workflow to trigger the check for duplicate names in the MATERIALISE_WORKFLOW state
-      auto duplicate_name = std::find_if(dataProcessorInfos.begin(), dataProcessorInfos.end(),
-                                         [&name = dp.name, &exec = currentWorkflow.executable](DataProcessorInfo const& info) { return (info.name == name && info.executable != exec); });
-      if (found == physicalWorkflow.end() || duplicate_name != dataProcessorInfos.end()) {
+      auto found = std::find_if(dataProcessorInfos.begin(), dataProcessorInfos.end(),
+                                [&name = dp.name, &pipe_pattern, &exec = currentWorkflow.executable](DataProcessorInfo const& info) { return (std::regex_replace(info.name, pipe_pattern, "") == name && info.executable == exec); });
+      if (found == dataProcessorInfos.end()) {
         physicalWorkflow.push_back(dp);
         rankIndex.insert(std::make_pair(dp.name, workflowHashB));
       }