From 913123a07f4e95330b188f7f2f833eb612ea29d3 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Mon, 29 Oct 2018 11:51:04 +0100 Subject: [PATCH] Script execution --- script/device/Pixel.py | 49 ++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/script/device/Pixel.py b/script/device/Pixel.py index 436b733..21a0746 100644 --- a/script/device/Pixel.py +++ b/script/device/Pixel.py @@ -41,10 +41,10 @@ class Pixel(DeviceBase, Readable): self.IMAGE_HEADER_LENGTH = 0 def get_image_filename(self): - return self.image_root_folder + caget(self.prefix + ":PATHa") + caget(self.prefix + ":PATHb") + caget(self.prefix + ":FNAM") + return self.image_root_folder + self.get_path() + self.get_file_short_name() def get_next_image_filename(self): - return self.image_root_folder + caget(self.prefix + ":PATHa") + caget(self.prefix + ":PATHb") + ( self.get_image_format() % (self.get_count_id()+1)) + return self.image_root_folder + self.get_path() + ( self.get_image_format() % (self.get_count_id()+1)) def get_image_format(self): return caget(self.prefix + ":FNAM_FMT") @@ -69,17 +69,17 @@ class Pixel(DeviceBase, Readable): def get_status(self): ret = caget (self.prefix + ":STATUS", 's') if ret in ["Ready0", "Ready1"]: - setState(State.Ready) + self.setState(State.Ready) elif ret in ["Snapping", "Writing", "Updating"]: - setState(State.Busy) + self.setState(State.Busy) elif ret in ["Error"]: - setState(State.Error) + self.setState(State.Error) elif ret in ["Time-out", "Disconnected"]: - setState(State.Offline) + self.setState(State.Offline) elif ret in ["Undefined","Connected",]: - setState(State.Invalid) + self.setState(State.Invalid) else: - setState(State.Invalid) + self.setState(State.Invalid) return ret def is_status_ready(self, status=None): @@ -91,6 +91,12 @@ class Pixel(DeviceBase, Readable): caput(self.prefix + ":PATHa", patha) caput(self.prefix + ":PATHb", pathb) + def get_path(self): + return caget(self.prefix + ":PATHa") + caget(self.prefix + ":PATHb") + + + def get_file_short_name(self): + return caget(self.prefix + ":FNAM") #Trigger Snap Increment Write Inc+Wr Inc+Sn+Wr Connect Disconnect Update def set_trigger(self, val): @@ -158,24 +164,15 @@ class Pixel(DeviceBase, Readable): def show(self): - print ("\nThe current pixel detector settings are:\n") - if (index (PIX_FILE_FMT, "%") != 0): - PIX_FNUM = epics_get (PIX_FNUM_CHN) - printf (" The frame number = %d\n", PIX_FNUM) - printf (" The file path is: %s\n", PIX_PATH) - printf (" The file template is: %s\n", PIX_FILE_FMT) - fnam = epics_get (PIX_FNAM_CHN) - printf (" The last file name was: %s\n", fnam) - fnam = sprintf (PIX_FILE_FMT, (PIX_FNUM + 1)) - printf (" The next file name will be: %s\n", fnam) - else: - fnam = epics_get (PIX_FNAM_CHN) - printf (" The last file name was: %s\n", fnam) - printf (" The next file name will be: %s\n", PIX_FILE_FMT) - - print(" Exposure time = %5d sec\n" % (self.get_expose(), )) - print(" Image dimensions: %d x %d pixels (total = %d)\n" % (PIX_XDIM, PIX_YDIM, PIX_XDIM*PIX_YDIM)) - printf(" Threshold values: Thresh1 = %d, Thresh2 = %d, Thresh3 = %d, Thresh4 = %d\n" % (PIX_THRESH1,PIX_THRESH2,PIX_THRESH3,PIX_THRESH4)) + print ("\nThe current pixel detector settings are:") + print " The frame number: ", self.get_count_id() + print " The file path is:", self.get_path() + print " The file template is: ", self.get_image_format() + print " The last file name was: ", self.get_image_filename() + print " The next file name will be: ", self.get_next_image_filename() + print " Exposure time = %5d sec" % (self.get_expose(), ) + print " Image dimensions: %d x %d pixels (total = %d)" % (self.PIX_XDIM, self.PIX_YDIM, self.PIX_XDIM*self.PIX_YDIM) + print " Threshold values: Thresh1 = %d, Thresh2 = %d, Thresh3 = %d, Thresh4 = %d" % (self.PIX_THRESH1,self.PIX_THRESH2,self.PIX_THRESH3,self.PIX_THRESH4) def doUpdate(self): self.get_status()