Changeset 1152
- Timestamp:
- Nov 25, 2013 2:35:26 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimage.py
r1151 r1152 718 718 return tax,tay,taz 719 719 720 def ImageIntegrate(image,data,masks, dlg=None):720 def ImageIntegrate(image,data,masks,blkSize=128,dlg=None): 721 721 'Needs a doc string' 722 722 import histogram2d as h2d 723 723 print 'Begin image integration' 724 blkSize = 128 #this seems to be optimal; will break in polymask if >1024725 724 LUtth = data['IOtth'] 726 725 LRazm = np.array(data['LRazimuth'],dtype=np.float64) -
trunk/GSASIIimgGUI.py
r1149 r1152 73 73 74 74 def OnIntegrate(event): 75 blkSize = 128 #this seems to be optimal; will break in polymask if >1024 76 Nx,Ny = data['size'] 77 nXBlks = (Nx-1)/blkSize+1 78 nYBlks = (Ny-1)/blkSize+1 79 Nup = nXBlks*nYBlks*3+3 75 80 dlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup, 76 81 style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE) … … 87 92 sumMax = np.max(sumImage) 88 93 maskCopy['Thresholds'] = [(sumMin,sumMax),[sumMin,sumMax]] 89 G2frame.Integrate = G2img.ImageIntegrate(sumImage,data,maskCopy, dlg)94 G2frame.Integrate = G2img.ImageIntegrate(sumImage,data,maskCopy,blkSize,dlg) 90 95 else: 91 G2frame.Integrate = G2img.ImageIntegrate(G2frame.ImageZ,data,masks, dlg)96 G2frame.Integrate = G2img.ImageIntegrate(G2frame.ImageZ,data,masks,blkSize,dlg) 92 97 # G2plt.PlotIntegration(G2frame,newPlot=True) 93 98 G2IO.SaveIntegration(G2frame,G2frame.PickId,data)
Note: See TracChangeset
for help on using the changeset viewer.