Changeset 2789

Timestamp:

Apr 18, 2017 12:47:27 PM (6 years ago)

Author:

vondreele

Message:

fix GetImageZ to correctly treat background/dark images.

File:

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

trunk/GSASIIimgGUI.py

@@ -68 +68 @@
     if sumImg is None:
         return []
-    if not 'dark image' in data:
-        return sumImg
-    darkImg,darkScale = data['dark image']
-    if darkImg:
-        Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, darkImg)
-        if Did:
-            Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
-            dformatName = Ddata.get('formatName','')
-            Npix,darkfile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
-            darkImage = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag,FormatName=dformatName)
-            if darkImg is not None:                
-                sumImg += np.array(darkImage*darkScale,dtype='int32')
-    if not 'background image' in data:
-        return sumImg
-    backImg,backScale = data['background image']            
-    if backImg:     #ignores any transmission effect in the background image
-        Bid = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, backImg)
-        if Bid:
-            Npix,backfile,imagetag = G2IO.GetCheckImageFile(G2frame,Bid)
-            Bdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Bid,'Image Controls'))
-            bformatName = Bdata.get('formatName','')
-            backImage = G2IO.GetImageData(G2frame,backfile,True,ImageTag=imagetag,FormatName=bformatName)
-            if darkImg and backImage is not None:
-                Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root,darkImg)
-                if Did:
-                    Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
-                    dformatName = Ddata.get('formatName','')
-                    Npix,darkfile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
-                    darkImage = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag,FormatName=dformatName)
-                    if darkImage is not None:
-                        backImage += np.array(darkImage*darkScale,dtype='int32')
-            if backImage is not None:
-                sumImg += np.array(backImage*backScale,dtype='int32')
+    darkImg = False
+    if 'dark image' in data:
+        darkImg,darkScale = data['dark image']
+        if darkImg:
+            Did = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, darkImg)
+            if Did:
+                Ddata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Did,'Image Controls'))
+                dformatName = Ddata.get('formatName','')
+                Npix,darkfile,imagetag = G2IO.GetCheckImageFile(G2frame,Did)
+                darkImage = G2IO.GetImageData(G2frame,darkfile,True,ImageTag=imagetag,FormatName=dformatName)
+                if darkImg is not None:                
+                    sumImg += np.array(darkImage*darkScale,dtype='int32')
+    if 'background image' in data:
+        backImg,backScale = data['background image']            
+        if backImg:     #ignores any transmission effect in the background image
+            Bid = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, backImg)
+            if Bid:
+                Npix,backfile,imagetag = G2IO.GetCheckImageFile(G2frame,Bid)
+                Bdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Bid,'Image Controls'))
+                bformatName = Bdata.get('formatName','')
+                backImage = G2IO.GetImageData(G2frame,backfile,True,ImageTag=imagetag,FormatName=bformatName)
+                if darkImg and backImage is not None:
+                    backImage += np.array(darkImage*darkScale/backScale,dtype='int32')
+                if backImage is not None:
+                    sumImg += np.array(backImage*backScale,dtype='int32')
     if darkImg: del darkImg         #force cleanup
     if backImg: del backImg
@@ -107 +99 @@
     if 'range' not in data or newRange:
         data['range'] = [(0,Imax),[0,Imax]]
-    return sumImg
+    return np.asarray(sumImg,dtype='int32')
 
 def UpdateImageData(G2frame,data):
@@ -989 +981 @@
         def OnBackImage(event):
             data['background image'][0] = backImage.GetValue()
-            G2frame.ImageZ = GetImageZ(G2frame,data)
+            G2frame.ImageZ = GetImageZ(G2frame,data,newRange=True)
             ResetThresholds()
             wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)
@@ -995 +987 @@
         def OnDarkImage(event):
             data['dark image'][0] = darkImage.GetValue()
-            G2frame.ImageZ = GetImageZ(G2frame,data)
+            G2frame.ImageZ = GetImageZ(G2frame,data,newRange=True)
             ResetThresholds()
             wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)
@@ -1007 +999 @@
 
         def OnMult(invalid,value,tc):
-            G2frame.ImageZ = GetImageZ(G2frame,data)
+            G2frame.ImageZ = GetImageZ(G2frame,data,newRange=True)
             ResetThresholds()
             wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=tc.event)
@@ -1281 +1273 @@
         wx.CallAfter(G2plt.PlotExposedImage,G2frame)
 
+    def newReplot(*args,**kwargs):
+        wx.CallAfter(G2plt.PlotExposedImage,G2frame,newPlot=True)
+
     def onDeleteMask(event):
         Obj = event.GetEventObject()
@@ -1629 +1624 @@
     littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Lower/Upper thresholds '),0,WACV)
     lowerThreshold = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,loc=thresh[1],key=0,
-        min=thresh[0][0],OnLeave=Replot,typeHint=int)
+        min=thresh[0][0],OnLeave=newReplot,typeHint=int)
     littleSizer.Add(lowerThreshold,0,WACV)
     upperThreshold = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,loc=thresh[1],key=1,
-        max=thresh[0][1],OnLeave=Replot,typeHint=int)
+        max=thresh[0][1],OnLeave=newReplot,typeHint=int)
     littleSizer.Add(upperThreshold,0,WACV)
     mainSizer.Add(littleSizer,0,)