Changeset 1764

Timestamp:

Mar 26, 2015 12:28:50 PM (7 years ago)

Author:

vondreele

Message:

final touches on Flat Bkg image option

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASII.py

@@ -2355 +2355 @@
                             Data['background image'] = ['',-1.0]                            
                             Data['dark image'] = ['',-1.0]
+                            Data['Flat Bkg'] = 0.0
                         Data['setDefault'] = False
                         Data['range'] = [(Imin,Imax),[Imin,Imax]]

trunk/GSASIIimgGUI.py

@@ -159 +159 @@
                     backImage += BdarkImage*BdarkScale                
                 sumImg += backImage*backScale
-            sumImg -= data['Flat Bkg']
-            G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg)
+            G2frame.Integrate = G2img.ImageIntegrate(sumImg-data['Flat Bkg'],data,masks,blkSize,dlg)
 #            G2plt.PlotIntegration(G2frame,newPlot=True)
             Id = G2IO.SaveIntegration(G2frame,G2frame.PickId,data)
@@ -216 +215 @@
                                     Npix,imagefile = G2frame.PatternTree.GetItemPyData(id)
                                     backImage = G2IO.GetImageData(G2frame,imagefile,True)*backScale
+                                FlatBkg = Data.get('Flat Bkg',0.0)
                                 try:
                                     Masks = G2frame.PatternTree.GetItemPyData(
@@ -226 +226 @@
                                 CleanupMasks(Masks)
                                 if len(backImage):                                
-                                    G2frame.Integrate = G2img.ImageIntegrate(image+backImage,Data,Masks,blkSize,dlgp)
+                                    G2frame.Integrate = G2img.ImageIntegrate(image+backImage-FlatBkg,Data,Masks,blkSize,dlgp)
                                 else:
-                                    G2frame.Integrate = G2img.ImageIntegrate(image,Data,Masks,blkSize,dlgp)
+                                    G2frame.Integrate = G2img.ImageIntegrate(image-FlatBkg,Data,Masks,blkSize,dlgp)
                                 pId = G2IO.SaveIntegration(G2frame,Id,Data)
                             finally:

trunk/GSASIIplot.py

@@ -3716 +3716 @@
         if newImage:                    
             Imin,Imax = Data['range'][1]
-            MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]),Zlim[1])
+            MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]+FlatBkg),Zlim[1]+FlatBkg)
             MaskA = ma.getmaskarray(MA)
             A = G2img.ImageCompress(MA,imScale)-FlatBkg