Skip to content

Commit

Permalink
Merge pull request #513 from simonsobs/koopman/pre-commit-actuator-agent
Browse files Browse the repository at this point in the history
Cherry-pick of missed pre-commit run
  • Loading branch information
BrianJKoopman authored Aug 25, 2023
2 parents 7dd21f5 + bc9a14b commit 0536cb1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions socs/agents/wiregrid_actuator/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def check_limitswitch(self, session, params=None):
'check_limitswitch(): '
'Lock could not be acquired because it is held by {}.'
.format(self.lock.job))
return False,\
return False, \
'check_limitswitch(): '\
'Could not acquire lock'

Expand Down Expand Up @@ -764,7 +764,7 @@ def acq(self, session, params=None):
'acq(): '
'Could not re-acquire lock now held by {}.'
.format(self.lock.job))
return False,\
return False, \
'acq(): Could not re-acquire lock (timeout)'

current_time = time.time()
Expand Down
12 changes: 6 additions & 6 deletions socs/agents/wiregrid_kikusui/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def get_vc(self, session, params=None):
v_val, c_val = self.cmd.user_input('VC?')
s_msg, s_val = self.cmd.user_input('O?')

return True,\
return True, \
'Get Kikusui voltage / current: {} V / {} A [status={}]'\
.format(v_val, c_val, s_val)

Expand All @@ -381,10 +381,10 @@ def get_angle(self, session, params=None):

angle = self._get_position()
if angle < 0.:
return False,\
return False, \
'Could not get the angle of the wire-grid rotation.'

return True,\
return True, \
'Get wire-grid rotation angle = {} deg'.format(angle)

@ocs_agent.param('storepath', default='/data/wg-data/action/', type=str)
Expand Down Expand Up @@ -431,7 +431,7 @@ def calibrate_wg(self, session, params):

logfile.close()

return True,\
return True, \
'Micro step rotation of wire grid finished. '\
'Please calibrate and take feedback params.'

Expand Down Expand Up @@ -541,11 +541,11 @@ def IV_acq(self, session, params=None):
self.log.warn(
'Failed to aquire the lock '
'for IV_acq()!')
return False,\
return False, \
'Could not re-acquire lock '\
'for IV_acq() (timeout=-1)'
else:
return False,\
return False, \
'Could not re-acquire lock '\
'for IV_acq() (timeout=1000 sec)'

Expand Down

0 comments on commit 0536cb1

Please sign in to comment.