detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
maliakal_d 2020-09-25 19:28:12 +02:00
commit ae58e9f0f4
3 changed files with 74 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
python/slsdet/detector.py
View File

@ -2657,10 +2657,7 @@ class Detector(CppDetectorApi):
@patlimits.setter @patlimits.setter
def patlimits(self, args): def patlimits(self, args):
if isinstance(args, tuple): args = ut.merge_args(-1, args)
args = (-1, *args)
elif isinstance(args, dict):
args = ({k:(-1, *v) for k,v in args.items()},)
ut.set_using_dict(self.setPatternLoopAddresses, *args) ut.set_using_dict(self.setPatternLoopAddresses, *args)
@property @property
@ -2714,7 +2711,7 @@ class Detector(CppDetectorApi):
@patwait0.setter @patwait0.setter
def patwait0(self, addr): def patwait0(self, addr):
addr = ut.add_argument_before(0, addr) addr = ut.merge_args(0, addr)
ut.set_using_dict(self.setPatternWaitAddr, *addr) ut.set_using_dict(self.setPatternWaitAddr, *addr)
@property @property
@ -2734,7 +2731,7 @@ class Detector(CppDetectorApi):
@patwait1.setter @patwait1.setter
def patwait1(self, addr): def patwait1(self, addr):
addr = ut.add_argument_before(1, addr) addr = ut.merge_args(1, addr)
ut.set_using_dict(self.setPatternWaitAddr, *addr) ut.set_using_dict(self.setPatternWaitAddr, *addr)
@property @property
@ -2754,37 +2751,45 @@ class Detector(CppDetectorApi):
@patwait2.setter @patwait2.setter
def patwait2(self, addr): def patwait2(self, addr):
addr = ut.add_argument_before(2, addr) addr = ut.merge_args(2, addr)
ut.set_using_dict(self.setPatternWaitAddr, *addr) ut.set_using_dict(self.setPatternWaitAddr, *addr)
@property @property
@element
def patwaittime0(self): def patwaittime0(self):
"""[Ctb][Moench][Mythen3] Wait 0 time in clock cycles.""" """[Ctb][Moench][Mythen3] Wait 0 time in clock cycles."""
return element_if_equal(self.getPatternWaitTime(0)) return self.getPatternWaitTime(0)
@patwaittime0.setter @patwaittime0.setter
def patwaittime0(self, nclk): def patwaittime0(self, nclk):
self.setPatternWaitTime(0, nclk) nclk = ut.merge_args(0, nclk)
ut.set_using_dict(self.setPatternWaitTime, *nclk)
@property @property
@element
def patwaittime1(self): def patwaittime1(self):
"""[Ctb][Moench][Mythen3] Wait 1 time in clock cycles.""" """[Ctb][Moench][Mythen3] Wait 1 time in clock cycles."""
return element_if_equal(self.getPatternWaitTime(1)) return self.getPatternWaitTime(1)
@patwaittime1.setter @patwaittime1.setter
def patwaittime1(self, nclk): def patwaittime1(self, nclk):
self.setPatternWaitTime(1, nclk) nclk = ut.merge_args(1, nclk)
ut.set_using_dict(self.setPatternWaitTime, *nclk)
@property @property
@element
def patwaittime2(self): def patwaittime2(self):
"""[Ctb][Moench][Mythen3] Wait 2 time in clock cycles.""" """[Ctb][Moench][Mythen3] Wait 2 time in clock cycles."""
return element_if_equal(self.getPatternWaitTime(2)) return self.getPatternWaitTime(2)
@patwaittime2.setter @patwaittime2.setter
def patwaittime2(self, nclk): def patwaittime2(self, nclk):
self.setPatternWaitTime(2, nclk) nclk = ut.merge_args(2, nclk)
ut.set_using_dict(self.setPatternWaitTime, *nclk)
@property @property
@element
def patloop0(self): def patloop0(self):
"""[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 0. """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 0.
@ -2796,13 +2801,15 @@ class Detector(CppDetectorApi):
>>> [hex(l) for l in d.patloop0] >>> [hex(l) for l in d.patloop0]
['0x0', '0x18c'] ['0x0', '0x18c']
""" """
return element_if_equal(self.getPatternLoopAddresses(0)) return self.getPatternLoopAddresses(0)
@patloop0.setter @patloop0.setter
def patloop0(self, addr): def patloop0(self, addr):
self.setPatternLoopAddresses(0, addr[0], addr[1]) addr = ut.merge_args(0, addr)
ut.set_using_dict(self.setPatternLoopAddresses, *addr)
@property @property
@element
def patloop1(self): def patloop1(self):
"""[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 1. """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 1.
@ -2815,13 +2822,15 @@ class Detector(CppDetectorApi):
['0x0', '0x18c'] ['0x0', '0x18c']
""" """
return element_if_equal(self.getPatternLoopAddresses(1)) return self.getPatternLoopAddresses(1)
@patloop1.setter @patloop1.setter
def patloop1(self, addr): def patloop1(self, addr):
self.setPatternLoopAddresses(1, addr[0], addr[1]) addr = ut.merge_args(1, addr)
ut.set_using_dict(self.setPatternLoopAddresses, *addr)
@property @property
@element
def patloop2(self): def patloop2(self):
"""[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 2. """[Ctb][Moench][Mythen3] Limits (start and stop address) of loop 2.
@ -2834,38 +2843,45 @@ class Detector(CppDetectorApi):
['0x0', '0x18c'] ['0x0', '0x18c']
""" """
return element_if_equal(self.getPatternLoopAddresses(2)) return self.getPatternLoopAddresses(2)
@patloop2.setter @patloop2.setter
def patloop2(self, addr): def patloop2(self, addr):
self.setPatternLoopAddresses(2, addr[0], addr[1]) addr = ut.merge_args(2, addr)
ut.set_using_dict(self.setPatternLoopAddresses, *addr)
@property @property
@element
def patnloop0(self): def patnloop0(self):
"""[Ctb][Moench][Mythen3] Number of cycles of loop 0.""" """[Ctb][Moench][Mythen3] Number of cycles of loop 0."""
return element_if_equal(self.getPatternLoopCycles(0)) return self.getPatternLoopCycles(0)
@patnloop0.setter @patnloop0.setter
def patnloop0(self, n): def patnloop0(self, n):
self.setPatternLoopCycles(0, n) n = ut.merge_args(0, n)
ut.set_using_dict(self.setPatternLoopCycles, *n)
@property @property
@element
def patnloop1(self): def patnloop1(self):
"""[Ctb][Moench][Mythen3] Number of cycles of loop 1.""" """[Ctb][Moench][Mythen3] Number of cycles of loop 1."""
return element_if_equal(self.getPatternLoopCycles(1)) return self.getPatternLoopCycles(1)
@patnloop1.setter @patnloop1.setter
def patnloop1(self, n): def patnloop1(self, n):
self.setPatternLoopCycles(1, n) n = ut.merge_args(1, n)
ut.set_using_dict(self.setPatternLoopCycles, *n)
@property @property
@element
def patnloop2(self): def patnloop2(self):
"""[Ctb][Moench][Mythen3] Number of cycles of loop 2.""" """[Ctb][Moench][Mythen3] Number of cycles of loop 2."""
return element_if_equal(self.getPatternLoopCycles(2)) return self.getPatternLoopCycles(2)
@patnloop2.setter @patnloop2.setter
def patnloop2(self, n): def patnloop2(self, n):
self.setPatternLoopCycles(2, n) n = ut.merge_args(2, n)
ut.set_using_dict(self.setPatternLoopCycles, *n)
@property @property
@element @element
@ -2875,7 +2891,8 @@ class Detector(CppDetectorApi):
@v_a.setter @v_a.setter
def v_a(self, value): def v_a(self, value):
self.setDAC(dacIndex.V_POWER_A, value, True) value = ut.merge_args(dacIndex.V_POWER_A, value, True)
ut.set_using_dict(self.setDAC, *value)
@property @property
@element @element
@ -2885,7 +2902,8 @@ class Detector(CppDetectorApi):
@v_b.setter @v_b.setter
def v_b(self, value): def v_b(self, value):
self.setDAC(dacIndex.V_POWER_B, value, True) value = ut.merge_args(dacIndex.V_POWER_B, value, True)
ut.set_using_dict(self.setDAC, *value)
@property @property
@element @element
@ -2895,7 +2913,8 @@ class Detector(CppDetectorApi):
@v_c.setter @v_c.setter
def v_c(self, value): def v_c(self, value):
self.setDAC(dacIndex.V_POWER_C, value, True) value = ut.merge_args(dacIndex.V_POWER_C, value, True)
ut.set_using_dict(self.setDAC, *value)
@property @property
@element @element
@ -2905,7 +2924,8 @@ class Detector(CppDetectorApi):
@v_d.setter @v_d.setter
def v_d(self, value): def v_d(self, value):
self.setDAC(dacIndex.V_POWER_D, value, True) value = ut.merge_args(dacIndex.V_POWER_D, value, True)
ut.set_using_dict(self.setDAC, *value)
@property @property
@element @element
@ -2919,7 +2939,8 @@ class Detector(CppDetectorApi):
@v_io.setter @v_io.setter
def v_io(self, value): def v_io(self, value):
self.setDAC(dacIndex.V_POWER_IO, value, True) value = ut.merge_args(dacIndex.V_POWER_IO, value, True)
ut.set_using_dict(self.setDAC, *value)
@property @property
@element @element

22
python/slsdet/utils.py
View File

@ -228,22 +228,32 @@ def pop_dict(args):
if isinstance(a, dict): if isinstance(a, dict):
return args.pop(i), i return args.pop(i), i
def tuplify(args):
if not isinstance(args, tuple):
return (args, )
else:
return args
def merge_args(*args): def merge_args(*args):
#find and pop dict since it holds the arguments
n_dict = sum(isinstance(a, dict) for a in args) n_dict = sum(isinstance(a, dict) for a in args)
if n_dict == 0:
return args if n_dict == 0: #no dict just make a tuple of arguments
ret = []
for a in args:
if isinstance(a, tuple):
ret.extend(a)
else:
ret.append(a)
return tuple(ret)
elif n_dict == 1: elif n_dict == 1:
args = [a for a in args] #these are the args to be added args = [a for a in args] #these are the args to be added
values,pos = pop_dict(args) values,pos = pop_dict(args)
ret = {} ret = {}
for k, v in values.items(): for k, v in values.items():
if not isinstance(v, tuple): v = tuplify(v)
v = (v,)
items = [a for a in args] items = [a for a in args]
items.insert(pos, *v) items[pos:pos] = v
ret[k] = tuple(items) ret[k] = tuple(items)
return (ret,) return (ret,)

6
python/tests/test_utils.py
View File

@ -334,3 +334,9 @@ def test_add_argument_after_dict():
def test_merge_args(): def test_merge_args():
assert merge_args("a", "b", 1) == ("a", "b", 1) assert merge_args("a", "b", 1) == ("a", "b", 1)
assert merge_args({0:1, 1:2}, "a") == ({0: (1, "a"), 1: (2, "a")},) assert merge_args({0:1, 1:2}, "a") == ({0: (1, "a"), 1: (2, "a")},)
def test_merge_args_tuple():
assert merge_args(*("a", "b"), 5) == ("a", "b", 5)
def test_merge_args_dict_with_tuple():
assert merge_args({0: (1,2)}, 3) == ({0: (1,2,3)},)