Changeset 55 for trunk/GSASIIcomp.py

Timestamp:

Apr 29, 2010 12:27:45 PM (13 years ago)

Author:

vondreel

Message:

3rd try - reduce meatrices in integration

File:

• trunk/GSASIIcomp.py (modified) (5 diffs)

trunk/GSASIIcomp.py

@@ -1341 +1341 @@
     sphi = sind(phi)
     ring = []
-    for a in range(0,360,2):
+    for a in range(-180,180,2):
         x = radii[0]*cosd(a)
         y = radii[1]*sind(a)
@@ -1436 +1436 @@
     return xy
                     
-def GetTthDspAzm(x,y,data):
+def GetTthAzmDsp(x,y,data):
     wave = data['wavelength']
     dist = data['distance']
@@ -1453 +1453 @@
     
 def GetTth(x,y,data):
-    return GetTthDspAzm(x,y,data)[0]
+    return GetTthAzmDsp(x,y,data)[0]
     
 def GetTthAzm(x,y,data):
-    return GetTthDspAzm(x,y,data)[0:2]
+    return GetTthAzmDsp(x,y,data)[0:2]
     
 def GetDsp(x,y,data):
-    return GetTthDspAzm(x,y,data)[2]
+    return GetTthAzmDsp(x,y,data)[2]
        
 def ImageCompress(image,scale):
@@ -1662 +1662 @@
     self.TA = GetTthAzm(tay,tax,data)           #2-theta & azimuth arrays
     self.TA = np.reshape(self.TA,(2,imageN,imageN))
-    self.TA = np.dstack((self.TA[1],self.TA[0],self.ImageZ))    #azimuth, 2-theta, intensity order
+    self.TA = np.dstack((self.TA[1],self.TA[0]))    #azimuth, 2-theta
     t2 = time.time()
     print "Elapsed time:","%8.3f"%(t2-t1), "s"
@@ -1668 +1668 @@
     print 'Form 1-D histograms for ',numAzms,' azimuthal angles'
     print 'Integration limits:',LUtth,LRazm
-    tax,tay,taz = np.dsplit(self.TA,3)    #azimuth, 2-theta, intensity
+    tax,tay = np.dsplit(self.TA,2)    #azimuth, 2-theta, intensity
     NST = np.histogram2d(tax.flatten(),tay.flatten(),normed=False, \
         bins=(numAzms,numChans),range=[LRazm,LUtth])
     HST = np.histogram2d(tax.flatten(),tay.flatten(),normed=False, \
-        bins=(numAzms,numChans),weights=taz.flatten(),range=[LRazm,LUtth])
+        bins=(numAzms,numChans),weights=self.ImageZ.flatten(),range=[LRazm,LUtth])
     t3 = time.time()
     print "Elapsed time:","%8.3f"%(t3-t2), "s"