Changeset 1763 for trunk/GSASIIimgGUI.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/GSASIIimgGUI.py (modified) (7 diffs)

trunk/GSASIIimgGUI.py

@@ -93 +93 @@
     import ImageCalibrants as calFile
 #patch
+    if 'Flat Bkg' not in data:
+        data['Flat Bkg'] = 0.0
     if 'GonioAngles' not in data:
         data['GonioAngles'] = [0.,0.,0.]
@@ -157 +159 @@
                     backImage += BdarkImage*BdarkScale                
                 sumImg += backImage*backScale
+            sumImg -= data['Flat Bkg']
             G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)
 #            G2plt.PlotIntegration(G2frame,newPlot=True)
@@ -297 +300 @@
                     'tilt','rotation','azmthOff','fullIntegrate','LRazimuth',
                     'IOtth','outChannels','outAzimuths','invert_x','invert_y','DetDepth',
-                    'calibskip','pixLimit','cutoff','calibdmin','chisq',
+                    'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
                     'binType','SampleShape','PolaVal','SampleAbs','dark image','background image']
                 for key in keys:
@@ -310 +313 @@
         cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type',
             'fullIntegrate','outChannels','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
-            'calibskip','pixLimit','cutoff','calibdmin','chisq',
+            'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
             'PolaVal','SampleAbs','dark image','background image']
         dlg = wx.FileDialog(G2frame, 'Choose image controls file', '.', '', 
@@ -790 +793 @@
             data['dark image'][0] = darkImage.GetValue()
             G2plt.PlotExposedImage(G2frame,event=event)
+            
+        def OnFlatBkg(event):
+            try:
+                value = float(flatbkg.GetValue())
+                data['Flat Bkg'] = value
+            except ValueError:
+                pass
+            flatbkg.SetValue("%.0f"%(data['Flat Bkg']))    
+            G2plt.PlotExposedImage(G2frame,event=event)
 
         def OnBackMult(event):
@@ -808 +820 @@
             G2plt.PlotExposedImage(G2frame,event=event)
         
-        backSizer = wx.FlexGridSizer(0,4,5,5)
+        backSizer = wx.FlexGridSizer(0,6,5,5)
 
         backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Dark image'),0,WACV)
@@ -822 +834 @@
         darkMult.Bind(wx.EVT_KILL_FOCUS,OnDarkMult)
         backSizer.Add(darkMult,0,WACV)
+        backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Flat Bkg: '),0,WACV)
+        flatbkg = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%.0f" % (data['Flat Bkg'])),
+            style=wx.TE_PROCESS_ENTER)
+        flatbkg.Bind(wx.EVT_TEXT_ENTER,OnFlatBkg)
+        flatbkg.Bind(wx.EVT_KILL_FOCUS,OnFlatBkg)
+        backSizer.Add(flatbkg,0,WACV)
 
         backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background image'),0,WACV)