Changeset 1763 for trunk/GSASIIplot.py

Timestamp:

Mar 25, 2015 5:25:15 PM (8 years ago)

Author:

vondreele

Message:

new item in imgGUI - Flat Bkg; subtracted from image on display & integration

File:

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

trunk/GSASIIplot.py

@@ -3346 +3346 @@
         Page.canvas.SetToolTipString('')
         sizexy = Data['size']
+        FlatBkg = Data.get('Flat Bkg',0.)
         if event.xdata and event.ydata and len(G2frame.ImageZ):                 #avoid out of frame errors
             Page.canvas.SetToolTipString('%8.2f %8.2fmm'%(event.xdata,event.ydata))
@@ -3372 +3373 @@
                 Int = 0
                 if (0 <= xpix <= sizexy[0]) and (0 <= ypix <= sizexy[1]):
-                    Int = G2frame.ImageZ[ypix][xpix]
+                    Int = G2frame.ImageZ[ypix][xpix]-int(FlatBkg)
                 tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
                 Q = 2.*math.pi/dsp
@@ -3447 +3448 @@
             return
         pixelSize = Data['pixelSize']
+        FlatBkg = Data.get('Flat Bkg',0.)
         scalex = 1000./pixelSize[0]
         scaley = 1000./pixelSize[1]
@@ -3460 +3462 @@
                     Xpix = Xpos*scalex
                     Ypix = Ypos*scaley
-                    xpos,ypos,I,J = G2img.ImageLocalMax(G2frame.ImageZ,pixLimit,Xpix,Ypix)
+                    xpos,ypos,I,J = G2img.ImageLocalMax(G2frame.ImageZ-FlatBkg,pixLimit,Xpix,Ypix)
                     if I and J:
                         xpos += .5                              #shift to pixel center
@@ -3525 +3527 @@
             StrSta['d-zero'].append({'Dset':dsp,'Dcalc':0.0,'pixLimit':10,'cutoff':0.5,
                 'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
-            R,r = G2img.MakeStrStaRing(StrSta['d-zero'][-1],G2frame.ImageZ,Data)
+            R,r = G2img.MakeStrStaRing(StrSta['d-zero'][-1],G2frame.ImageZ-FlatBkg,Data)
             if not len(R):
                 del StrSta['d-zero'][-1]
@@ -3708 +3710 @@
     #do threshold mask - "real" mask - others are just bondaries
     Zlim = Masks['Thresholds'][1]
+    FlatBkg = Data.get('Flat Bkg',0.0)
     wx.BeginBusyCursor()
     try:
@@ -3715 +3718 @@
             MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]),Zlim[1])
             MaskA = ma.getmaskarray(MA)
-            A = G2img.ImageCompress(MA,imScale)
+            A = G2img.ImageCompress(MA,imScale)-FlatBkg
             AM = G2img.ImageCompress(MaskA,imScale)
             if G2frame.logPlot: