Changeset 3143

Timestamp:

Oct 26, 2017 3:57:59 PM (6 years ago)

Author:

vondreele

Message:

fix ReadMarCCDFrame.py for py 3.6/py 2.7 compatibility & put it back in G2img_1TIF.py - used by DND Sect. 5

Location:

trunk

Files:

• ReadMarCCDFrame.py (modified) (5 diffs)
• imports/G2img_1TIF.py (modified) (1 diff)

trunk/ReadMarCCDFrame.py

@@ -1 +1 @@
 #!/usr/bin/env python
+from __future__ import division, print_function
 '''
 *ReadMarCCDFrame: Read Mar Files*
@@ -258 +259 @@
 import struct as st
 import array as ar
-import string, re
 
 MAXIMAGES=9
@@ -283 +283 @@
         self.TIFFyResolution = IFD[283][2][0] # pixels per resolutionUnit in Y direction (ImageLength direction
         self.TIFFresolutionUnit = IFD[296][2][0] # 3 = centimeter
-        self.byteDepth = self.TIFFbitDepth/8
+        self.byteDepth = self.TIFFbitDepth//8
         self.arrayTypeCode = ['','B','H','I','I'][self.byteDepth]
         # MarCCD specific header info
         File.seek(IFD[34710][2][0])
         self.headerType = st.unpack(byteOrd+'I',File.read(4))[0] #/* flag for header type  (can be used as magic number) */
-        self.headerName = re.sub(r'\x00','',string.join(st.unpack(byteOrd+16*'c',File.read(16)),''))
+        self.headerName = st.unpack(byteOrd+16*'s',File.read(16))[0].replace(b'\x00',b'')
         self.headerMajorVersion = st.unpack(byteOrd+'I',File.read(4))[0] #/* header_major_version (n.) */
         self.headerMinorVersion = st.unpack(byteOrd+'I',File.read(4))[0] #/* header_minor_version (.n) */
@@ -361 +361 @@
 
         File.seek(IFD[34710][2][0]+256+128)
-        self.barcode = re.sub(r'\x00','',string.join(st.unpack(byteOrd+16*'c',File.read(16)),''))
+        self.barcode = st.unpack(byteOrd+16*'s',File.read(16))[0].replace(b'\x00',b'')
         self.barcodeAngle = st.unpack(byteOrd+'I',File.read(4))[0]
         self.barcodeStatus = st.unpack(byteOrd+'I',File.read(4))[0]
@@ -433 +433 @@
 
         File.seek(IFD[34710][2][0]+256+128+256+128+128+128)
-        self.filetitle = re.sub(r'\x00','',string.join(st.unpack(byteOrd+128*'c',File.read(128)),''))
-        self.filepath = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*128,File.read(128)),'')) #/* path name for data file*/
-        self.filename = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*64,File.read(64)),'')) #/* name of data file*/
-        self.acquireTimestamp = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*32,File.read(32)),'')) #/* date and time of acquisition*/
-        self.headerTimestamp = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*32,File.read(32)),'')) #/* date and time of header update*/
-        self.saveTimestamp = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*32,File.read(32)),'')) #/* date and time file saved */
-        self.fileComment = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*512,File.read(512)),'')) #/* comments  - can be used as desired */
-        self.datasetComment = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*512,File.read(512)),'')) #/* comments  - can be used as desired */
-
-        self.userData = re.sub(r'\x00','',string.join(st.unpack(byteOrd+'c'*512,File.read(512)),''))
+        self.filetitle = st.unpack(byteOrd+128*'s',File.read(128))[0].replace(b'\x00',b'')
+        self.filepath = st.unpack(byteOrd+'s'*128,File.read(128))[0].replace(b'\x00',b'') #/* path name for data file*/
+        self.filename = st.unpack(byteOrd+'s'*64,File.read(64))[0].replace(b'\x00',b'') #/* name of data file*/
+        self.acquireTimestamp = st.unpack(byteOrd+'s'*32,File.read(32))[0].replace(b'\x00',b'') #/* date and time of acquisition*/
+        self.headerTimestamp = st.unpack(byteOrd+'s'*32,File.read(32))[0].replace(b'\x00',b'') #/* date and time of header update*/
+        self.saveTimestamp = st.unpack(byteOrd+'s'*32,File.read(32))[0].replace(b'\x00',b'') #/* date and time file saved */
+        self.fileComment = st.unpack(byteOrd+'s'*512,File.read(512))[0].replace(b'\x00',b'') #/* comments  - can be used as desired */
+        self.datasetComment = st.unpack(byteOrd+'s'*512,File.read(512))[0].replace(b'\x00',b'') #/* comments  - can be used as desired */
+
+        self.userData = st.unpack(byteOrd+'s'*512,File.read(512))[0].replace(b'\x00',b'')
 
         File.seek(4096)

trunk/imports/G2img_1TIF.py

@@ -89 +89 @@
     import struct as st
     import array as ar
-#    import ReadMarCCDFrame as rmf
+    import ReadMarCCDFrame as rmf
     image = None
     File = open(filename,'rb')