Changeset 1464 for trunk/GSASIImath.py

Timestamp:

Aug 17, 2014 4:05:35 PM (9 years ago)

Author:

vondreele

Message:

change sig-q & beta-q functionality to be 1/d2 - seems to work better

File:

• trunk/GSASIImath.py (modified) (4 diffs)

trunk/GSASIImath.py

@@ -2049 +2049 @@
     
     '''
-    return ins['sig-0']+ins['sig-1']*dsp**2+ins['sig-2']*dsp**4+ins['sig-q']*dsp
+    return ins['sig-0']+ins['sig-1']*dsp**2+ins['sig-2']*dsp**4+ins['sig-q']/dsp**2
     
 def getTOFsigDeriv(dsp):
@@ -2059 +2059 @@
     
     '''
-    return 1.0,dsp**2,dsp**4,dsp
+    return 1.0,dsp**2,dsp**4,1./dsp**2
     
 def getTOFgamma(ins,dsp):
@@ -2093 +2093 @@
     
     '''
-    return ins['beta-0']+ins['beta-1']/dsp**4+ins['beta-q']/dsp
+    return ins['beta-0']+ins['beta-1']/dsp**4+ins['beta-q']/dsp**2
     
 def getTOFbetaDeriv(dsp):
@@ -2103 +2103 @@
     
     '''
-    return 1.0,1./dsp**4,1./dsp
+    return 1.0,1./dsp**4,1./dsp**2
     
 def getTOFalpha(ins,dsp):