Changeset 2401 for trunk/GSASIIplot.py

Timestamp:

Jul 29, 2016 3:52:31 PM (7 years ago)

Author:

vondreele

Message:

begin adding magnetism; change space group fortran code
modify tutorial menus

File:

• trunk/GSASIIplot.py (modified) (5 diffs)

trunk/GSASIIplot.py

@@ -4751 +4751 @@
     B4mat = np.concatenate((np.concatenate((Bmat,[[0],[0],[0]]),axis=1),[[0,0,0,1],]),axis=0)
     SGData = generalData['SGData']
-    if generalData['Type'] in ['modulated','magnetic']:
+    if generalData['Modulated']:
         SSGData = generalData['SSGData']
     Mydir = generalData['Mydir']
@@ -4943 +4943 @@
             SetPeakRoll(dirDict[key])
             SetMapPeaksText(mapPeaks)
-        elif key in ['M',]and generalData['Type'] in ['modulated','magnetic']:  #make a movie file
+        elif key in ['M',]and generalData['Modulated']:  #make a movie file
             G2frame.tau = 0.
             for i in range(10):
@@ -4954 +4954 @@
                     Fade += 1
                 Draw('key down',Fade)
-        elif key in ['+','-','=','0'] and generalData['Type'] in ['modulated','magnetic']:
+        elif key in ['+','-','=','0'] and generalData['Modulated']:
             if keyBox:
                 OnKeyPressed(event)
@@ -4968 +4968 @@
         except AttributeError:       #if from OnKeyBox above
             key = str(event.key).upper()
-        if key in ['+','-','=','0'] and generalData['Type'] in ['modulated','magnetic']:
+        if key in ['+','-','=','0'] and generalData['Modulated']:
             if key == '0':
                 G2frame.tau = 0.
@@ -5794 +5794 @@
     else:
         choice = [' save as/key:','jpeg','tiff','bmp','c: center on 1/2,1/2,1/2','n: next','p: previous']
-    if generalData['Type'] in ['modulated','magnetic',] and len(drawAtoms):
+    if generalData['Modulated'] and len(drawAtoms):
         choice += ['+: increase tau','-: decrease tau','0: set tau = 0']    #add 'm: make modulation movie'