diff --git a/socs/agents/bluefors/agent.py b/socs/agents/bluefors/agent.py index 1b0f2c94c..fbb410991 100644 --- a/socs/agents/bluefors/agent.py +++ b/socs/agents/bluefors/agent.py @@ -342,10 +342,10 @@ def identify_log(filename): 'heater': '(heaters)'} for k, v in file_types.items(): - if re.search(v, filename): + if re.search(v, filename, flags=re.I): _type = k - m = re.search(file_types[_type], filename) + m = re.search(file_types[_type], filename, flags=re.I) if _type == 'lakeshore': return _type, "{}_{}".format(_type, m.group(0).lower().replace(' ', '_')) else: diff --git a/socs/agents/scpi_psu/agent.py b/socs/agents/scpi_psu/agent.py index 3f1d007cf..7a4108e1a 100644 --- a/socs/agents/scpi_psu/agent.py +++ b/socs/agents/scpi_psu/agent.py @@ -268,6 +268,7 @@ def get_current(self, session, params=None): 'channel': chan, 'current': self.psu.get_curr(chan) } + session.data = data else: return False, "Cannot measure output when output is disabled." @@ -329,6 +330,7 @@ def get_output(self, session, params=None): 'state': self.psu.get_output(chan) } session.data = data + enabled = bool(data['state']) else: return False, "Could not acquire lock." if enabled: