Changeset 1958 for trunk/GSASIIspc.py

Timestamp:

Aug 21, 2015 2:57:01 PM (8 years ago)

Author:

vondreele

Message:

add r-values by SS index
add a fade for frac modulation of atoms in drawing
work on modulation structure factor

File:

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

trunk/GSASIIspc.py

@@ -1506 +1506 @@
         CSI = [np.zeros((2),dtype='i'),np.zeros(2)]
         if 'Crenel' in waveType:
-            dF = fracCrenel(tau,delt2[:1],delt2[1:]).squeeze()
+            dF = np.zeros_like(tau)
         else:
             dF = fracFourier(tau,nH,delt2[:1],delt2[1:]).squeeze()
@@ -1517 +1517 @@
             fsc = np.ones(2,dtype='i')
             if 'Crenel' in waveType:
-                dFT = fracCrenel(tauT,delt2[:1],delt2[1:]).squeeze()
+                dFT = np.zeros_like(tau)
                 fsc = [1,1]
             else:   #Fourier
@@ -1571 +1571 @@
             sdet,ssdet,dtau,dT,tauT = getTauT(tau,sop,ssop,XYZ)
             xsc = np.ones(6,dtype='i')
-            if waveType == 'Fourier':
+            if 'Fourier' in waveType:
                 dXT = posFourier(np.sort(tauT),nH,delt6[:3],delt6[3:])   #+np.array(XYZ)[:,np.newaxis,np.newaxis]
             elif waveType == 'Sawtooth':