Changeset 4180

Timestamp:

Oct 16, 2019 3:46:52 PM (4 years ago)

Author:

vondreele

Message:

reoptimize integration block size; now 128 seems fastest (was 256 but added an array)

Location:

trunk

Files:

• GSASIIimage.py (modified) (7 diffs)
• GSASIIimgGUI.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1073 +1073 @@
     arcs = masks['Arcs']
     TA = np.dstack((ma.getdata(TA[1]),ma.getdata(TA[0]),ma.getdata(TA[2]),ma.getdata(TA[3])))    #azimuth, 2-theta, dist, pol
-    tax,tay,tad,pol = np.dsplit(TA,4)    #azimuth, 2-theta, dist**2/d0**2
+    tax,tay,tad,pol = np.dsplit(TA,4)    #azimuth, 2-theta, dist**2/d0**2, pol
     for tth,thick in rings:
         tam = ma.mask_or(tam.flatten(),ma.getmask(ma.masked_inside(tay.flatten(),max(0.01,tth-thick/2.),tth+thick/2.)))
@@ -1172 +1172 @@
             jFin = min(jBeg+blkSize,Nx)
             # next is most expensive step!
+
             t0 = time.time()
             if useTA:
@@ -1177 +1178 @@
             else:
                 TA = Make2ThetaAzimuthMap(data,(iBeg,iFin),(jBeg,jFin))           #2-theta & azimuth arrays & create position mask
-            times[1] += time.time()-t0
+            times[1] += time.time()-t0      #xy->th,azm
+
             t0 = time.time()
             if useMask:
@@ -1183 +1185 @@
             else:
                 tam = MakeMaskMap(data,Masks,(iBeg,iFin),(jBeg,jFin),tamp)
+            times[0] += time.time()-t0      #apply masks
+
+            t0 = time.time()
             Block = image[iBeg:iFin,jBeg:jFin]
             tax,tay,taz,tad,tabs,pol = Fill2ThetaAzimuthMap(Masks,TA,tam,Block)    #and apply masks
-#            pol = TA[3].flatten()     #G2pwd.Polarization(data['PolaVal'][0],tay,tax-90.)[0]         #for pixel pola correction
-            times[0] += time.time()-t0
-            t0 = time.time()
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
             tax = np.where(tax < LRazm[0],tax+360.,tax)
@@ -1200 +1202 @@
             elif 'q' == data.get('binType','').lower():
                 tay = 4.*np.pi*npsind(tay/2.)/data['wavelength']
-            times[2] += time.time()-t0
+            times[2] += time.time()-t0          #fill map
+
             t0 = time.time()
             taz = np.array((taz*tad/tabs),dtype='float32')/pol
@@ -1206 +1209 @@
                 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz,
                     numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0)
-            times[3] += time.time()-t0
+            times[3] += time.time()-t0          #binning
     G2fil.G2Print('End integration loops')
+
     t0 = time.time()
     #prepare masked arrays of bins with pixels for interpolation setup
@@ -1232 +1236 @@
     if data['Oblique'][1]:
         H0 /= G2pwd.Oblique(data['Oblique'][0],H2[:-1])
-    times[4] += time.time()-t0
+    times[4] += time.time()-t0          #cleanup
+
     G2fil.G2Print ('Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \
         \n binning      %8.3fs cleanup      %8.3fs'%(times[0],times[1],times[2],times[3],times[4]))

trunk/GSASIIimgGUI.py

@@ -150 +150 @@
 ##### Image Controls
 ################################################################################                    
-blkSize = 256   #256 seems to be optimal; will break in polymask if >1024
+blkSize = 128   #128 seems to be optimal; will break in polymask if >1024
 def UpdateImageControls(G2frame,data,masks,useTA=None,useMask=None,IntegrateOnly=False):
     '''Shows and handles the controls on the "Image Controls"