Changeset 1340 for trunk/GSASIIobj.py


Ignore:
Timestamp:
May 10, 2014 8:12:27 PM (8 years ago)
Author:
toby
Message:

complete parametric fitting and tutorial

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIobj.py

    r1338 r1340  
    12471247        'Vol' : 'Unit cell volume',
    12481248        # Atom vars (p::<var>:a)
    1249         'dA([xyz])' : 'change to atomic coordinate, \\1',
     1249        'dA([xyz])$' : 'change to atomic coordinate, \\1',
    12501250        'A([xyz])$' : '\\1 fractional atomic coordinate',
    12511251        'AUiso':'Atomic isotropic displacement parameter',
     
    12711271        'Polariz\.' : 'Polarization correction',
    12721272        'SH/L' : 'FCJ peak asymmetry correction',
    1273         '([UVW])' : 'Gaussian instrument broadening \\1',
    1274         '([XY])' : 'Cauchy instrument broadening \\1',
     1273        '([UVW])$' : 'Gaussian instrument broadening \\1',
     1274        '([XY])$' : 'Cauchy instrument broadening \\1',
    12751275        'Zero' : 'Debye-Scherrer zero correction',
    12761276        'nDebye' : 'Debye model background corr. terms',
     
    15651565# shortcut routines
    15661566exp = np.exp
    1567 sind = lambda x: np.sin(x*np.pi/180.)
    1568 tand = lambda x: np.tan(x*np.pi/180.)
    1569 cosd = lambda x: np.cos(x*np.pi/180.)
    15701567sind = sin = s = lambda x: np.sin(x*np.pi/180.)
    15711568cosd = cos = c = lambda x: np.cos(x*np.pi/180.)
     
    15851582        self.assgnVars = {}
    15861583        '''A dict where keys are label names in the expression mapping to a GSAS-II
    1587         variable. The value is a list with a G2 variable name and derivative step size.
     1584        variable. The value a G2 variable name.
    15881585        Note that the G2 variable name may contain a wild-card and correspond to
    15891586        multiple values.
Note: See TracChangeset for help on using the changeset viewer.