From 362defe1108b8985e701dc0360b1a792bb7d0209 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 4 Dec 2020 17:50:19 +0100 Subject: [PATCH] added reading z from channel name --- slic/devices/device.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/slic/devices/device.py b/slic/devices/device.py index 355504a4..66dff0ed 100644 --- a/slic/devices/device.py +++ b/slic/devices/device.py @@ -9,7 +9,7 @@ class Device(BaseDevice): self.Id = Id self.name = name self.description = description - self.z_undulator = z_undulator + self.z_undulator = decide_z(Id, z_undulator) def __repr__(self): @@ -24,3 +24,17 @@ class Device(BaseDevice): +def decide_z(chan, z): + return z if z is not None else read_z_from_channel(chan) + + +def read_z_from_channel(chan): + chan = chan.split(":")[0] + z = chan[-3:] + try: + return int(z) + except ValueError: + return None + + +