roll back changes to default space group setting, and modify tests to…

… only assume setting 1
HEXRD · Aug 20, 2024 · 3601b9f · 3601b9f
1 parent 79c8983
commit 3601b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/hexrd/material/material.py b/hexrd/material/material.py
@@ -81,13 +81,10 @@ def _key(x):
 
 
 def get_default_sgsetting(sgnum):
-    setting = 0
     if sgnum in two_origin_choice:
-        # only set cubic materials
-        # in the second setting by default
-        if sgnum > 194:
-            setting = 1
-    return setting
+        return 1
+    else:
+        return 0
 
 #
 # ---------------------------------------------------CLASS:  Material

diff --git a/tests/planedata/test_with_data.py b/tests/planedata/test_with_data.py
@@ -24,7 +24,8 @@ def materials(test_data_dir):
     for mat_name in material_names:
         # Load {test_data_dir}/materials/{mat_name}.cif
         mat = Material(
-            mat_name, str(test_data_dir) + "/materials/" + mat_name + ".cif"
+            mat_name, str(test_data_dir) + "/materials/" + mat_name + ".cif",
+            sgsetting=0
         )
         mats[mat_name] = mat.planeData
     return mats