Changeset 3452 for trunk/GSASIIpwdGUI.py

Timestamp:

Jun 26, 2018 4:18:47 AM (5 years ago)

Author:

vondreele

Message:

Add 'C -1' as possible Bravais lattice/space group for Unit cell GUI
fix odd business with basestring in py3. Code failed; just use basestring fine in py3

File:

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

trunk/GSASIIpwdGUI.py

@@ -2595 +2595 @@
     '''
     bravaisSymb = ['Fm3m','Im3m','Pm3m','R3-H','P6/mmm','I4/mmm',
-        'P4/mmm','Fmmm','Immm','Cmmm','Pmmm','C2/m','P2/m','P1']
+        'P4/mmm','Fmmm','Immm','Cmmm','Pmmm','C2/m','P2/m','C1','P1']
     IndexId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Index Peak List')
     Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]
@@ -2741 +2741 @@
     SPGlist = G2spc.spglist
     bravaisSymb = ['Fm3m','Im3m','Pm3m','R3-H','P6/mmm','I4/mmm','P4/mmm',
-        'Fmmm','Immm','Cmmm','Pmmm','C2/m','P2/m','P1']
+        'Fmmm','Immm','Cmmm','Pmmm','C2/m','P2/m','C1','P1']
     spaceGroups = ['F m 3 m','I m 3 m','P m 3 m','R 3 m','P 6/m m m','I 4/m m m',
-        'P 4/m m m','F m m m','I m m m','C m m m','P m m m','C 2/m','P 2/m','P -1']
+        'P 4/m m m','F m m m','I m m m','C m m m','P m m m','C 2/m','P 2/m','C -1','P -1']
     Inst = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]
     Limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Limits'))[1]
@@ -3041 +3041 @@
         SGData = Phase['General']['SGData']
         controls[4] = 1
-        controls[5] = SGData['SGLatt']+SGData['SGLaue']
+        controls[5] = (SGData['SGLatt']+SGData['SGLaue']).replace('-','')
         controls[6:12] = Cell[1:8]
         controls[13] = spaceGroups[bravaisSymb.index(controls[5])]
@@ -3058 +3058 @@
         SGData = rd.Phase['General']['SGData']
         controls[4] = 1
-        controls[5] = SGData['SGLatt']+SGData['SGLaue']
+        controls[5] = (SGData['SGLatt']+SGData['SGLaue']).replace('-','')
         controls[6:12] = Cell[1:8]
         controls[13] = spaceGroups[bravaisSymb.index(controls[5])]
@@ -3350 +3350 @@
     [[11,12],10,zip([" Unit cell: a = "," b = "," c = "," beta = "," Vol = "],
         [(10,5),(10,5),(10,5),(10,3),"%.3f"],[True,True,True,True,False],[0,1,2,4,0])],
-    [[13,],8,zip([" Unit cell: a = "," b = "," c = "," Vol = "," alpha = "," beta = "," gamma = "],
+    [[13,14],8,zip([" Unit cell: a = "," b = "," c = "," Vol = "," alpha = "," beta = "," gamma = "],
         [(10,5),(10,5),(10,5),"%.3f",(10,3),(10,3),(10,3)],
         [True,True,True,False,True,True,True],[0,1,2,0,3,4,5])]]