Changeset 104

Timestamp:

Jul 6, 2010 7:10:54 AM (13 years ago)

Author:

vondreel

Message:

new fortran binning routine added

Files:

• binaries/binwin2.6/histogram2d.pyd (modified) (previous)
• trunk/GSASIIimage.py (modified) (3 diffs)
• trunk/fsource/histogram2d.for (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -522 +522 @@
     numAzms = data['outAzimuths']
     numChans = data['outChannels']
-    NST = np.zeros(shape=(numAzms,numChans),dtype=int,order='F')
+    t0 = time.time()
+    NST = np.zeros(shape=(numAzms,numChans),dtype=np.int,order='F')
     H0 = np.zeros(shape=(numAzms,numChans),order='F')
     H1 = np.zeros(shape=(numAzms+1,))
@@ -528 +529 @@
     NST,H0,H1,H2 = h2d.histogram2d(len(tax),tax,tay,taz,numAzms,numChans,LRazm,LUtth,NST,H0,H1,H2)
     HST = [H0,H1,H2]
+    print "Binning elapsed time:","%8.3f"%(time.time()-t0), "s"
     return NST,HST
 
@@ -550 +552 @@
         dlg.Update(3)
         print 'Form normalized 1D pattern(s)'
-        self.Integrate = [HST[0]/NST[0],HST[1],HST[2]]
+        self.Integrate = [HST[0]/NST,HST[1],HST[2]]
         del NST,HST
         dlg.Update(4)

trunk/fsource/histogram2d.for

@@ -14 +14 @@
 Cf2py intent(in) YLIM
 Cf2py intent(in,out) NST
-Cf2py depend(NXBINS,NYBINS) 
+Cf2py depend(NXBINS,NYBINS) NST
 Cf2py intent(in,out) HST
-Cf2py depend(NXBINS,NYBINS) 
+Cf2py depend(NXBINS,NYBINS) HST
 Cf2py intent(in,out) HSTX
-Cf2py depend(NXBINS) 
+Cf2py depend(NXBINS) HSTX
 Cf2py intent(in,out) HSTY
-Cf2py depend(NYBINS) 
+Cf2py depend(NYBINS) HSTY
 
       IMPLICIT NONE
@@ -43 +43 @@
         HSTY(J) = YLIM(0)+FLOAT(J)*DY
       END DO
-
-      DO K=0,N
+      
+      DO K=0,N-1
         IF ( ( X(K) .GE. XLIM(0) .AND. X(K) .LE. XLIM(1)) .AND.
      1    (Y(K) .GE. YLIM(0) .AND. Y(K). LE. YLIM(1)) ) THEN
-          I = INT((X(K)-XLIM(0))/DX)
-          J = INT((Y(K)-YLIM(0))/DY)
+          I = NINT((X(K)-XLIM(0))/DX+0.5)-1
+          J = NINT((Y(K)-YLIM(0))/DY+0.5)-1
           NST(I,J) = NST(I,J)+1
           HST(I,J) = HST(I,J)+Z(K)