From e768dd841042b19fdb425e882468a52d702eecdb Mon Sep 17 00:00:00 2001
From: "roberto.borghes" <roberto.borghes@elettra.eu>
Date: Mon, 29 May 2023 09:09:56 +0200
Subject: [PATCH] Bug fix: better management of the camserver imgpath reply
string
---
src/PilatusXM.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/PilatusXM.py b/src/PilatusXM.py
index a6c972e..b4a401f 100755
--- a/src/PilatusXM.py
+++ b/src/PilatusXM.py
@@ -585,7 +585,8 @@ class PilatusXM (PyTango.LatestDeviceImpl):
reply = self.comm.send_to_detector(cmd)
if reply is None:
PyTango.Except.throw_exception("Communication error","Pilatus does not reply","write_FileDir")
- elif "ERR" in reply:
+ tokens = reply.split(" ")
+ if (len(tokens) < 2) or ("OK" not in tokens[1]):
PyTango.Except.throw_exception("Command error","Pilatus reply: %s" % reply,"write_FileDir")
#----- PROTECTED REGION END -----# // PilatusXM.FileDir_write
@@ -1047,7 +1048,7 @@ class PilatusXM (PyTango.LatestDeviceImpl):
if self.Simulation:
self.set_state(PyTango.DevState.ON)
self.set_status("The device is in ON state. Ready")
- return
+ return
cmd = "camcmd k"
reply = self.comm.send_to_detector(cmd, wait_reply = False)
@@ -1070,7 +1071,7 @@ class PilatusXM (PyTango.LatestDeviceImpl):
if self.Simulation:
self.set_state(PyTango.DevState.ON)
self.set_status("The device is in ON state. Ready")
- return
+ return
cmd = "camcmd ResetCam"
reply = self.comm.send_to_detector(cmd, wait_reply = False)
#----- PROTECTED REGION END -----# // PilatusXM.Reset
--
GitLab