Changeset 101

Timestamp:

Jul 1, 2010 2:50:32 PM (13 years ago)

Author:

vondreel

Message:

new fortran histogram2d routine

Files:

• binaries/binwin2.6/histogram2d.pyd (added)
• binaries/binwin2.6/polymask.pyd (modified) (previous)
• trunk/GSASIIimage.py (modified) (4 diffs)

trunk/GSASIIimage.py

@@ -473 +473 @@
     polygons = masks['Polygons']
     tam = ma.make_mask_none((imageN,imageN))
+    if polygons:
+        print 'Generate polygon mask'
     for polygon in polygons:
         tamp = ma.make_mask_none((imageN*imageN))
         tam = ma.mask_or(tam.flatten(),ma.make_mask(pm.polymask(imageN*imageN,
             tax.flatten(),tay.flatten(),len(polygon),polygon,tamp)))
+    if spots:
+        print 'Generate spot mask'
     tam = np.reshape(tam,(imageN,imageN))
     for X,Y,diam in spots:
@@ -491 +495 @@
     TA = np.dstack((ma.getdata(TA[1]),ma.getdata(TA[0])))    #azimuth, 2-theta
     tax,tay = np.dsplit(TA,2)    #azimuth, 2-theta
+    if rings:
+        print 'Generate ring mask'
     for tth,thick in rings:
         tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.)))
+    if arcs:
+        print 'Generate arc mask'
     for tth,azm,thick in arcs:
         tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.))* \
@@ -506 +514 @@
 def Bin2ThetaAzimuthMap(data,tax,tay,taz):
     import numpy.ma as ma
+    import histogram2d as h2d
     LUtth = data['IOtth']
     if data['fullIntegrate']:
@@ -513 +522 @@
     numAzms = data['outAzimuths']
     numChans = data['outChannels']
-    NST = np.histogram2d(tax,tay,normed=False,bins=(numAzms,numChans),range=[LRazm,LUtth])
-    HST = np.histogram2d(tax,tay,normed=False,bins=(numAzms,numChans),range=[LRazm,LUtth],weights=taz)
+    NST = np.zeros(shape=(numAzms,numChans),dtype=int,order='F')
+    H0 = np.zeros(shape=(numAzms,numChans),order='F')
+    H1 = np.zeros(shape=(numAzms+1,))
+    H2 = np.zeros(shape=(numChans+1,))    
+    NST,H0,H1,H2 = h2d.histogram2d(len(tax),tax,tay,taz,numAzms,numChans,LRazm,LUtth,NST,H0,H1,H2)
+    HST = [H0,H1,H2]
     return NST,HST