Changeset 1764
- Timestamp:
- Mar 26, 2015 12:28:50 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1744 r1764 2355 2355 Data['background image'] = ['',-1.0] 2356 2356 Data['dark image'] = ['',-1.0] 2357 Data['Flat Bkg'] = 0.0 2357 2358 Data['setDefault'] = False 2358 2359 Data['range'] = [(Imin,Imax),[Imin,Imax]] -
trunk/GSASIIimgGUI.py
r1763 r1764 159 159 backImage += BdarkImage*BdarkScale 160 160 sumImg += backImage*backScale 161 sumImg -= data['Flat Bkg'] 162 G2frame.Integrate = G2img.ImageIntegrate(sumImg,data,masks,blkSize,dlg) 161 G2frame.Integrate = G2img.ImageIntegrate(sumImg-data['Flat Bkg'],data,masks,blkSize,dlg) 163 162 # G2plt.PlotIntegration(G2frame,newPlot=True) 164 163 Id = G2IO.SaveIntegration(G2frame,G2frame.PickId,data) … … 216 215 Npix,imagefile = G2frame.PatternTree.GetItemPyData(id) 217 216 backImage = G2IO.GetImageData(G2frame,imagefile,True)*backScale 217 FlatBkg = Data.get('Flat Bkg',0.0) 218 218 try: 219 219 Masks = G2frame.PatternTree.GetItemPyData( … … 226 226 CleanupMasks(Masks) 227 227 if len(backImage): 228 G2frame.Integrate = G2img.ImageIntegrate(image+backImage ,Data,Masks,blkSize,dlgp)228 G2frame.Integrate = G2img.ImageIntegrate(image+backImage-FlatBkg,Data,Masks,blkSize,dlgp) 229 229 else: 230 G2frame.Integrate = G2img.ImageIntegrate(image ,Data,Masks,blkSize,dlgp)230 G2frame.Integrate = G2img.ImageIntegrate(image-FlatBkg,Data,Masks,blkSize,dlgp) 231 231 pId = G2IO.SaveIntegration(G2frame,Id,Data) 232 232 finally: -
trunk/GSASIIplot.py
r1763 r1764 3716 3716 if newImage: 3717 3717 Imin,Imax = Data['range'][1] 3718 MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0] ),Zlim[1])3718 MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]+FlatBkg),Zlim[1]+FlatBkg) 3719 3719 MaskA = ma.getmaskarray(MA) 3720 3720 A = G2img.ImageCompress(MA,imScale)-FlatBkg
Note: See TracChangeset
for help on using the changeset viewer.