Changeset 740

Timestamp:

Aug 27, 2012 4:34:52 PM (10 years ago)

Author:

vondreele

Message:

bug fixes

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIgrid.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIspc.py (modified) (1 diff)

trunk/GSASII.py

@@ -1987 +1987 @@
         '''
         phaseData = self.GetPhaseData()
+        if not phaseData:
+            return {},{}
         Histograms = {}
         Phases = {}

trunk/GSASIIgrid.py

@@ -2307 +2307 @@
             Phases = G2frame.GetPhaseData()
             phase = ''
+            phaseName = ''
             if Phases:
                 phaseName = Phases.keys()[0]

trunk/GSASIIplot.py

@@ -2323 +2323 @@
         mapPeaks = data['Map Peaks']
     drawingData = data['Drawing']
-    drawAtoms = drawingData['Atoms']
+    try:
+        drawAtoms = drawingData['Atoms']
+    except KeyError:
+        drawAtoms = []
     mapData = {}
     flipData = {}

trunk/GSASIIspc.py

@@ -958 +958 @@
         'P 6 c c','P 63 c m','P 63 m c','P -6 m 2','P -6 c 2','P -6 2 m',
         'P -6 2 c','P 6/m m m','P 6/m c c','P 63/m c m','P 63/m m c',),
-    'Pm3m': ('P 2 3','P 21 3','P m -3','P n -3','P a -3','P 4 3 2','P 42 3 2',
-        'P 43 3 2','P 41 3 2','P -4 3 m','P -4 3 n','P m -3 m','P n -3 n',
-        'P m -3 n','P n -3 m',),
+    'Pm3m': ('P 2 3','P 21 3','P m 3','P n 3','P a 3','P 4 3 2','P 42 3 2',
+        'P 43 3 2','P 41 3 2','P -4 3 m','P -4 3 n','P m 3 m','P n 3 n',
+        'P m 3 n','P n 3 m',),
     'Im3m':('I 2 3','I 21 3','I m -3','I a -3', 'I 4 3 2','I 41 3 2',
         'I -4 3 m', 'I -4 3 d','I m -3 m','I a -3 d',),