Changeset 1340 for trunk/GSASIIobj.py

Timestamp:

May 10, 2014 8:12:27 PM (8 years ago)

Author:

toby

Message:

complete parametric fitting and tutorial

File:

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

trunk/GSASIIobj.py

@@ -1247 +1247 @@
         'Vol' : 'Unit cell volume',
         # Atom vars (p::<var>:a)
-        'dA([xyz])' : 'change to atomic coordinate, \\1',
+        'dA([xyz])$' : 'change to atomic coordinate, \\1',
         'A([xyz])$' : '\\1 fractional atomic coordinate',
         'AUiso':'Atomic isotropic displacement parameter',
@@ -1271 +1271 @@
         'Polariz\.' : 'Polarization correction',
         'SH/L' : 'FCJ peak asymmetry correction',
-        '([UVW])' : 'Gaussian instrument broadening \\1',
-        '([XY])' : 'Cauchy instrument broadening \\1',
+        '([UVW])$' : 'Gaussian instrument broadening \\1',
+        '([XY])$' : 'Cauchy instrument broadening \\1',
         'Zero' : 'Debye-Scherrer zero correction',
         'nDebye' : 'Debye model background corr. terms',
@@ -1565 +1565 @@
 # shortcut routines
 exp = np.exp
-sind = lambda x: np.sin(x*np.pi/180.)
-tand = lambda x: np.tan(x*np.pi/180.)
-cosd = lambda x: np.cos(x*np.pi/180.)
 sind = sin = s = lambda x: np.sin(x*np.pi/180.)
 cosd = cos = c = lambda x: np.cos(x*np.pi/180.)
@@ -1585 +1582 @@
         self.assgnVars = {}
         '''A dict where keys are label names in the expression mapping to a GSAS-II
-        variable. The value is a list with a G2 variable name and derivative step size.
+        variable. The value a G2 variable name.
         Note that the G2 variable name may contain a wild-card and correspond to
         multiple values.