Changeset 1974
- Timestamp:
- Sep 20, 2015 1:51:29 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIImath.py
r1973 r1974 943 943 else: 944 944 nx = 1 945 if 'Sawtooth' in wav wTypes:945 if 'Sawtooth' in waveTypes: 946 946 XmodZ = 0 947 947 else: … … 952 952 Xmod = np.sum(XmodA+XmodB+XmodZ,axis=1) #atoms X pos X 32; sum waves 953 953 D = H[:,3][:,nxs]*(glTau[nxs,:]+S[:,nxs]) #m*tau; ops X 32 954 HdotX = np.inner(np.swapaxes(Xmod,1,2),H[ 0,:3])[:,:,nxs]+D.T[nxs,:,:] #atoms X 32 X ops954 HdotX = np.inner(np.swapaxes(Xmod,1,2),H[:,:3])+D.T[nxs,:,:] #atoms X 32 X ops 955 955 sinHA = np.sum(np.sin(twopi*HdotX)*glWt[nxs,:,nxs],axis=1) #atoms X ops 956 956 cosHA = np.sum(np.cos(twopi*HdotX)*glWt[nxs,:,nxs],axis=1)
Note: See TracChangeset
for help on using the changeset viewer.