Changeset 104 for trunk/GSASIIimage.py

Timestamp:

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

Author:

vondreel

Message:

new fortran binning routine added

File:

• trunk/GSASIIimage.py (modified) (3 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)