Merge pull request #352 from lnls-sirius/fix-ps-cycle

Fix bugs

siriuspy/siriuspy/csdevice/posang.py

@@ -1,23 +1,17 @@
 """Define PVs, contants and properties of PosAng SoftIOCs."""
 
 from siriuspy.csdevice import util as _cutil
-from siriuspy.namesys import SiriusPVName as _PVName
 
 
 class Const:
     """Const class defining PosAng constants."""
 
-    TB_CORRH_POSANG_CHSEPT = (
-        _PVName('TB-04:PS-CH-1'), _PVName('TB-04:PU-InjSept'))
-    TB_CORRH_POSANG_CHCH = (
-        _PVName('TB-04:PS-CH-1'), _PVName('TB-04:PS-CH-2'))
-    TB_CORRV_POSANG = (
-        _PVName('TB-04:PS-CV-1'), _PVName('TB-04:PS-CV-2'))
-
-    TS_CORRH_POSANG = (
-        _PVName('TS-04:PS-CH'), _PVName('TS-04:PU-InjSeptF'))
-    TS_CORRV_POSANG = (
-        _PVName('TS-04:PS-CV-1'), _PVName('TS-04:PS-CV-2'))
+    TB_CORRH_POSANG_CHSEPT = ('TB-04:PS-CH-1', 'TB-04:PU-InjSept')
+    TB_CORRH_POSANG_CHCH = ('TB-04:PS-CH-1', 'TB-04:PS-CH-2')
+    TB_CORRV_POSANG = ('TB-04:PS-CV-1', 'TB-04:PS-CV-2')
+
+    TS_CORRH_POSANG = ('TS-04:PS-CH', 'TS-04:PU-InjSeptF')
+    TS_CORRV_POSANG = ('TS-04:PS-CV-1', 'TS-04:PS-CV-2')
 
     STATUSLABELS = ('PS Connection', 'PS PwrState', 'PS OpMode', 'PS CtrlMode')
 

siriuspy/siriuspy/cycle/conn.py

@@ -583,7 +583,7 @@ def set_current_zero(self):
 
     def check_current_zero(self, wait=5):
         """Return wether power supply PS current is zero."""
-        return _pv_timed_get(self['rdi'].value, 0, abs_tol=0.1, wait=wait)
+        return _pv_timed_get(self['rdi'], 0, abs_tol=0.1, wait=wait)
 
     def prepare(self, mode):
         """Config power supply to cycling mode."""