diff --git a/python/sls_detector/ctb.py b/python/sls_detector/ctb.py index 125b4109c..1c6e695e2 100644 --- a/python/sls_detector/ctb.py +++ b/python/sls_detector/ctb.py @@ -41,81 +41,3 @@ class Ctb(Detector): def dacs(self): return self._dacs - @property - @element - def v_a(self): - return self.getDAC(dacIndex.V_POWER_A, True) - - @v_a.setter - def v_a(self, value): - self.setDAC(dacIndex.V_POWER_A, value, True) - - @property - @element - def v_b(self): - return self.getDAC(dacIndex.V_POWER_B, True) - - @v_b.setter - def v_b(self, value): - self.setDAC(dacIndex.V_POWER_B, value, True) - - @property - @element - def v_c(self): - return self.getDAC(dacIndex.V_POWER_C, True) - - @v_c.setter - def v_c(self, value): - self.setDAC(dacIndex.V_POWER_C, value, True) - - @property - @element - def v_d(self): - return self.getDAC(dacIndex.V_POWER_D, True) - - @v_d.setter - def v_d(self, value): - self.setDAC(dacIndex.V_POWER_D, value, True) - - @property - @element - def v_io(self): - return self.getDAC(dacIndex.V_POWER_IO, True) - - @v_io.setter - def v_io(self, value): - self.setDAC(dacIndex.V_POWER_IO, value, True) - - @property - @element - def v_limit(self): - return self.getDAC(dacIndex.V_LIMIT, True) - - @v_limit.setter - def v_limit(self, value): - self.setDAC(dacIndex.V_LIMIT, value, True) - - @property - @element - def im_a(self): - return self.getMeasuredCurrent(dacIndex.I_POWER_A) - - @property - @element - def im_b(self): - return self.getMeasuredCurrent(dacIndex.I_POWER_B) - - @property - @element - def im_c(self): - return self.getMeasuredCurrent(dacIndex.I_POWER_C) - - @property - @element - def im_d(self): - return self.getMeasuredCurrent(dacIndex.I_POWER_D) - - @property - @element - def im_io(self): - return self.getMeasuredCurrent(dacIndex.I_POWER_IO) \ No newline at end of file diff --git a/python/sls_detector/detector.py b/python/sls_detector/detector.py index bed1958a6..23f0c94dd 100755 --- a/python/sls_detector/detector.py +++ b/python/sls_detector/detector.py @@ -6,7 +6,7 @@ speedLevel = slsDetectorDefs.speedLevel dacIndex = slsDetectorDefs.dacIndex from .utils import element_if_equal, all_equal, get_set_bits, list_to_bitmask -from .utils import Geometry, to_geo +from .utils import Geometry, to_geo, element from .registers import Register, Adc_register import datetime as dt @@ -1005,4 +1005,84 @@ class Detector(CppDetectorApi): @patnloop2.setter def patnloop2(self, n): - self.setPatternLoopCycles(2, n) \ No newline at end of file + self.setPatternLoopCycles(2, n) + + + @property + @element + def v_a(self): + return self.getDAC(dacIndex.V_POWER_A, True) + + @v_a.setter + def v_a(self, value): + self.setDAC(dacIndex.V_POWER_A, value, True) + + @property + @element + def v_b(self): + return self.getDAC(dacIndex.V_POWER_B, True) + + @v_b.setter + def v_b(self, value): + self.setDAC(dacIndex.V_POWER_B, value, True) + + @property + @element + def v_c(self): + return self.getDAC(dacIndex.V_POWER_C, True) + + @v_c.setter + def v_c(self, value): + self.setDAC(dacIndex.V_POWER_C, value, True) + + @property + @element + def v_d(self): + return self.getDAC(dacIndex.V_POWER_D, True) + + @v_d.setter + def v_d(self, value): + self.setDAC(dacIndex.V_POWER_D, value, True) + + @property + @element + def v_io(self): + return self.getDAC(dacIndex.V_POWER_IO, True) + + @v_io.setter + def v_io(self, value): + self.setDAC(dacIndex.V_POWER_IO, value, True) + + @property + @element + def v_limit(self): + return self.getDAC(dacIndex.V_LIMIT, True) + + @v_limit.setter + def v_limit(self, value): + self.setDAC(dacIndex.V_LIMIT, value, True) + + @property + @element + def im_a(self): + return self.getMeasuredCurrent(dacIndex.I_POWER_A) + + @property + @element + def im_b(self): + return self.getMeasuredCurrent(dacIndex.I_POWER_B) + + @property + @element + def im_c(self): + return self.getMeasuredCurrent(dacIndex.I_POWER_C) + + @property + @element + def im_d(self): + return self.getMeasuredCurrent(dacIndex.I_POWER_D) + + @property + @element + def im_io(self): + return self.getMeasuredCurrent(dacIndex.I_POWER_IO) \ No newline at end of file