Commit c64fa1d4 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron

Merge branch 'fixed_py3' into 'master'

hoops an other py3 fix

See merge request !14
parents 760a487a 05cd3353
Pipeline #14519 passed with stages
in 4 minutes and 33 seconds
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
# (c) - Bliss - ESRF # (c) - Bliss - ESRF
#============================================================================= #=============================================================================
# #
import time, string import time
import PyTango import PyTango
from Lima import Core from Lima import Core
from Lima import Frelon as FrelonHw from Lima import Frelon as FrelonHw
...@@ -290,7 +290,7 @@ class FrelonTacoProxy: ...@@ -290,7 +290,7 @@ class FrelonTacoProxy:
@Core.DEB_MEMBER_FUNCT @Core.DEB_MEMBER_FUNCT
def DevCcdSetHwPar(self, hw_par_str): def DevCcdSetHwPar(self, hw_par_str):
hw_par = map(int, string.split(hw_par_str)) hw_par = map(int, hw_par_str.split())
deb.Param('Setting hw par: %s' % hw_par) deb.Param('Setting hw par: %s' % hw_par)
kin_win_size, kin_line_beg, kin_stripes = self.getKinPars() kin_win_size, kin_line_beg, kin_stripes = self.getKinPars()
flip_mode, kin_line_beg, kin_stripes, d0, roi_mode_int = hw_par flip_mode, kin_line_beg, kin_stripes, d0, roi_mode_int = hw_par
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment