Commits (10)
......@@ -25,6 +25,8 @@ build-noarch:
- conda build ./conda/tango --prefix-length=80 --output-folder=dist/ -c tango-controls --channel=http://bcu-ci.esrf.fr/stable
dependencies:
- build-linux
tags:
- linux
deploy-devel:
stage: deploy
......
......@@ -18,29 +18,21 @@ build:
requirements:
host:
- python {{ python }}
- numpy
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core
- lima-common-espia
build:
- git
- cmake
- {{ compiler('cxx') }}
run:
- python {{ python }}
- python
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('lima-core', max_pin='x.x') }}
- lima-common-espia
test:
requires:
- cmake
imports:
- Lima.Frelon
commands:
- cmake --version
- ctest --version
- cpack --version
about:
home: https://github.com/esrf-bliss/Lima
......
......@@ -39,7 +39,7 @@
# (c) - Bliss - ESRF
#=============================================================================
#
import time, string
import time
import PyTango
from Lima import Core
from Lima import Frelon as FrelonHw
......@@ -282,15 +282,15 @@ class FrelonTacoProxy:
@Core.DEB_MEMBER_FUNCT
def DevCcdSetChannel(self, input_chan):
_FrelonAcq.setInputChan(input_chan)
_FrelonAcq.getFrelonCamera().setInputChan(input_chan)
@Core.DEB_MEMBER_FUNCT
def DevCcdGetChannel(self):
return _FrelonAcq.getInputChan()
return _FrelonAcq.getFrelonCamera().getInputChan()
@Core.DEB_MEMBER_FUNCT
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)
kin_win_size, kin_line_beg, kin_stripes = self.getKinPars()
flip_mode, kin_line_beg, kin_stripes, d0, roi_mode_int = hw_par
......@@ -325,7 +325,7 @@ class FrelonTacoProxy:
kin_win_size, kin_line_beg, kin_stripes = self.getKinPars()
hw_par = [flip_mode, kin_line_beg, kin_stripes, 0, roi_mode]
deb.Return('Getting hw par: %s' % hw_par)
hw_par_str = string.join(map(str, hw_par))
hw_par_str = ' '.join(map(str, hw_par))
return hw_par_str
@Core.DEB_MEMBER_FUNCT
......@@ -337,11 +337,11 @@ class FrelonTacoProxy:
ftm = FrelonHw.FTM
else:
raise Core.Exception('Invalid profile value: %s' % kinetics)
_FrelonAcq.setFrameTransferMode(ftm)
_FrelonAcq.getFrelonCamera().setFrameTransferMode(ftm)
@Core.DEB_MEMBER_FUNCT
def DevCcdGetKinetics(self):
ftm = _FrelonAcq.getFrameTransferMode()
ftm = _FrelonAcq.getFrelonCamera().getFrameTransferMode()
if ftm == FrelonHw.FTM:
kinetics = 3
else:
......