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

an error on a write must not send an error update

Browse Source 
Change-Id: I07a991bcf26e87121160a2e604f8842eba23ebaf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35281
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker
2024-12-09 14:31:31 +01:00
parent bdb14af4af
commit 6da671df62
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frappy/modulebase.py
View File

@ -188,10 +188,8 @@ class HasAccessibles(HasProperties):
if new_value is Done: # TODO: to be removed when all code using Done is updated
return getattr(self, pname)
new_value = value if new_value is None else validate(new_value)
except Exception as e:
if isinstance(e, SECoPError):
e.raising_methods.append(f'{self.name}.write_{pname}')
self.announceUpdate(pname, err=e)
except SECoPError as e:
e.raising_methods.append(f'{self.name}.write_{pname}')
raise
self.announceUpdate(pname, new_value, validate=False)
return new_value
@ -516,13 +514,13 @@ class Module(HasAccessibles):
with self.updateLock:
pobj = self.parameters[pname]
timestamp = timestamp or time.time()
changed = False
if not err:
try:
if validate:
value = pobj.datatype(value)
except Exception as e:
err = e
changed = False
else:
changed = pobj.value != value or pobj.readerror
# store the value even in case of error