Commit 84032003 authored by Laurent Claustre's avatar Laurent Claustre

Merge branch '2-move-to-sdk2-103-was-2-91-for-linux-kernel-3-x' into 'master'

Resolve "move to sdk2.103 (was 2.91) for linux kernel >3.x"

Closes #2

See merge request !7
parents 13a51c83 8a1d6ef9
Pipeline #10573 passed with stages
in 10 minutes and 1 second
......@@ -16,7 +16,8 @@ requirements:
- numpy
- sip 4.19.8 # For compatibility with pyqt 5.9.2
- lima-core
- andor2-sdk
- andor2-sdk >=2.102.30013 # [win]
- andor2-sdk >=2.103.30022 # [linux]
build:
- git
- cmake
......@@ -25,7 +26,8 @@ requirements:
- python {{ python }}
- sip >=4.19.4, <=4.19.8 # For compatibility with pyqt 5.9.2
- {{ pin_compatible('lima-core', max_pin='x.x') }}
- andor2-sdk
- andor2-sdk >=2.102.30013 # [win]
- andor2-sdk >=2.103.30022 # [linux]
test:
requires:
......
......@@ -163,17 +163,17 @@ class Andor(PyTango.Device_4Impl):
_AndorInterface.setShutterLevel(self.__ShutterLevel[self.shutter_level])
if self.__FanMode.has_key('UNSUPPORTED') and self.fan_mode:
if 'UNSUPPORTED' in self.__FanMode.keys() and self.fan_mode:
deb.Error('Cannot set fan_mode property, not supported for this camera model')
elif self.fan_mode:
_AndorInterface.setFanMode(self.__FanMode[self.fan_mode])
if self.__HighCapacity.has_key('UNSUPPORTED') and self.high_capacity:
if 'UNSUPPORTED' in self.__HighCapacity.keys() and self.high_capacity:
deb.Error('Cannot set high_capacity property, not supported for this camera model')
elif self.high_capacity:
_AndorInterface.setHighCapacity(self.__HighCapacity[self.high_capacity])
if self.__BaselineClamp.has_key('UNSUPPORTED') and self.baseline_clamp:
if 'UNSUPPORTED' in self.__BaselineClamp.keys() and self.baseline_clamp:
deb.Error('Cannot set baseline_clamp propery, not supported for this camera model')
elif self.baseline_clamp:
_AndorInterface.setBaselineClamp(self.__BaselineClamp[self.baseline_clamp])
......
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