diff --git a/script/device/Pixel.py b/script/device/Pixel.py index 5df3800..5c8faef 100644 --- a/script/device/Pixel.py +++ b/script/device/Pixel.py @@ -65,10 +65,10 @@ class Pixel(DeviceBase, Readable, Readable.IntegerType): self.IMAGE_HEADER_LENGTH = 0 def get_image_filename(self): - return self.image_root_folder + self.get_path() + self.get_file_short_name() + return self.get_full_path() + self.get_file_short_name() def get_next_image_filename(self): - return self.image_root_folder + self.get_path() + ( self.get_image_format() % (self.get_count_id()+1)) + return self.get_full_path() + ( self.get_image_format() % (self.get_count_id()+1)) def get_image_format(self): return caget(self.prefix + ":FNAM_FMT") @@ -127,6 +127,20 @@ class Pixel(DeviceBase, Readable, Readable.IntegerType): def get_path(self): return caget(self.prefix + ":PATHa") + caget(self.prefix + ":PATHb") + def get_full_path(self): + return self.image_root_folder + self.get_path() + + def get_log_path(self): + return self.get_path() + "log/" + + def get_log_full_path(self): + return self.image_root_folder + self.get_log_path() + + def get_log_file(self): + myfile = self.get_file_short_name() + myfile = myfile[0:myfile.rfind(".")]+".pxl" + return self.get_log_full_path()+myfile + def get_file_short_name(self): return caget(self.prefix + ":FNAM") @@ -198,7 +212,15 @@ class Pixel(DeviceBase, Readable, Readable.IntegerType): print "E" def logwrite(self): - pass + filename = self.get_log_file() + "pixel/imagelogs/ccd-log.req" + + #inp = sprintf ("%s/ccd-log.req", _1) + #PIX_LOG_CMND = sprintf ("X_X04SA_do_casave.py -- -asciiin %s -asciiout %%s", myFile) + #myCmnd = sprintf (PIX_LOG_CMND, myFile) + inp = "/sls/X04SA/data/x04sa/ES3/expdata/" + "test/" + "pixel/imagelogs/ccd-log.req" + run("X_X04SA_do_casave.py", "--", "-asciiin", inp, "-asciiout", filename) + def show(self): print "\nThe current pixel detector settings are:" @@ -212,6 +234,7 @@ class Pixel(DeviceBase, Readable, Readable.IntegerType): print " Threshold values: Thresh1 = %d, Thresh2 = %d, Thresh3 = %d, Thresh4 = %d" % (self.PIX_THRESH1,self.PIX_THRESH2,self.PIX_THRESH3,self.PIX_THRESH4) print "\n\nThe current pixel detector status is:", pixel.get_status() + def doUpdate(self): self.get_status() self.get_count_id()