Changeset 123

Timestamp:

Jul 19, 2010 8:08:57 AM (13 years ago)

Author:

vondreel

Message:

Integrate All fixes

File:

• trunk/GSASIIimage.py (modified) (4 diffs)

trunk/GSASIIimage.py

@@ -501 +501 @@
             ma.getmask(ma.masked_inside(tax.flatten(),azm[0],azm[1])))
     taz = ma.masked_greater(ma.masked_less(image,Zlim[0]),Zlim[1]).flatten()
-    tam = ma.mask_or(tam,ma.getmask(taz))
+    tam = ma.mask_or(tam.flatten(),ma.getmask(taz))
     tax = ma.compressed(ma.array(tax.flatten(),mask=tam))
     tay = ma.compressed(ma.array(tay.flatten(),mask=tam))
-    taz = ma.compressed(ma.array(taz,mask=tam))
+    taz = ma.compressed(ma.array(taz.flatten(),mask=tam))
     del(tam)
     return tax,tay,taz
     
-def ImageIntegrate(self,data,masks):
+def ImageIntegrate(image,data,masks):
     import histogram2d as h2d
     print 'Begin image integration'
@@ -522 +522 @@
     NST = np.zeros(shape=(numAzms,numChans),dtype=np.int,order='F')
     H0 = np.zeros(shape=(numAzms,numChans),order='F',dtype=np.float32)
-    imageN = len(self.ImageZ)
+    imageN = len(image)
     nBlks = (imageN-1)/1024+1
     dlg = wx.ProgressDialog("Elapsed time","2D image integration",nBlks*nBlks*3+3,
@@ -540 +540 @@
                 Nup += 1
                 dlg.Update(Nup)
-                Block = self.ImageZ[iBeg:iFin,jBeg:jFin]
+                Block = image[iBeg:iFin,jBeg:jFin]
                 tax,tay,taz = Fill2ThetaAzimuthMap(masks,TA,tam,Block)    #and apply masks
-                del TA
+                del TA,tam
                 Nup += 1
                 dlg.Update(Nup)
                 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz,numAzms,numChans,LRazm,LUtth,Dazm,Dtth,NST,H0)
+                del tax,tay,taz
                 Nup += 1
                 dlg.Update(Nup)
@@ -558 +559 @@
         else:
             H1 = LRazm
-        self.Integrate = [H0,H1,H2]
-        print 'Binning complete'
         Nup += 1
         dlg.Update(Nup)
         t1 = time.time()
-        print "Elapsed time:","%8.3f"%(t1-t0), "s"
-        print 'Integration complete'
     finally:
         dlg.Destroy()
+    print 'Integration complete'
+    print "Elapsed time:","%8.3f"%(t1-t0), "s"
+    return H0,H1,H2