Skip to content

Commit d1d5fad

Browse files
knopers8Barthelemy
authored andcommitted
Fix creating triggers by using the activity from the driver (#2205)
full range validity is used so that we do not exclude objects by being given incorrect SOR/EOR by ECS
1 parent 46c89ce commit d1d5fad

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

Framework/src/PostProcessingRunner.cxx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,10 @@ void PostProcessingRunner::start(framework::ServiceRegistryRef dplServices)
189189
}
190190

191191
if (mTaskState == TaskState::Created || mTaskState == TaskState::Finished) {
192-
mInitTriggers = trigger_helpers::createTriggers(mTaskConfig.initTriggers, mTaskConfig);
192+
auto taskConfigWithCorrectActivity = mTaskConfig;
193+
taskConfigWithCorrectActivity.activity = activityFromDriver;
194+
taskConfigWithCorrectActivity.activity.mValidity = gFullValidityInterval;
195+
mInitTriggers = trigger_helpers::createTriggers(mTaskConfig.initTriggers, taskConfigWithCorrectActivity);
193196
if (trigger_helpers::hasUserOrControlTrigger(mTaskConfig.initTriggers)) {
194197
doInitialize({ TriggerType::UserOrControl, false, activityFromDriver, activityFromDriver.mValidity.getMin() });
195198
}
@@ -274,8 +277,11 @@ void PostProcessingRunner::doInitialize(const Trigger& trigger)
274277
mTaskState = TaskState::Running;
275278

276279
// We create the triggers just after task init (and not any sooner), so the timer triggers work as expected.
277-
mUpdateTriggers = trigger_helpers::createTriggers(mTaskConfig.updateTriggers, mTaskConfig);
278-
mStopTriggers = trigger_helpers::createTriggers(mTaskConfig.stopTriggers, mTaskConfig);
280+
auto taskConfigWithCorrectActivity = mTaskConfig;
281+
taskConfigWithCorrectActivity.activity = mActivity;
282+
taskConfigWithCorrectActivity.activity.mValidity = gFullValidityInterval;
283+
mUpdateTriggers = trigger_helpers::createTriggers(mTaskConfig.updateTriggers, taskConfigWithCorrectActivity);
284+
mStopTriggers = trigger_helpers::createTriggers(mTaskConfig.stopTriggers, taskConfigWithCorrectActivity);
279285
}
280286

281287
void PostProcessingRunner::doUpdate(const Trigger& trigger)

0 commit comments

Comments
 (0)