From fac45befc8b0509c14c259b3f1206e2bda7d4e07 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Wed, 31 Oct 2018 16:00:59 +0100 Subject: [PATCH] Closedown --- script/device/Image.py | 4 ++-- script/device/Pixel.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/script/device/Image.py b/script/device/Image.py index c08cd55..b42dddd 100644 --- a/script/device/Image.py +++ b/script/device/Image.py @@ -81,7 +81,7 @@ class Image(DeviceBase, Readable): try: ret = img_get_int(tmp_file, threshold1, threshold2, threshold3, threshold4, \ - self.pixel.IMAGE_HEADER_LENGTH, self.pixel.PIX_XDIM, self.pixel.PIX_YDIM,self.pixel.PIX_COLOR_DEPTH, \ + self.pixel.image_header_length, self.pixel.PIX_XDIM, self.pixel.PIX_YDIM,self.pixel.PIX_COLOR_DEPTH, \ roi[0], roi[1], roi[2], roi[3], bkroi[0], bkroi[1], bkroi[2], bkroi[3]) except: log("Error calculating intensity: " + str(filename) + " - " + str(sys.exc_info()[1]), False) @@ -98,7 +98,7 @@ class Image(DeviceBase, Readable): return self.last_image print "Reading image : " + filename try: - ret = img_read(filename, self.pixel.IMAGE_HEADER_LENGTH, self.pixel.PIX_XDIM, self.pixel.PIX_YDIM,self.pixel.PIX_COLOR_DEPTH) + ret = img_read(filename, self.pixel.image_header_length, self.pixel.PIX_XDIM, self.pixel.PIX_YDIM,self.pixel.PIX_COLOR_DEPTH) except: log("Error reading data file: " + str(filename) + " - " + str(sys.exc_info()[1]), False) return None diff --git a/script/device/Pixel.py b/script/device/Pixel.py index 7dfb52c..7059987 100644 --- a/script/device/Pixel.py +++ b/script/device/Pixel.py @@ -17,7 +17,6 @@ class Pixel(DeviceBase, Readable, Readable.IntegerType): self.image_filename = ImageFilename(self) self.PIX_TYPE = "PilatusII" - self.PIX_FILE_HEADER_LENGTH = 0 self.PIX_COLOR_DEPTH = 32 self.PIX_XDIM = 487 self.PIX_YDIM = 195