Changeset 2305 for trunk/GSASIIimage.py
 Timestamp:
 Jun 2, 2016 3:09:39 PM (6 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIimage.py
r2304 r2305 414 414 X = np.dstack([dx.T,dy.T,np.zeros_like(dx.T)]) 415 415 Z = np.dot(X,MN).T[2] 416 tth = npatand(np.sqrt(dx**2+dy**2Z**2)/(distZ)) 416 xyZ = dx**2+dy**2Z**2 417 tth = npatand(np.sqrt(xyZ)/(distZ)) 417 418 dxy = peneCorr(tth,data['DetDepth'],tilt,npatan2d(dy,dx)) 418 tth = npatan2d(np.sqrt( dx**2+dy**2Z**2),distZ+dxy)419 tth = npatan2d(np.sqrt(xyZ),distZ+dxy) 419 420 azm = (npatan2d(dy,dx)+data['azmthOff']+720.)%360. 420 421 return tth,azm,G … … 900 901 jFin = min(jBeg+blkSize,Nx) 901 902 # next is most expensive step! 902 # print 'before Make'903 903 TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times) #2theta & azimuth arrays & create position mask 904 # print '\tafter Make'905 904 Nup += 1 906 905 if dlg: … … 908 907 Block = image[iBeg:iFin,jBeg:jFin] 909 908 t0 = time.time() 910 # print 'before Fill'911 909 tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(masks,TA,tam,Block) #and apply masks 912 # print '\tafter Fill'913 910 del TA; del tam 914 911 times[2] += time.time()t0 … … 929 926 tay = 4.*np.pi*npsind(tay/2.)/data['wavelength'] 930 927 t0 = time.time() 928 taz = np.array((taz*tad/tabs),dtype='float32') 931 929 if any([tax.shape[0],tay.shape[0],taz.shape[0]]): 932 # print 'before histo' 933 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz*tad/tabs, 930 NST,H0 = h2d.histogram2d(len(tax),tax,tay,taz, 934 931 numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0) 935 # print '\tafter histo'936 932 times[3] += time.time()t0 937 933 Nup += 1
Note: See TracChangeset
for help on using the changeset viewer.