Changeset 1978 for trunk/GSASIIphsGUI.py

Timestamp:

Sep 24, 2015 4:34:39 PM (7 years ago)

Author:

vondreele

Message:

fix to update reflections in HKLplot
remove ZigZag? from incommensurate list
add pylab to G2math if in debug mode
revisions to modulations anticipating Crenel & Sawtooth
fixes to SS structure factor calcs. Some success.

File:

• trunk/GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -2378 +2378 @@
                 iatm,item = Indx[Obj.GetId()]
                 nt = numVals[Stype]
-                if not len(atomData[iatm][-1][SS][item]) and waveType in ['ZigZag','Sawtooth'] and Stype == 'Spos':
+                if not len(atomData[iatm][-1][SS][item]) and waveType in ['Sawtooth',] and Stype == 'Spos':
                     nt = 4
                 atomData[iatm][-1][SS][item].append([[0.0 for i in range(nt)],False])
@@ -2430 +2430 @@
                         Waves = wx.FlexGridSizer(0,4,5,5)
                     elif Stype == 'Spos':
-                        if waveType in ['ZigZag','Sawtooth'] and not iwave:
+                        if waveType in ['Sawtooth',] and not iwave:
                             names = Names[6:]
                             Waves = wx.FlexGridSizer(0,6,5,5)
@@ -2526 +2526 @@
         magNames = ['MXsin','MYsin','MZsin','MXcos','MYcos','MZcos']
         fracNames = ['Fsin','Fcos','Fzero','Fwid']
-        waveTypes = ['Fourier','Sawtooth','ZigZag','Crenel/Fourier']
+        waveTypes = ['Fourier','Sawtooth','Crenel/Fourier']
         Labels = {'Spos':posNames,'Sfrac':fracNames,'Sadp':adpNames,'Smag':magNames}
         mainSizer.Add(wx.StaticText(waveData,label=' Incommensurate propagation wave data:'),0,WACV)