Changeset 2014

Timestamp:

Oct 16, 2015 2:03:54 PM (6 years ago)

Author:

vondreele

Message:

remove Phi from Modulation & ModulationDerv? args. Not needed

Location:

trunk

Files:

• GSASIImath.py (modified) (3 diffs)
• GSASIIstrMath.py (modified) (2 diffs)

trunk/GSASIImath.py

@@ -926 +926 @@
 ################################################################################
     
-def Modulation(waveTypes,H,Phi,FSSdata,XSSdata,USSdata,Mast):
+def Modulation(waveTypes,H,FSSdata,XSSdata,USSdata,Mast):
     '''
     H: array nRefBlk x ops X hklt
@@ -985 +985 @@
     return np.array([cosHA,sinHA])             # 2 x refBlk x SGops x atoms
     
-def ModulationDerv(waveTypes,H,Phi,Hij,FSSdata,XSSdata,USSdata,Mast):
+def ModulationDerv(waveTypes,H,Hij,FSSdata,XSSdata,USSdata,Mast):
     '''
     H: array ops X hklt
@@ -996 +996 @@
     nxs = np.newaxis
     numeric = True   
-    cosHA,sinHA = Modulation(waveTypes,np.array([H,]),np.array([Phi,]),FSSdata,XSSdata,USSdata,Mast)
+    cosHA,sinHA = Modulation(waveTypes,np.array([H,]),FSSdata,XSSdata,USSdata,Mast)
     Mf = [H.shape[0],]+list(FSSdata.T.shape)    #ops x atoms x waves x 2 (sin+cos frac mods)
     dGdMfC = np.zeros(Mf)

trunk/GSASIIstrMath.py

@@ -1066 +1066 @@
             fa = np.array([np.reshape(((FF+FP).T-Bab).T,cosp.shape)*cosp*Tcorr,-Flack*FPP*sinp*Tcorr])
             fb = np.array([Flack*FPP*cosp*Tcorr,np.reshape(((FF+FP).T-Bab).T,sinp.shape)*sinp*Tcorr])
-        GfpuA = G2mth.Modulation(waveTypes,Uniq,Phi,FSSdata,XSSdata,USSdata,Mast) #2 x refBlk x sym X atoms
+        GfpuA = G2mth.Modulation(waveTypes,Uniq,FSSdata,XSSdata,USSdata,Mast) #2 x refBlk x sym X atoms
         fag = fa*GfpuA[0]-fb*GfpuA[1]   #real; 2 x refBlk x sym x atoms
         fbg = fb*GfpuA[0]+fa*GfpuA[1]
@@ -1197 +1197 @@
         fot = (FF+FP-Bab)*Tcorr     #ops x atoms
         fotp = FPP*Tcorr            #ops x atoms
-        GfpuA,dGdf,dGdx,dGdu = G2mth.ModulationDerv(waveTypes,Uniq,Phi,Hij,FSSdata,XSSdata,USSdata,Mast)
+        GfpuA,dGdf,dGdx,dGdu = G2mth.ModulationDerv(waveTypes,Uniq,Hij,FSSdata,XSSdata,USSdata,Mast)
         # derivs are: ops x atoms x waves x 1,3,or 6 parms as [real,imag] parts
         fa = np.array([((FF+FP).T-Bab).T*cosp*Tcorr,-Flack*FPP*sinp*Tcorr]) # array(2,nTwin,nEqv,nAtoms)