Changeset 2290 for trunk/GSASIIimgGUI.py

Timestamp:

May 25, 2016 3:39:41 PM (6 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.

File:

• trunk/GSASIIimgGUI.py (modified) (3 diffs)

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')