Changeset 2062 for trunk/GSASIIobj.py

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:

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

trunk/GSASIIobj.py

@@ -1187 +1187 @@
             s = 'Hist='+ShortHistNames.get(l[1],'? #'+str(l[1]))
             l[-1] += ' #'+str(l[3])
-        elif l[4] is not None: # rigid body parameter
+        elif l[4] is not None: # rigid body parameter or modulation parm
             lbl = ShortPhaseNames.get(l[0],'phase?')
-            s = "Res #"+str(l[3])+" body #"+str(l[4])+" in "+str(lbl)
+            if 'RB' in l[2]:    #rigid body parm
+                s = "Res #"+str(l[3])+" body #"+str(l[4])+" in "+str(lbl)
+            else: #modulation parm
+                s = 'Atom %s wave %s in %s'%(LookupAtomLabel(l[0],l[3])[0],l[4],lbl)
         elif l[3] is not None: # atom parameter, 
             lbl = ShortPhaseNames.get(l[0],'phase?')
@@ -1324 +1327 @@
         'Fsin'  :   'Sin site fraction modulation',
         'Fcos'  :   'Cos site fraction modulation',
-        'Fzero'  :   'Crenel function offset',
+        'Fzero'  :   'Crenel function offset',      #may go away
         'Fwid'   :   'Crenel function width',
-        'Tzero'  :   'Sawtooth/ZigZag location',
-        '([XYZ])slope': 'Sawtooth/ZigZag slope for \\1',
+        'Tmin'   :   'ZigZag/Block min location',
+        'Tmax'   :   'ZigZag/Block max location',
+        '([XYZ])max': 'ZigZag/Block max value for \\1',
         '([XYZ])sin'  : 'Sin position wave for \\1',
         '([XYZ])cos'  : 'Cos position wave for \\1',