fix set_loop, watlowf4.get_loop_en

Author: Myles Metzler

chamberconnectlibrary/controllerinterface.py

@@ -263,7 +263,7 @@ def set_loop(self, identifier, loop_type='loop', param_list=None, **kwargs):
             my_loop_map = self.loop_map[self.named_loop_map[identifier]]
             loop_number = my_loop_map['num']
             loop_type = my_loop_map['type']
-        elif isinstance(identifier, int):
+        elif isinstance(identifier, (int, long)):
             loop_number = identifier
         else:
             raise ValueError(

chamberconnectlibrary/espec.py

@@ -127,7 +127,7 @@ def set_refrig(self, value):
         self.client.write_set(**value)
 
     @exclusive
-    def set_loop(self, N, loop_type, param_list=None, **kwargs):
+    def set_loop(self, identifier, loop_type='loop', param_list=None, **kwargs):
         #cannot use the default controllerInterface version.
         lpfuncs = {
             'cascade':{
@@ -149,6 +149,18 @@ def set_loop(self, N, loop_type, param_list=None, **kwargs):
         }
         if param_list is None:
             param_list = kwargs
+        if isinstance(identifier, basestring):
+            my_loop_map = self.loop_map[self.named_loop_map[identifier]]
+            loop_number = my_loop_map['num']
+            loop_type = my_loop_map['type']
+        elif isinstance(identifier, (int, long)):
+            loop_number = identifier
+        else:
+            raise ValueError(
+                'invalid argument format, call w/: '
+                'set_loop(int(identifier), str(loop_type), **kwargs) or '
+                'get_loop(str(identifier), **kwargs)'
+            )
         spt1 = 'setpoint' in param_list
         spt2 = 'setPoint' in param_list
         spt3 = 'setValue' in param_list
@@ -173,9 +185,9 @@ def set_loop(self, N, loop_type, param_list=None, **kwargs):
             params = {'setpoint':spv, 'enable':enable}
             if range in param_list:
                 params.update(param_list.pop('range'))
-            if self.lpd[N] == self.temp:
+            if self.lpd[loop_number] == self.temp:
                 self.client.write_temp(**params)
-            elif self.lpd[N] == self.humi:
+            elif self.lpd[loop_number] == self.humi:
                 self.client.write_humi(**params)
             else:
                 raise ValueError(self.lp_exmsg)
@@ -188,7 +200,7 @@ def set_loop(self, N, loop_type, param_list=None, **kwargs):
             self.client.write_temp_ptc(**params)
         for key, val in param_list.items():
             params = {'value':val}
-            params.update({'exclusive':False, 'N':N})
+            params.update({'exclusive':False, 'N':loop_number})
             try:
                 lpfuncs[loop_type][key](**params)
             except KeyError:

chamberconnectlibrary/watlowf4.py

@@ -366,12 +366,9 @@ def get_loop_en(self, N):
         lrange = self.get_loop_range(N, exclusive=False)
         profile = self.client.read_holding(200)[0] in [2, 3]
         cmd = self.get_loop_sp(N, exclusive=False)['constant'] >= lrange['min']
-        if self.combined_event[N-1] != 0:
+        if self.combined_event[N-1] > 0:
             eve = self.get_event(self.combined_event[N-1], exclusive=False)['constant']
-            if self.cond_event:
-                running = self.get_event(self.cond_event, exclusive=False)
-            else:
-                running = False
+            running = self.get_event(self.cond_event, exclusive=False) if self.cond_event else True
             return {'constant': eve, 'current': eve if running else cmd}
         else:
             return {'constant': cmd, 'current': True if profile else cmd}