Changeset 1978 for trunk/GSASIIphsGUI.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r1964 r1978  
    23782378                iatm,item = Indx[Obj.GetId()]
    23792379                nt = numVals[Stype]
    2380                 if not len(atomData[iatm][-1][SS][item]) and waveType in ['ZigZag','Sawtooth'] and Stype == 'Spos':
     2380                if not len(atomData[iatm][-1][SS][item]) and waveType in ['Sawtooth',] and Stype == 'Spos':
    23812381                    nt = 4
    23822382                atomData[iatm][-1][SS][item].append([[0.0 for i in range(nt)],False])
     
    24302430                        Waves = wx.FlexGridSizer(0,4,5,5)
    24312431                    elif Stype == 'Spos':
    2432                         if waveType in ['ZigZag','Sawtooth'] and not iwave:
     2432                        if waveType in ['Sawtooth',] and not iwave:
    24332433                            names = Names[6:]
    24342434                            Waves = wx.FlexGridSizer(0,6,5,5)
     
    25262526        magNames = ['MXsin','MYsin','MZsin','MXcos','MYcos','MZcos']
    25272527        fracNames = ['Fsin','Fcos','Fzero','Fwid']
    2528         waveTypes = ['Fourier','Sawtooth','ZigZag','Crenel/Fourier']
     2528        waveTypes = ['Fourier','Sawtooth','Crenel/Fourier']
    25292529        Labels = {'Spos':posNames,'Sfrac':fracNames,'Sadp':adpNames,'Smag':magNames}
    25302530        mainSizer.Add(wx.StaticText(waveData,label=' Incommensurate propagation wave data:'),0,WACV)
Note: See TracChangeset for help on using the changeset viewer.