Changeset 1152


Ignore:
Timestamp:
Nov 25, 2013 2:35:26 PM (8 years ago)
Author:
vondreele
Message:

fixes to image integration

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r1151 r1152  
    718718    return tax,tay,taz
    719719   
    720 def ImageIntegrate(image,data,masks,dlg=None):
     720def ImageIntegrate(image,data,masks,blkSize=128,dlg=None):
    721721    'Needs a doc string'
    722722    import histogram2d as h2d
    723723    print 'Begin image integration'
    724     blkSize = 128   #this seems to be optimal; will break in polymask if >1024
    725724    LUtth = data['IOtth']
    726725    LRazm = np.array(data['LRazimuth'],dtype=np.float64)
  • trunk/GSASIIimgGUI.py

    r1149 r1152  
    7373           
    7474    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
    7580        dlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
    7681            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
     
    8792                sumMax = np.max(sumImage)
    8893                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)
    9095            else:
    91                 G2frame.Integrate = G2img.ImageIntegrate(G2frame.ImageZ,data,masks,dlg)
     96                G2frame.Integrate = G2img.ImageIntegrate(G2frame.ImageZ,data,masks,blkSize,dlg)
    9297    #        G2plt.PlotIntegration(G2frame,newPlot=True)
    9398            G2IO.SaveIntegration(G2frame,G2frame.PickId,data)
Note: See TracChangeset for help on using the changeset viewer.