linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappy_psi.ahcapbridge: fix loss unit mechanism

Browse Source 
Change-Id: Iba4ca4988146a71a01dcc6dbe911be5588bfe292
This commit is contained in:
zolliker
2025-11-21 07:58:24 +01:00
parent e8e5d2743a
commit dfb8037a65
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frappy_psi/ahcapbridge.py
View File

@@ -52,7 +52,7 @@ class IO(StringIO):
timeout = 5 timeout = 5
sent_command = False # used to detect that communicate was called directly sent_command = False # used to detect that communicate was called directly
ECHO = re.compile('>|AV |VO |FR |SI |SH ') # this is recognized as an echo ECHO = re.compile('>|AV |VO |FR |SI |SH ') # this is recognized as an echo
MEAS = re.compile(' *([FC]=|NO DATA)') # overriden by the module MEAS = None # overriden by the module
@Command(StringType(), result=StringType()) @Command(StringType(), result=StringType())
def communicate(self, command, noreply=False): def communicate(self, command, noreply=False):
@@ -63,7 +63,7 @@ class IO(StringIO):
reply = super().communicate(command, noreply) reply = super().communicate(command, noreply)
reply = reply and reply.strip() reply = reply and reply.strip()
if self.check_echo_off(reply): if self.check_echo_off(reply):
return reply return reply
raise CommunicationFailedError('detected echo but can not switch off') raise CommunicationFailedError('detected echo but can not switch off')
def check_echo_off(self, reply): def check_echo_off(self, reply):
@@ -74,6 +74,8 @@ class IO(StringIO):
if self.MEAS.match(reply or ''): if self.MEAS.match(reply or ''):
# this is a meas reply # this is a meas reply
break break
if reply == 'NO DATA FOUND':
break
return False return False
return True return True
@@ -158,7 +160,13 @@ class AHBase(HasIO, Pinata, Acquisition):
reply = self.communicate('UN 2') reply = self.communicate('UN 2')
# this should be a measurement reply # this should be a measurement reply
mdict = self.get_meas_reply(reply) mdict = self.get_meas_reply(reply)
self._lossunit = mdict.get('lossunit', 'undefined') unit = mdict.get('lossunit', 'undefined')
if unit == self.UNIT:
if self._lossunit != self.UNIT:
self.log.warn('changed loss unit from %r to %r', self._lossunit, self.UNIT)
else:
self.log.warn('bad reply for UN 2: %r', reply)
self._lossunit = unit
def change_param(self, short, value, param): def change_param(self, short, value, param):
if self._mode == RUNNING: if self._mode == RUNNING: