pshell_config/x04sa-es3
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x04sa
2018-10-31 16:00:59 +01:00
parent c0c537ad9c
commit fac45befc8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
script/device/Image.py
View File

@@ -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

1
script/device/Pixel.py
View File

@@ -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