Changeset 4917

Timestamp:

May 28, 2021 10:20:46 PM (2 years ago)

Author:

toby

Message:

split G2 & pillow readers for TIF; document

Location:

trunk

Files:

• GSASIIstrIO.py (modified) (1 diff)
• docs/source/imports.rst (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (5 diffs)
• imports/G2img_PILTIF.py (added)

trunk/GSASIIstrIO.py

@@ -1901 +1901 @@
     '''Compute the standard uncertainty on cell parameters
     
-    :param str pfx: prefix of form p::
+    :param str pfx: prefix of form p\:\:
     :param SGdata: space group information
     :param list A: Reciprocal cell Ai terms

trunk/docs/source/imports.rst

@@ -339 +339 @@
     :members: 
 
+.. automodule:: G2img_PILTIF
+    :members: 
+
 .. automodule:: G2img_CheMin
     :members: 

trunk/imports/G2img_1TIF.py

@@ -13 +13 @@
 Routine to read an image in Tagged-image file (TIF) format as well as a variety
 of slightly incorrect pseudo-TIF formats used at instruments around the world.
+This uses a custom reader that attempts to determine the instrument and detector
+parameters from various aspects of the file. 
+
 Note that the name ``G2img_1TIF`` is used so that this file will
 sort to the top of the image formats and thus show up first in the menu.
@@ -31 +34 @@
     '''Reads TIF files using a routine (:func:`GetTifData`) that looks
     for files that can be identified from known instruments and will
-    correct for slightly incorrect TIF usage. If that routine fails,
-    it will be read with a standard TIF reader, which can handle compression
-    and other things less commonly used at beamlines. 
+    correct for slightly incorrect TIF usage. 
     '''
     def __init__(self):
@@ -39 +40 @@
             extensionlist=('.tif','.tiff'),
             strictExtension=False,
-            formatName = 'TIF image',
-            longFormatName = 'Various .tif and pseudo-TIF formats'
+            formatName = 'GSAS-II known TIF image',
+            longFormatName = 'Various .tif and pseudo-TIF formats using GSAS-II reader'
             )
         self.scriptable = True
@@ -47 +48 @@
         '''Does the header match the required TIF header?
         '''
-        fp = open(filename,'rb')
-        tag = fp.read(2)
-        if 'bytes' in str(type(tag)):
-            tag = tag.decode('latin-1')
-        if tag == 'II' and int(st.unpack('<h',fp.read(2))[0]) == 42: #little endian
-            pass
-        elif tag == 'MM' and int(st.unpack('>h',fp.read(2))[0]) == 42: #big endian
-            pass
-        else:
-            return False # header not found; not valid TIF
-            fp.close()
-        fp.close()
-        return True
+        return TIFValidator(filename)
     
     def Reader(self,filename, ParentFrame=None, **unused):
-        '''Read the TIF file using :func:`GetTifData`. If that fails,
-        use :func:`scipy.misc.imread` and give the user a chance to
-        edit the likely wrong default image parameters. 
+        '''Read the TIF file using :func:`GetTifData` which attempts to 
+        recognize the detector type and set various parameters
         '''
+        self.Npix = 0
         self.Comments,self.Data,self.Npix,self.Image = GetTifData(filename)
-        if self.Npix == 0:
-            G2fil.G2Print("GetTifData failed to read "+str(filename)+" Trying PIL")
-            import PIL.Image as PI
-            self.Image = PI.open(filename,mode='r')
-            self.Npix = self.Image.size
-            if ParentFrame:
-                self.SciPy = True
-                self.Comments = ['no metadata']
-                self.Data = {'wavelength': 0.1, 'pixelSize': [200., 200.], 'distance': 100.0}
-                self.Data['size'] = list(self.Image.size)
-                self.Data['center'] = [int(i/2) for i in self.Image.size]
         if self.Npix == 0:
             return False
         self.LoadImage(ParentFrame,filename)
         return True
-
+    
 def GetTifData(filename):
     '''Read an image in a pseudo-tif format,
@@ -379 +357 @@
     File.close()    
     return head,data,Npix,image
+
+def TIFValidator(filename):
+    '''Does the header match the required TIF header?
+    '''
+    fp = open(filename,'rb')
+    tag = fp.read(2)
+    if 'bytes' in str(type(tag)):
+        tag = tag.decode('latin-1')
+    if tag == 'II' and int(st.unpack('<h',fp.read(2))[0]) == 42: #little endian
+        pass
+    elif tag == 'MM' and int(st.unpack('>h',fp.read(2))[0]) == 42: #big endian
+        pass
+    else:
+        return False # header not found; not valid TIF
+        fp.close()
+    fp.close()
+    return True