Changeset 2062 for trunk/GSASIIobj.py


Ignore:
Timestamp:
Nov 21, 2015 9:45:03 AM (7 years ago)
Author:
vondreele
Message:

exclude non variable SS parms from constraint lists
define ZigZag? & Block position modulations; eliminate Sawtooth (it's a variant of ZigZag?)
fix SS names in constraint lists
implement ZigZag? & Block position wave plots
implement ZigZag? & Block atom motion in structure plots
add movie making option (hidden - no file output for it yet)
fix LS I/O for ZigZag? & Block waves

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIobj.py

    r1924 r2062  
    11871187            s = 'Hist='+ShortHistNames.get(l[1],'? #'+str(l[1]))
    11881188            l[-1] += ' #'+str(l[3])
    1189         elif l[4] is not None: # rigid body parameter
     1189        elif l[4] is not None: # rigid body parameter or modulation parm
    11901190            lbl = ShortPhaseNames.get(l[0],'phase?')
    1191             s = "Res #"+str(l[3])+" body #"+str(l[4])+" in "+str(lbl)
     1191            if 'RB' in l[2]:    #rigid body parm
     1192                s = "Res #"+str(l[3])+" body #"+str(l[4])+" in "+str(lbl)
     1193            else: #modulation parm
     1194                s = 'Atom %s wave %s in %s'%(LookupAtomLabel(l[0],l[3])[0],l[4],lbl)
    11921195        elif l[3] is not None: # atom parameter,
    11931196            lbl = ShortPhaseNames.get(l[0],'phase?')
     
    13241327        'Fsin'  :   'Sin site fraction modulation',
    13251328        'Fcos'  :   'Cos site fraction modulation',
    1326         'Fzero'  :   'Crenel function offset',
     1329        'Fzero'  :   'Crenel function offset',      #may go away
    13271330        'Fwid'   :   'Crenel function width',
    1328         'Tzero'  :   'Sawtooth/ZigZag location',
    1329         '([XYZ])slope': 'Sawtooth/ZigZag slope for \\1',
     1331        'Tmin'   :   'ZigZag/Block min location',
     1332        'Tmax'   :   'ZigZag/Block max location',
     1333        '([XYZ])max': 'ZigZag/Block max value for \\1',
    13301334        '([XYZ])sin'  : 'Sin position wave for \\1',
    13311335        '([XYZ])cos'  : 'Cos position wave for \\1',
Note: See TracChangeset for help on using the changeset viewer.