Changeset 3765 for trunk/GSASIIspc.py
 Timestamp:
 Dec 15, 2018 1:42:13 PM (5 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIspc.py
r3754 r3765 2584 2584 return A+B 2585 2585 2586 def posSawtooth(tau,Toff,slopes):2587 Tau = (tauToff)%1.2588 A = slopes[:,nxs]*Tau2589 return A2590 2591 2586 def posZigZag(tau,Tmm,XYZmax): 2592 2587 DT = Tmm[1]Tmm[0] … … 2665 2660 dX = posFourier(tau,nH,delt6[:3],delt6[3:]) #+np.array(XYZ)[:,nxs,nxs] 2666 2661 #3x6x12 modulated position array (X,Spos,tau)& force positive 2667 elif waveType == 'Sawtooth':2668 dX = posSawtooth(tau,delt4[0],delt4[1:])2669 2662 elif waveType in ['ZigZag','Block']: 2670 2663 if waveType == 'ZigZag': … … 2680 2673 if 'Fourier' in waveType: 2681 2674 CSI = [np.zeros((6,3),dtype='i'),np.zeros((6,3))] 2682 elif waveType == 'Sawtooth':2683 CSI = [np.array([[1,0,0],[2,0,0],[3,0,0],[4,0,0]]),2684 np.array([[1.0,.0,.0],[1.0,.0,.0],[1.0,.0,.0],[1.0,.0,.0]])]2685 2675 elif waveType in ['ZigZag','Block']: 2686 2676 CSI = [np.array([[1,0,0],[2,0,0],[3,0,0],[4,0,0],[5,0,0]]), … … 2695 2685 if 'Fourier' in waveType: 2696 2686 dXT = posFourier(np.sort(tauT),nH,delt6[:3],delt6[3:]) #+np.array(XYZ)[:,nxs,nxs] 2697 elif waveType == 'Sawtooth':2698 dXT = posSawtooth(tauT,delt4[0],delt4[1:])+np.array(XYZ)[:,nxs,nxs]2699 2687 elif waveType == 'ZigZag': 2700 2688 dXT = posZigZag(tauT,delt5[:2],delt5[2:])+np.array(XYZ)[:,nxs,nxs] … … 2750 2738 CSI[1][:2] = [[1.,0,0],[mul,0,0]] 2751 2739 xsc[:2] = 0 2740 else: 2741 for i in range(3): 2742 if not np.allclose(dX[:,i],dXT[i,:,i]): 2743 xsc[i] = 0 2752 2744 XSC &= xsc 2753 2745 if debug: print (SSMT2text(ssop).replace(' ',''),sdet,ssdet,epsinv,xsc)
Note: See TracChangeset
for help on using the changeset viewer.