detsize in python

This commit is contained in:
Erik Frojdh 2020-09-21 17:18:31 +02:00
parent 9920987b4d
commit f6a442fd10
3 changed files with 10 additions and 2 deletions

View File

@ -10,7 +10,7 @@ from .gotthard import Gotthard
from .moench import Moench
import _slsdet
xy = _slsdet.xy
defs = _slsdet.slsDetectorDefs
from .enums import *

View File

@ -10,6 +10,7 @@ detectorType = slsDetectorDefs.detectorType
from .utils import element_if_equal, all_equal, get_set_bits, list_to_bitmask
from .utils import Geometry, to_geo, element, reduce_time, is_iterable
from _slsdet import xy
from . import utils as ut
from .proxy import JsonProxy, SlowAdcProxy, ClkDivProxy, MaxPhaseProxy, ClkFreqProxy
from .registers import Register, Adc_register
@ -221,6 +222,13 @@ class Detector(CppDetectorApi):
def detsize(self):
return to_geo(self.getDetectorSize())
@detsize.setter
def detsize(self, size):
if isinstance(size, xy):
self.setDetectorSize(size)
else:
self.setDetectorSize(xy(*size))
@property
def settings(self):
"""

View File

@ -41,7 +41,7 @@ def to_geo(value):
if isinstance(value, _slsdet.xy):
return Geometry(x = value.x, y = value.y)
else:
raise ValueError("Can only convert sls_detector.xy")
raise ValueError("Can only convert slsdet.xy")
def all_equal(mylist):
"""If all elements are equal return true otherwise false"""