Changeset 4181 for trunk/GSASIIimage.py

Timestamp:

Oct 16, 2019 3:51:36 PM (4 years ago)

Author:

vondreele

Message:

one more small improvement in integration speed

File:

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

trunk/GSASIIimage.py

@@ -1089 +1089 @@
     tabs = ma.compressed(ma.array(tabs.flatten(),mask=tam)) #ones - later used for absorption corr.
     pol = ma.compressed(ma.array(pol.flatten(),mask=tam))   #polarization
-    return tax,tay,taz,tad,tabs,pol
+    return tax,tay,taz/pol,tad,tabs
 
 def MakeUseTA(data,blkSize=128):
@@ -1189 +1189 @@
             t0 = time.time()
             Block = image[iBeg:iFin,jBeg:jFin]
-            tax,tay,taz,tad,tabs,pol = Fill2ThetaAzimuthMap(Masks,TA,tam,Block)    #and apply masks
+            tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(Masks,TA,tam,Block)    #and apply masks
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
             tax = np.where(tax < LRazm[0],tax+360.,tax)
@@ -1205 +1205 @@
 
             t0 = time.time()
-            taz = np.array((taz*tad/tabs),dtype='float32')/pol
+            taz = np.array((taz*tad/tabs),dtype='float32')
             if any([tax.shape[0],tay.shape[0],taz.shape[0]]):
                 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz,