diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_control.py b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
index 711228aedbdec6985e2308975e9fc97b033dd1d2..4a1bb9f0cefa233acd145e70738841a88a251be8 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation_control.py
+++ b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
@@ -157,7 +157,6 @@ class ObservationControl(lofar_device):
@log_exceptions()
def read_running_observations_R(self):
obs = [ key for key in self.running_observations ]
- logger.debug(obs)
return obs
@log_exceptions()
@@ -171,7 +170,7 @@ class ObservationControl(lofar_device):
"""
if event.err:
# Something is fishy with this event.
- logger.warning("The Observation device %s sent an event but the event signals an error. It is advised to check the logs for any indication that something went wrong in that device. Event data=%s", event.device, event)
+ logger.warning(f"The Observation device {event.device} sent an event but the event signals an error. It is advised to check the logs for any indication that something went wrong in that device. Event data={event}")
return
# Get the Observation ID from the sending device.
@@ -181,7 +180,7 @@ class ObservationControl(lofar_device):
running_obs = self.running_observations.copy()
if not running_obs:
# No obs is running???
- logger.warning("Received an observation_running event for the observation with ID=%s. According to the records in ObservationControl, this observation is not supposed to run. Please check previous logs, especially around the time an observation with this ID was started. Will continue and ignore this event.", obs_id)
+ logger.warning(f"Received an observation_running event for the observation with ID={obs_id}. According to the records in ObservationControl, this observation is not supposed to run. Please check previous logs, especially around the time an observation with this ID was started. Will continue and ignore this event.")
return
if obs_id in running_obs:
@@ -257,12 +256,12 @@ class ObservationControl(lofar_device):
except DevFailed as ex:
if ex.args[0].desc == f"The device {device_name.lower()} is already defined in the database" and self.is_observation_running(observation_id) is False :
self.tango_util.delete_device(class_name, device_name)
- error_string = "Cannot create the Observation device %s because it is already present in the Database but it is not running. Try to re-run the start_observation command"
- logger.exception(error_string, device_name)
+ error_string = f"Cannot create the Observation device {device_name} because it is already present in the Database but it is not running. Try to re-run the start_observation command"
+ logger.exception(error_string)
Except.re_throw_exception(ex, "DevFailed", error_string, __name__)
else:
- error_string = "Cannot create the Observation device instance %s for ID=%s. This means that the observation did not start."
- logger.exception(error_string, device_name, observation_id)
+ error_string = f"Cannot create the Observation device instance {device_name} for ID={observation_id}. This means that the observation did not start."
+ logger.exception(error_string)
Except.re_throw_exception(ex, "DevFailed", error_string, __name__)
try:
@@ -285,8 +284,8 @@ class ObservationControl(lofar_device):
except DevFailed as ex:
# Remove the device again.
self.tango_util.delete_device(class_name, device_name)
- error_string = "Cannot access the Observation device instance for observation ID=%s with device class name=%s and device instance name=%s. This means that the observation likely did not start but certainly cannot be controlled and/or forcefully be stopped."
- logger.exception(error_string, observation_id, class_name, device_name)
+ error_string = f"Cannot access the Observation device instance for observation ID={observation_id} with device class name={class_name} and device instance name={device_name}. This means that the observation likely did not start but certainly cannot be controlled and/or forcefully be stopped."
+ logger.exception(error_string)
Except.re_throw_exception(ex, "DevFailed", error_string, __name__)
try:
@@ -347,7 +346,7 @@ class ObservationControl(lofar_device):
try:
device_proxy.ping()
except DevFailed:
- logger.warning("The device for the Observation with ID=%s has unexpectedly already disappeared. It is advised to check the logs up to 10s prior to this message to see what happened.", obs_id)
+ logger.warning(f"The device for the Observation with ID={obs_id} has unexpectedly already disappeared. It is advised to check the logs up to 10s prior to this message to see what happened.")
else:
# Unsubscribe from the subscribed event.
event_id = observation.pop("event_id")
@@ -372,15 +371,15 @@ class ObservationControl(lofar_device):
remaining_wait_time = remaining_wait_time - sleep_time
# Check if the observation object is really in OFF state.
if stopped:
- logger.info("Successfully stopped the observation with ID=%s.", obs_id)
+ logger.info(f"Successfully stopped the observation with ID={obs_id}")
else:
- logger.warning("Could not shut down the Observation device (\" %s \") for observation ID=%s. This means that there is a chance for a memory leak. Will continue anyway and forcefully delete the Observation object.", observation['device_name'], obs_id)
+ logger.warning(f"Could not shut down the Observation device ( {observation['device_name']} ) for observation ID={obs_id}. This means that there is a chance for a memory leak. Will continue anyway and forcefully delete the Observation object.")
# Finally remove the device object from the Tango DB.
try:
self.tango_util.delete_device(observation["class_name"], observation["device_name"])
except DevFailed:
- logger.warning("Something went wrong when the device %s was removed from the Tango DB. There is nothing that can be done about this here at this moment but you should check the Tango DB yourself.", observation['device_name'])
+ logger.warning(f"Something went wrong when the device {observation['device_name']} was removed from the Tango DB. There is nothing that can be done about this here at this moment but you should check the Tango DB yourself.")
@command()
@only_when_on()
@@ -404,13 +403,8 @@ class ObservationControl(lofar_device):
# Do not execute
error = f"Cannot check if an observation with ID={obs_id} is running, because the observation ID is invalid"
Except.throw_exception("IllegalCommand", error, __name__)
-
observation = self.running_observations.get(obs_id)
- if observation is not None:
- logger.debug("An observation with ID=%s is running.", obs_id)
- return True
- logger.debug("An observation with ID=%s is not running.", obs_id)
- return False
+ return True if observation is not None else False
@command(dtype_out = DevBoolean)
@only_when_on()