From e48aec56dfd2a0e9c363fd4514396f5f8bedde3a Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Wed, 13 Jul 2022 16:33:22 +0200 Subject: [PATCH] naming and readability --- slic/devices/timing/events/tma.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/slic/devices/timing/events/tma.py b/slic/devices/timing/events/tma.py index 99053bbf..a246468e 100644 --- a/slic/devices/timing/events/tma.py +++ b/slic/devices/timing/events/tma.py @@ -40,16 +40,16 @@ class TimingMaster: return self._get_pv(f"{self.pvname}:Evt-{intId}.DESC").get() def _get_evtcode_Id(self, evtcode): - if not evtcode in eventcodes: + if not evtcode in EVENTCODES: raise Exception(f"Eventcode mapping not defined for {evtcode}") - Id = eventcodes.index(evtcode) + 1 + Id = EVENTCODES.index(evtcode) + 1 if not self._get_Id_code(Id) == evtcode: raise Exception(f"Eventcode mapping has apparently changed!") return Id def get_evtcode_delay(self, evtcode, **kwargs): - if evtcode in eventcodes_fixed_delay.keys(): - return eventcodes_fixed_delay[evtcode] * TICK + if evtcode in EVENTCODES_FIXED_DELAY.keys(): + return EVENTCODES_FIXED_DELAY[evtcode] * TICK Id = self._get_evtcode_Id(evtcode) return self._get_Id_delay(Id, **kwargs) @@ -69,7 +69,7 @@ class TimingMaster: def get_evt_code_status(self, codes=None): if not codes: - codes = sorted(eventcodes) + codes = sorted(EVENTCODES) if isinstance(codes, Number): codes = [codes] s = []