Changeset 1152

Timestamp:

Nov 25, 2013 2:35:26 PM (9 years ago)

Author:

vondreele

Message:

fixes to image integration

Location:

trunk

Files:

• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -718 +718 @@
     return tax,tay,taz
     
-def ImageIntegrate(image,data,masks,dlg=None):
+def ImageIntegrate(image,data,masks,blkSize=128,dlg=None):
     'Needs a doc string'
     import histogram2d as h2d
     print 'Begin image integration'
-    blkSize = 128   #this seems to be optimal; will break in polymask if >1024
     LUtth = data['IOtth']
     LRazm = np.array(data['LRazimuth'],dtype=np.float64)

trunk/GSASIIimgGUI.py

@@ -73 +73 @@
             
     def OnIntegrate(event):
+        blkSize = 128   #this seems to be optimal; will break in polymask if >1024
+        Nx,Ny = data['size']
+        nXBlks = (Nx-1)/blkSize+1
+        nYBlks = (Ny-1)/blkSize+1
+        Nup = nXBlks*nYBlks*3+3
         dlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
             style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
@@ -87 +92 @@
                 sumMax = np.max(sumImage)
                 maskCopy['Thresholds'] = [(sumMin,sumMax),[sumMin,sumMax]]
-                G2frame.Integrate = G2img.ImageIntegrate(sumImage,data,maskCopy,dlg)
+                G2frame.Integrate = G2img.ImageIntegrate(sumImage,data,maskCopy,blkSize,dlg)
             else:
-                G2frame.Integrate = G2img.ImageIntegrate(G2frame.ImageZ,data,masks,dlg)
+                G2frame.Integrate = G2img.ImageIntegrate(G2frame.ImageZ,data,masks,blkSize,dlg)
     #        G2plt.PlotIntegration(G2frame,newPlot=True)
             G2IO.SaveIntegration(G2frame,G2frame.PickId,data)