Changeset 2070 for trunk/GSASIIphsGUI.py

Timestamp:

Nov 25, 2015 2:19:24 PM (7 years ago)

Author:

vondreele

Message:

remove extraneous argument from G2mth.posFourier
work on ZigZag/Block? SS functions; function OK, derivatives not.

File:

• trunk/GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -2417 +2417 @@
             waveSizer.Add(waveHead)
             if len(waveBlk):
-                nFour = 0
+                nx = 0
                 for iwave,wave in enumerate(waveBlk):
-                    if waveType == 'Fourier':
-                        nFour += 1
                     if not iwave:
-                        CSI = G2spc.GetSSfxuinel(waveType,nFour,xyz,SGData,SSGData)
+                        if waveType in ['ZigZag','Block']:
+                            nx = 1
+                        CSI = G2spc.GetSSfxuinel(waveType,1,xyz,SGData,SSGData)
                     else:
-                        CSI = G2spc.GetSSfxuinel('Fourier',nFour,xyz,SGData,SSGData)
+                        CSI = G2spc.GetSSfxuinel('Fourier',iwave+1-nx,xyz,SGData,SSGData)
                     waveName = 'Fourier'
                     if Stype == 'Sfrac':