From 01903d1608daa1698e0a7c9ec2e176b16faf3b19 Mon Sep 17 00:00:00 2001 From: anacso17 Date: Tue, 17 Aug 2021 14:51:33 -0300 Subject: [PATCH 1/3] cycle.FIX: fix log messages --- siriuspy/siriuspy/cycle/main.py | 56 +++++++++++++++++---------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/siriuspy/siriuspy/cycle/main.py b/siriuspy/siriuspy/cycle/main.py index 1b09464c7..7f969fdb6 100644 --- a/siriuspy/siriuspy/cycle/main.py +++ b/siriuspy/siriuspy/cycle/main.py @@ -427,9 +427,11 @@ def check_pwrsupplies(self, ppty, psnames, timeout=TIMEOUT_CHECK): self._update_log('Checking power supplies '+ppty+'...') self._checks_result = {psn: False for psn in psnames} + msg = 'Successfully checked '+ppty+' preparation for {}/' + \ + str(len(psnames)) time = _time.time() while _time.time() - time < timeout: - for idx, psname in enumerate(psnames): + for psname in psnames: if self._checks_result[psname]: continue cycler = self._get_cycler(psname) @@ -440,15 +442,14 @@ def check_pwrsupplies(self, ppty, psnames, timeout=TIMEOUT_CHECK): if ret: self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0 or idx == len(psnames)-1: - self._update_log( - 'Successfully checked '+ppty+' preparation for ' + - '{0}/{1}'.format(str(checked), str(len(psnames)))) + if checked % 5 == 0: + self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break if all(self._checks_result.values()): break _time.sleep(TIMEOUT_SLEEP) + self._update_log(msg.format(str(checked))) status = True for psname, sts in self._checks_result.items(): @@ -637,18 +638,16 @@ def check_pwrsupplies_finalsts(self, psnames): self._update_log('Checking power supplies final state...') self._checks_final_result = dict() sucess_cnt = 0 - msg = 'Successfully checked final state for {0}/{1}' - for idx, psname in enumerate(psnames): + msg = 'Successfully checked final state for {}/'+str(len(psnames)) + for psname in psnames: cycler = self._get_cycler(psname) status = cycler.check_final_state(self.mode) if status == _Const.CycleEndStatus.Ok: sucess_cnt += 1 - if sucess_cnt % 5 == 0 or idx == len(psnames)-1: - self._update_log( - msg.format(str(sucess_cnt), str(len(psnames)))) + if sucess_cnt % 5 == 0: + self._update_log(msg.format(str(sucess_cnt))) self._checks_final_result[psname] = status - if sucess_cnt != len(psnames): - self._update_log(msg.format(str(sucess_cnt), str(len(psnames)))) + self._update_log(msg.format(str(sucess_cnt))) all_ok = True for psname, has_prob in self._checks_final_result.items(): @@ -692,24 +691,25 @@ def check_pwrsupplies_sofbmode(self, psnames, timeout=TIMEOUT_CHECK): self._update_log('Checking power supplies SOFBMode...') self._checks_result = {psn: False for psn in psnames} + msg = 'Successfully checked SOFBMode preparation for {}/' + \ + str(len(psnames)) time = _time.time() while _time.time() - time < timeout: - for idx, psname in enumerate(psnames): + for psname in psnames: if self._checks_result[psname]: continue cycler = self._get_cycler(psname) if cycler.check_sofbmode('off', 0.05): self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0 or idx == len(psnames)-1: - self._update_log( - 'Successfully checked SOFBMode preparation for ' + - '{0}/{1}'.format(str(checked), str(len(psnames)))) + if checked % 5 == 0: + self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break if all(self._checks_result.values()): break _time.sleep(TIMEOUT_SLEEP) + self._update_log(msg.format(str(checked))) status = True for psname, sts in self._checks_result.items(): @@ -744,24 +744,25 @@ def check_pwrsupplies_slowref(self, psnames, timeout=TIMEOUT_CHECK): self._update_log('Checking power supplies opmode...') self._checks_result = {psn: False for psn in psnames} + msg = 'Successfully checked opmode preparation for {}/' + \ + str(len(psnames)) time = _time.time() while _time.time() - time < timeout: - for idx, psname in enumerate(psnames): + for psname in psnames: if self._checks_result[psname]: continue cycler = self._get_cycler(psname) if cycler.check_opmode_slowref(0.05): self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0 or idx == len(psnames)-1: - self._update_log( - 'Successfully checked opmode preparation for ' + - '{0}/{1}'.format(str(checked), str(len(psnames)))) + if checked % 5 == 0: + self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break if all(self._checks_result.values()): break _time.sleep(TIMEOUT_SLEEP) + self._update_log(msg.format(str(checked))) status = True for psname, sts in self._checks_result.items(): @@ -786,24 +787,25 @@ def check_pwrsupplies_current_zero(self, psnames, timeout=TIMEOUT_CHECK): """Check power supplies current.""" self._update_log('Checking power supplies current...') self._checks_result = {psn: False for psn in psnames} + msg = 'Successfully checked current preparation for {}/' + \ + str(len(psnames)) time = _time.time() while _time.time() - time < timeout: - for idx, psname in enumerate(psnames): + for psname in psnames: if self._checks_result[psname]: continue cycler = self._get_cycler(psname) if cycler.check_current_zero(0.05): self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0 or idx == len(psnames)-1: - self._update_log( - 'Successfully checked current preparation for ' + - '{0}/{1}'.format(str(checked), str(len(psnames)))) + if checked % 5 == 0: + self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break if all(self._checks_result.values()): break _time.sleep(TIMEOUT_SLEEP) + self._update_log(msg.format(str(checked))) status = True for psname, sts in self._checks_result.items(): From dec8ac6b3cb06b4e5d2807d2517c2748fd964a7a Mon Sep 17 00:00:00 2001 From: anacso17 Date: Tue, 17 Aug 2021 14:55:30 -0300 Subject: [PATCH 2/3] devices.FIX: fix bug in Inj.Sys. Standby Handlers --- siriuspy/siriuspy/devices/injsys.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/siriuspy/siriuspy/devices/injsys.py b/siriuspy/siriuspy/devices/injsys.py index 1a8c8b8a6..0567984c6 100644 --- a/siriuspy/siriuspy/devices/injsys.py +++ b/siriuspy/siriuspy/devices/injsys.py @@ -36,7 +36,7 @@ def on_values(self): vals = dict() for dev, ppties in self._on_values.items(): for ppty, val in ppties.items(): - vals[dev.devname+':'+ppty] = val + vals[dev.pv_object(ppty).pvname] = val return vals @@ -441,7 +441,7 @@ def __init__(self): devices = (self.evg, self.injboevt) self._on_values = { - self.injboevt: {'InjBOMode-Sts': Event.MODES.index('Continuous')}} + self.injboevt: {'Mode-Sts': Event.MODES.index('Continuous')}} # call base class constructor super().__init__('', devices) From be5e86031c988d5253905d70bdbc72060ee36794 Mon Sep 17 00:00:00 2001 From: anacso17 Date: Tue, 17 Aug 2021 16:24:13 -0300 Subject: [PATCH 3/3] cycle.MNT: make checks cleaner --- siriuspy/siriuspy/cycle/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/siriuspy/siriuspy/cycle/main.py b/siriuspy/siriuspy/cycle/main.py index 7f969fdb6..24e9f4e58 100644 --- a/siriuspy/siriuspy/cycle/main.py +++ b/siriuspy/siriuspy/cycle/main.py @@ -442,7 +442,7 @@ def check_pwrsupplies(self, ppty, psnames, timeout=TIMEOUT_CHECK): if ret: self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0: + if not checked % 5: self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break @@ -702,7 +702,7 @@ def check_pwrsupplies_sofbmode(self, psnames, timeout=TIMEOUT_CHECK): if cycler.check_sofbmode('off', 0.05): self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0: + if not checked % 5: self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break @@ -755,7 +755,7 @@ def check_pwrsupplies_slowref(self, psnames, timeout=TIMEOUT_CHECK): if cycler.check_opmode_slowref(0.05): self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0: + if not checked % 5: self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break @@ -798,7 +798,7 @@ def check_pwrsupplies_current_zero(self, psnames, timeout=TIMEOUT_CHECK): if cycler.check_current_zero(0.05): self._checks_result[psname] = True checked = sum(self._checks_result.values()) - if checked % 5 == 0: + if not checked % 5: self._update_log(msg.format(str(checked))) if _time.time() - time > timeout: break