Changeset 5352 for trunk/GSASIIpy3.py

Timestamp:

Oct 20, 2022 9:56:41 PM (8 months ago)

Author:

toby

Message:

add ability to merge chem and magnetic phases in a quick CIF

File:

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

trunk/GSASIIpy3.py

@@ -19 +19 @@
 
 # formatting for unique cell parameters by Laue type
-cellGUIlist = [[['m3','m3m'],4,[" Unit cell: a = "],["{:.5f}"],[True],[0]],
-[['3R','3mR'],6,[" a = ",u" \u03B1 = "],["{:.5f}","{:.3f}"],[True,True],[0,3]],
-[['3','3m1','31m','6/m','6/mmm','4/m','4/mmm'],6,[" a = "," c = "],["{:.5f}","{:.5f}"],[True,True],[0,2]],
-[['mmm'],8,[" a = "," b = "," c = "],["{:.5f}","{:.5f}","{:.5f}"],
-    [True,True,True],[0,1,2]],
-[['2/m'+'a'],10,[" a = "," b = "," c = ",u" \u03B1 = "],
-    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,3]],
-[['2/m'+'b'],10,[" a = "," b = "," c = ",u" \u03B2 = "],
-    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,4]],
-[['2/m'+'c'],10,[" a = "," b = "," c = ",u" \u03B3 = "],
-    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,5]],
-[['-1'],7,[" a = "," b = "," c = ",u" \u03B1 = ",u" \u03B2 = ",u" \u03B3 = "],
-    ["{:.5f}","{:.5f}","{:.5f}","{:.3f}","{:.3f}","{:.3f}"],
-    [True,True,True,False,True,True,True],[0,1,2,3,4,5]]]
+cellGUIlist = [
+    [['m3','m3m'],4,[" Unit cell: a = "],["{:.5f}"],[True],[0]],
+    [['3R','3mR'],6,[" a = ",u" \u03B1 = "],["{:.5f}","{:.3f}"],[True,True],[0,3]],
+    [['3','3m1','31m','6/m','6/mmm','4/m','4/mmm'],6,[" a = "," c = "],["{:.5f}","{:.5f}"],[True,True],[0,2]],
+    [['mmm'],8,[" a = "," b = "," c = "],["{:.5f}","{:.5f}","{:.5f}"],
+        [True,True,True],[0,1,2]],
+    [['2/m'+'a'],10,[" a = "," b = "," c = ",u" \u03B1 = "],
+        ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,3]],
+    [['2/m'+'b'],10,[" a = "," b = "," c = ",u" \u03B2 = "],
+        ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,4]],
+    [['2/m'+'c'],10,[" a = "," b = "," c = ",u" \u03B3 = "],
+        ["{:.5f}","{:.5f}","{:.5f}","{:.3f}"],[True,True,True,True,],[0,1,2,5]],
+    [['-1'],7,[" a = "," b = "," c = ",u" \u03B1 = ",u" \u03B2 = ",u" \u03B3 = "],
+         ["{:.5f}","{:.5f}","{:.5f}","{:.3f}","{:.3f}","{:.3f}"],
+         [True,True,True,True,True,True],[0,1,2,3,4,5]]
+    ]
 
 def FormulaEval(string):