Changeset 2290

Timestamp:

May 25, 2016 3:39:41 PM (7 years ago)

Author:

vondreele

Message:

complex problem - fix summing of GE images; needed new item in Image Controls to save which reader was used. Change to OnImportGeneric? to keep self.formatName; GetImageData? put it in the call & check it with the available readers & GetImageZ to get it out of the Image Controls & apply it in GetImageData?.
Add a test on file size for GE files.

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)
• imports/G2img_GE.py (modified) (6 diffs)

trunk/GSASII.py

@@ -525 +525 @@
                     if flag: # this read succeeded
                         rd.readfilename = filename
-                        if load2Tree:
+                        if load2Tree:   #images only
                             if rd.repeatcount == 1 and not rd.repeat: # skip image number if only one in set
                                 rd.Data['ImageTag'] = None
                             else:
                                 rd.Data['ImageTag'] = rd.repeatcount
+                            rd.Data['formatName'] = rd.formatName
                             G2IO.LoadImage2Tree(rd.readfilename,self,rd.Comments,rd.Data,rd.Npix,rd.Image)
                             rd_list.append(True) # save a stub the result before it is written over

trunk/GSASIIIO.py

@@ -345 +345 @@
     G2frame.Image = Id
 
-def GetImageData(G2frame,imagefile,imageOnly=False,ImageTag=None):
+def GetImageData(G2frame,imagefile,imageOnly=False,ImageTag=None,FormatName=''):
     '''Read a single image with an image importer. 
 
@@ -354 +354 @@
     :param int/str ImageTag: specifies a particular image to be read from a file.
       First image is read if None (default).
+    :param str formatName: the image reader formatName
 
     :returns: an image as a numpy array or a list of four items:
@@ -367 +368 @@
             secondaryReaders.append(rd)
         elif flag:
-            primaryReaders.append(rd)
+            if not FormatName:
+                primaryReaders.append(rd)
+            elif FormatName == rd.formatName:
+                primaryReaders.append(rd)
     if len(secondaryReaders) + len(primaryReaders) == 0:
         print('Error: No matching format for file '+filename)

trunk/GSASIIimgGUI.py

@@ -60 +60 @@
     Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(G2frame.Image)
     imagefile = G2IO.CheckImageFile(G2frame,imagefile)
-    sumImg = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
+    formatName = data.get('formatName','')
+    sumImg = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=formatName)
     if not 'dark image' in data:
         return sumImg
@@ -66 +67 @@
     if darkImg:
         Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, darkImg)
+        Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
+        dformatName = Ddata.get('formatName','')
         if Did:
             Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
             imagefile = G2IO.CheckImageFile(G2frame,imagefile)
-            darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
+            darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
             sumImg += np.array(darkImage*darkScale,dtype='int32')
     if not 'background image' in data:
@@ -79 +82 @@
             Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Bid)
             imagefile = G2IO.CheckImageFile(G2frame,imagefile)
-            backImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
             Bdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Bid,'Image Controls'))
+            bformatName = Bdata.get('formatName','')
+            backImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=bformatName)
             if darkImg:
                 Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root,darkImg)
+                Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
+                dformatName = Ddata.get('formatName','')
                 Npix,imagefile,imagetag = G2frame.PatternTree.GetImageLoc(Did)
                 imagefile = G2IO.CheckImageFile(G2frame,imagefile)
-                darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag)
+                darkImage = G2IO.GetImageData(G2frame,imagefile,True,ImageTag=imagetag,FormatName=dformatName)
                 backImage += np.array(darkImage*darkScale,dtype='int32')                
             sumImg += np.array(backImage*backScale,dtype='int32')

trunk/imports/G2img_GE.py

@@ -41 +41 @@
 
     def ContentsValidator(self, filepointer):
-        '''no test at this time
+        '''just a test on file size
         '''
+        if '.sum' not in str(filepointer):
+            try:
+                statinfo = os.stat(str(filepointer).split("'")[1])
+                fsize = statinfo.st_size
+                self.nimages = (fsize-8192)/(2*2048**2)
+            except:
+                return False    #bad file size
         return True
         
@@ -52 +59 @@
         #sum = kwarg.get('sum')
         if imagenum is None: imagenum = 1
-        self.Comments,self.Data,self.Npix,self.Image,more = GetGEsumData(filename,imagenum=imagenum)
+        self.Comments,self.Data,self.Npix,self.Image,more = \
+            GetGEsumData(filename,imagenum=imagenum)
         if self.Npix == 0 or not self.Comments:
             return False
@@ -60 +68 @@
         return True
 
-class GE_sumReaderClass(G2IO.ImportImage):
+class GEsum_ReaderClass(G2IO.ImportImage):
     '''Routine to read multiple GE images & sum them, typically from APS Sector 1.
         
@@ -79 +87 @@
 
     def ContentsValidator(self, filepointer):
-        '''no test at this time
+        '''just a test on file size
         '''
+        try:
+            statinfo = os.stat(str(filepointer).split("'")[1])
+            fsize = statinfo.st_size
+            nimages = (fsize-8192)/(2*2048**2)
+        except:
+            return False    #bad file size
         return True
         
@@ -89 +103 @@
         imagenum = kwarg.get('blocknum')
         if imagenum is None: imagenum = 1
-        self.Comments,self.Data,self.Npix,self.Image,more = GetGEsumData(filename,imagenum=imagenum,sum=True)
+        self.Comments,self.Data,self.Npix,self.Image,more = \
+            GetGEsumData(filename,imagenum=imagenum,sum=True)
         if self.Npix == 0 or not self.Comments:
             return False
@@ -140 +155 @@
         if sum:    #will ignore imagenum
             while nframes > 1: #OK, this will sum the frames.
-        #      print 'adding'
                 image += np.array(ar.array('H',File.read(2*Npix)),dtype=np.int32)
                 nframes -= 1