From 2eaaa1b8830f3459650ed5076be584c113b7bf8f Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 28 Mar 2023 15:10:54 +0200
Subject: [PATCH] L2SS-1189: L2TMSSObservationControl (lobster) should only
poll/pickup tmss observation subtasks with lofar2 stations only
---
MAC/Services/src/L2TMSSObservationControl.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/MAC/Services/src/L2TMSSObservationControl.py b/MAC/Services/src/L2TMSSObservationControl.py
index c57fc5cd25b..5e6fb35cab3 100755
--- a/MAC/Services/src/L2TMSSObservationControl.py
+++ b/MAC/Services/src/L2TMSSObservationControl.py
@@ -80,6 +80,7 @@ class L2TMSSObservationControlMessageHandler(TMSSEventMessageHandler):
now = round_to_second_precision(datetime.utcnow())
scheduled_observation_subtasks = self.tmss_client.get_subtasks(state="scheduled",
subtask_type='observation',
+ is_using_lofar2_stations=True,
scheduled_start_time_greater_then=now,
scheduled_start_time_less_then=now + LOOK_AHEAD_WINDOW)
for subtask in scheduled_observation_subtasks:
@@ -93,6 +94,10 @@ class L2TMSSObservationControlMessageHandler(TMSSEventMessageHandler):
logger.debug("skipping %s %s subtask id=%s", subtask['state_value'], subtask['subtask_type'], subtask_id)
return
+ if not subtask['is_using_lofar2_stations']:
+ logger.debug("skipping %s %s subtask id=%s because it is not using lofar2 stations", subtask['state_value'], subtask['subtask_type'], subtask_id)
+ return
+
scheduled_start_time = parser.parse(subtask['scheduled_start_time'], ignoretz=True)
time_to_start = scheduled_start_time - datetime.utcnow()
@@ -137,6 +142,10 @@ class L2TMSSObservationControlMessageHandler(TMSSEventMessageHandler):
logger.debug("skipping %s %s subtask id=%s", subtask['state_value'], subtask['subtask_type'], subtask_id)
return
+ if not subtask['is_using_lofar2_stations']:
+ logger.debug("skipping %s %s subtask id=%s because it is not using lofar2 stations", subtask['state_value'], subtask['subtask_type'], subtask_id)
+ return
+
scheduled_start_time = parser.parse(subtask['scheduled_start_time'], ignoretz=True)
time_to_start = scheduled_start_time - datetime.utcnow()
--
GitLab