generalized set_using_dict

python/slsdet/utils.py

@@ -3,9 +3,8 @@ Utility functions that are useful for testing and troubleshooting
 but not directly used in controlling the detector
 """
 
-
 from collections import namedtuple
-import _slsdet #C++ lib
+import _slsdet  #C++ lib
 import functools
 import datetime as dt
 import pathlib
@@ -14,18 +13,21 @@ from pathlib import Path
 
 Geometry = namedtuple('Geometry', ['x', 'y'])
 
+
 def is_iterable(item):
-    try: 
+    try:
         iter(item)
     except TypeError:
         return False
     return True
 
+
 def get_set_bits(mask):
     """
     Return a list of the set bits in a python integer
     """
-    return [i for i in range(mask.bit_length()) if (mask>>i)&1]
+    return [i for i in range(mask.bit_length()) if (mask >> i) & 1]
+
 
 def list_to_bitmask(values):
     """
@@ -33,17 +35,19 @@ def list_to_bitmask(values):
     where the list indicates
     """
     mask = int(0)
-    values = list(set(values)) #Remove duplicates
+    values = list(set(values))  #Remove duplicates
     for v in values:
         mask += 1 << v
     return mask
 
+
 def to_geo(value):
     if isinstance(value, _slsdet.xy):
-        return Geometry(x = value.x, y = value.y)
+        return Geometry(x=value.x, y=value.y)
     else:
         raise ValueError("Can only convert slsdet.xy")
 
+
 def all_equal(mylist):
     """If all elements are equal return true otherwise false"""
     return all(x == mylist[0] for x in mylist)
@@ -53,7 +57,7 @@ def element_if_equal(mylist):
     """If all elements are equal return only one element"""
     if not is_iterable(mylist):
         return mylist
-        
+
     if all_equal(mylist):
         if len(mylist) == 0:
             return None
@@ -62,6 +66,7 @@ def element_if_equal(mylist):
     else:
         return mylist
 
+
 def reduce_time(mylist):
     res = element_if_equal(element_if_equal(mylist))
     if isinstance(res, dt.timedelta):
@@ -71,6 +76,7 @@ def reduce_time(mylist):
     else:
         return [r.total_seconds() for r in res]
 
+
 def element(func):
     """
     Wrapper to return either list or element
@@ -78,6 +84,7 @@ def element(func):
     @functools.wraps(func)
     def wrapper(self, *args, **kwargs):
         return element_if_equal(func(self, *args, **kwargs))
+
     return wrapper
 
 
@@ -90,14 +97,16 @@ def eiger_register_to_time(register):
     """
     clocks = register >> 3
     exponent = register & 0b111
-    return clocks*10**exponent / 100e6
+    return clocks * 10**exponent / 100e6
+
 
 def make_timedelta(t):
     if isinstance(t, dt.timedelta):
-           return t
+        return t
     else:
         return dt.timedelta(seconds=t)
 
+
 def _make_string_path(path):
     """
     Accepts either a pathlib.Path or a string, expands ~ to user and convert
@@ -110,26 +119,28 @@ def _make_string_path(path):
     else:
         raise ValueError("Cannot convert argument to posix path")
 
+
 def make_string_path(path):
-    if isinstance(path, dict):
-        return {key:_make_string_path(value) for key,value in path.items()}
-    else:
-        return _make_string_path(path)
+    return _make(path, _make_string_path)
+
 
 def make_ip(arg):
     return _make(arg, _slsdet.IpAddr)
 
+
 def make_mac(arg):
     return _make(arg, _slsdet.MacAddr)
 
+
 def make_path(arg):
     return _make(arg, Path)
-    
+
+
 def _make(arg, transform):
     """Helper function for make_mac and make_ip special cases for
     dict, list and tuple. Otherwise just calls transform"""
     if isinstance(arg, dict):
-        return {key:transform(value) for key,value in arg.items()}
+        return {key: transform(value) for key, value in arg.items()}
     elif isinstance(arg, list):
         return [transform(a) for a in arg]
     elif isinstance(arg, tuple):
@@ -137,15 +148,21 @@ def _make(arg, transform):
     else:
         return transform(arg)
 
-def set_using_dict(func, args):
-    if isinstance(args, dict) and all(isinstance(k, int) for k in args.keys()):
-        for key, value in args.items():
+
+def set_using_dict(func, *args):
+
+    if len(args) == 1 and isinstance(args[0], dict) and all(
+            isinstance(k, int) for k in args[0].keys()):
+        for key, value in args[0].items():
+            if not isinstance(value, tuple):
+                value = (value,)
             try:
-                func(value, [key])
+                func(*value, [key])
             except TypeError:
-                func(value, key)
+                func(*value, key)
     else:
-        func(args)
+        func(*args)
+
 
 def set_time_using_dict(func, args):
     if isinstance(args, dict) and all(isinstance(k, int) for k in args.keys()):
@@ -155,11 +172,13 @@ def set_time_using_dict(func, args):
             func(value, [key])
     else:
         if isinstance(args, int):
-                args = float(args)
+            args = float(args)
         func(args)
 
+
 def lhex(iterable):
     return [hex(item) for item in iterable]
 
+
 def lpath(iterable):
     return [Path(item) for item in iterable]