From 2ef0da68e8841dd235aa12e43f29f34f57318c5e Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Mon, 10 Jan 2022 19:55:02 +0100 Subject: [PATCH] change name of read_hw_status method in sequencer mixin change name to 'readHwStatus' needed after commit "check for bad read* and write_* methods" Change-Id: I27467aa2a3a3bb0db5f418c99f2d2065390a190a Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27394 Tested-by: Jenkins Automated Tests Reviewed-by: Enrico Faulhaber Reviewed-by: Markus Zolliker --- secop/lib/sequence.py | 4 ++-- secop_mlz/amagnet.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/secop/lib/sequence.py b/secop/lib/sequence.py index 08e047a..0fce746 100644 --- a/secop/lib/sequence.py +++ b/secop/lib/sequence.py @@ -137,8 +137,8 @@ class SequencerMixin: if self._seq_fault_on_stop: return self.Status.ERROR, self._seq_stopped return self.Status.WARN, self._seq_stopped - if hasattr(self, 'read_hw_status'): - return self.read_hw_status() + if hasattr(self, 'readHwStatus'): + return self.readHwStatus() return self.Status.IDLE, '' def stop(self): diff --git a/secop_mlz/amagnet.py b/secop_mlz/amagnet.py index 7b2491e..14ab47c 100644 --- a/secop_mlz/amagnet.py +++ b/secop_mlz/amagnet.py @@ -137,7 +137,7 @@ class GarfieldMagnet(SequencerMixin, Drivable): '_current2field polynome not monotonic!') def initModule(self): - super(GarfieldMagnet, self).initModule() + super().initModule() self._enable = self.DISPATCHER.get_module(self.subdev_enable) self._symmetry = self.DISPATCHER.get_module(self.subdev_symmetry) self._polswitch = self.DISPATCHER.get_module(self.subdev_polswitch) @@ -220,7 +220,7 @@ class GarfieldMagnet(SequencerMixin, Drivable): self._currentsource.read_value() * self._get_field_polarity()) - def read_hw_status(self): + def readHwStatus(self): # called from SequencerMixin.read_status if no sequence is running if self._enable.value == 'Off': return self.Status.WARN, 'Disabled'