Pattern 6 levels (#493)

* separating pattern levels from command name: command line done

* separated patten level from command in examples and default pattern files in servers

* command line and server works

* python: patnloop not verified, wip

* works except for patloop (set, and get does not list properly)

* minor

* fixed tests

* added 3 more levels for ctb and moench

* wip

* minor err msg

* minor

* binaries in

* separating pattern levels from command name: command line done

* separated patten level from command in examples and default pattern files in servers

* command line and server works

* python: patnloop not verified, wip

* works except for patloop (set, and get does not list properly)

* minor

* fixed tests

* added 3 more levels for ctb and moench

* wip

* minor err msg

* minor

* binaries in

* python working

* import fix

* changed fw version for ctb and moench. binaries in

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>

python/slsdet/proxy.py

@@ -2,14 +2,24 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 from .utils import element_if_equal
 from .enums import dacIndex
+from .defines import M3_MAX_PATTERN_LEVELS, MAX_PATTERN_LEVELS
+from _slsdet import slsDetectorDefs
 
 
-def set_proxy_using_dict(func, key, value):
+def set_proxy_using_dict(func, key, value, unpack = False):
     if isinstance(value, dict) and all(isinstance(k, int) for k in value.keys()):
-        for dkey, dvalue in value.items():
-            func(key, dvalue, [dkey])
+        if unpack:
+            for dkey, dvalue in value.items():
+                func(key, *dvalue, [dkey])
+        else:
+            for dkey, dvalue in value.items():
+                func(key, dvalue, [dkey])
     else:
-        func(key, value)
+        if unpack:
+            func(key, *value)
+        else:
+            func(key, value)
+
 
 class JsonProxy:
     """
@@ -127,4 +137,118 @@ class ClkFreqProxy:
             else:
                 rstr += f'{i}: {r}\n'
         
-        return rstr.strip('\n')
+        return rstr.strip('\n')
+
+class PatLoopProxy:
+    """
+    Proxy class to allow for more intuitive reading patloop
+    """
+    def __init__(self, det):
+        self.det = det
+
+    def __getitem__(self, key):
+        return element_if_equal(self.det.getPatternLoopAddresses(key))
+
+    def __setitem__(self, key, value):
+        set_proxy_using_dict(self.det.setPatternLoopAddresses, key, value, unpack = True)
+
+    def __repr__(self):
+        max_levels = MAX_PATTERN_LEVELS
+        if self.det.type == slsDetectorDefs.detectorType.MYTHEN3:
+            max_levels = M3_MAX_PATTERN_LEVELS
+        rstr = ''
+        for i in range(max_levels):
+            r = self.__getitem__(i)
+            if isinstance(r[0], list):
+                part = ' '.join(f'{item}' for item in r)
+                rstr += f'{i}: {part}\n'
+            else:
+                rstr += f'{i}: {r}\n'
+        
+        return rstr.strip('\n')
+
+
+class PatNLoopProxy:
+    """
+    Proxy class to allow for more intuitive reading patnloop
+    """
+    def __init__(self, det):
+        self.det = det
+
+    def __getitem__(self, key):
+        return element_if_equal(self.det.getPatternLoopCycles(key))
+
+    def __setitem__(self, key, value):
+        set_proxy_using_dict(self.det.setPatternLoopCycles, key, value)
+
+    def __repr__(self):
+        max_levels = MAX_PATTERN_LEVELS
+        if self.det.type == slsDetectorDefs.detectorType.MYTHEN3:
+            max_levels = M3_MAX_PATTERN_LEVELS
+        rstr = ''
+        for i in range(max_levels):
+            r = element_if_equal(self.__getitem__(i))
+            if isinstance(r, list):
+                part = ', '.join(f'{item}' for item in r)
+                rstr += f'{i}: {part}\n'
+            else:
+                rstr += f'{i}: {r}\n'
+        
+        return rstr.strip('\n')
+
+
+class PatWaitProxy:
+    """
+    Proxy class to allow for more intuitive reading patwait
+    """
+    def __init__(self, det):
+        self.det = det
+
+    def __getitem__(self, key):
+        return element_if_equal(self.det.getPatternWaitAddr(key))
+
+    def __setitem__(self, key, value):
+        set_proxy_using_dict(self.det.setPatternWaitAddr, key, value)
+
+    def __repr__(self):
+        max_levels = MAX_PATTERN_LEVELS
+        if self.det.type == slsDetectorDefs.detectorType.MYTHEN3:
+            max_levels = M3_MAX_PATTERN_LEVELS
+        rstr = ''
+        for i in range(max_levels):
+            r = element_if_equal(self.__getitem__(i))
+            if isinstance(r, list):
+                part = ', '.join(f'{item}' for item in r)
+                rstr += f'{i}: {part}\n'
+            else:
+                rstr += f'{i}: {r}\n'
+        
+        return rstr.strip('\n')
+
+class PatWaitTimeProxy:
+    """
+    Proxy class to allow for more intuitive reading patwaittime
+    """
+    def __init__(self, det):
+        self.det = det
+
+    def __getitem__(self, key):
+        return element_if_equal(self.det.getPatternWaitTime(key))
+
+    def __setitem__(self, key, value):
+        set_proxy_using_dict(self.det.setPatternWaitTime, key, value)
+
+    def __repr__(self):
+        max_levels = MAX_PATTERN_LEVELS
+        if self.det.type == slsDetectorDefs.detectorType.MYTHEN3:
+            max_levels = M3_MAX_PATTERN_LEVELS
+        rstr = ''
+        for i in range(max_levels):
+            r = element_if_equal(self.__getitem__(i))
+            if isinstance(r, list):
+                part = ', '.join(f'{item}' for item in r)
+                rstr += f'{i}: {part}\n'
+            else:
+                rstr += f'{i}: {r}\n'
+        
+        return rstr.strip('\n')