Skip to content

Commit f7868da

Browse files
committed
DPL: cleanup creation of DataProcessorInfo
- Use aggregate initialisation where possible - Drop unused bits Will simplify the plugins PR.
1 parent f51a696 commit f7868da

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

Framework/Core/src/runDataProcessing.cxx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,12 +1644,11 @@ int runStateMachine(DataProcessorSpecs const& workflow,
16441644
channels.push_back(channel.name);
16451645
}
16461646
dataProcessorInfos.push_back(
1647-
DataProcessorInfo{
1648-
device.id,
1649-
workflowInfo.executable,
1650-
workflowInfo.args,
1651-
workflowInfo.options,
1652-
channels});
1647+
{.name = device.id,
1648+
.executable = workflowInfo.executable,
1649+
.cmdLineArgs = workflowInfo.args,
1650+
.workflowOptions = workflowInfo.options,
1651+
.channels = channels});
16531652
}
16541653
break;
16551654
case DriverState::MATERIALISE_WORKFLOW:
@@ -2123,7 +2122,7 @@ int runStateMachine(DataProcessorSpecs const& workflow,
21232122
frameworkId = spawnDevice(loop,
21242123
ref,
21252124
runningWorkflow.devices,
2126-
driverInfo,
2125+
driverInfo,
21272126
driverControl,
21282127
controls, deviceExecutions, infos,
21292128
allStates,
@@ -2894,9 +2893,9 @@ int doMain(int argc, char** argv, o2::framework::WorkflowDefinitionContext& work
28942893
}
28952894

28962895
WorkflowInfo currentWorkflow{
2897-
argv[0],
2898-
currentArgs,
2899-
workflowContext.workflowOptions};
2896+
.executable = argv[0],
2897+
.args = currentArgs,
2898+
.options = workflowContext.workflowOptions};
29002899

29012900
ProcessingPolicies processingPolicies;
29022901
enum LogParsingHelpers::LogLevel minFailureLevel;

0 commit comments

Comments
 (0)