Changeset 1338


Ignore:
Timestamp:
May 8, 2014 10:45:45 AM (8 years ago)
Author:
vondreele
Message:

put in SASD parameter descriptions in CompileVarDesc?; required mods for VarDescr? & getVarDescr

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIobj.py

    r1335 r1338  
    11261126    l = getVarDescr(varname)
    11271127    if not l:
    1128         #return ("invalid variable name ("+str(varname)+")!"),""
    1129         return "invalid variable name!",""
     1128        return ("invalid variable name ("+str(varname)+")!"),""
     1129#        return "invalid variable name!",""
    11301130
    11311131    if not l[-1]:
    11321132        l[-1] = "(variable needs a definition!)"
    11331133
     1134    if len(l) == 3:         #SASD variable name!
     1135        s = 'component:'+l[1]
     1136        return s,l[-1]
    11341137    s = ""
    11351138    if l[0] is not None and l[1] is not None: # HAP: keep short
     
    11911194      where `p`, `h`, `a1`, `a2` are str values or `None`, for the phase number,
    11921195      the histogram number and the atom number; `name` will always be
    1193       an str; and `description` is str or `None`.
     1196      a str; and `description` is str or `None`.
    11941197      If the variable name is incorrectly formed (for example, wrong
    11951198      number of colons), `None` is returned instead of a list.
    11961199    '''
    11971200    l = varname.split(':')
     1201    if len(l) == 2:     #SASD parameter name
     1202        return varname,l[0],getDescr(l[1])
    11981203    if len(l) == 3:
    11991204        l += [None,None]
     
    12791284        # Global vars (::<var>)
    12801285        'constr([0-9]*)' : 'Parameter from constraint',
     1286        # SASD vars (l:<var>;l = component)
     1287        'Aspect ratio' : 'Particle aspect ratio',
     1288        'Length' : 'Cylinder length',
     1289        'Diameter' : 'Cylinder/disk diameter',
     1290        'Thickness' : 'Disk thickness',
     1291        'Dist' : 'Interparticle distance',
     1292        'VolFr' : 'Dense scatterer volume fraction',
     1293        'epis' : 'Sticky sphere epsilon',
     1294        'Sticky' : 'Stickyness',
     1295        'Depth' : 'Well depth',
     1296        'Width' : 'Well width',
     1297        'Volume' : 'Particle volume',
     1298        'Radius' : 'Sphere/cylinder/disk radius',
     1299        'Mean' : 'Particle mean radius',
     1300        'StdDev' : 'Standard deviation in Mean',
     1301        'G': 'Guinier prefactor',
     1302        'Rg': 'Guinier radius of gyration',
     1303        'B': 'Porod prefactor',
     1304        'P': 'Porod power',
     1305        'Cutoff': 'Porod cutoff',
     1306        'PkInt': 'Bragg peak intensity',
     1307        'PkPos': 'Bragg peak position',
     1308        'PkSig': 'Bragg peak sigma',
     1309        'PkGam': 'Bragg peak gamma',   
    12811310        }.items():
    12821311        VarDesc[key] = value
Note: See TracChangeset for help on using the changeset viewer.