Skip to content

Commit 4d22ade

Browse files
committed
add nonstd space group 'C c c m' to list, fix testMagSym & testSSSymbols to run in new G2 system
1 parent 0607952 commit 4d22ade

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

GSASII/GSASIIspc.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4176,6 +4176,7 @@ def GetHallSpaceGroup(SGData):
41764176
'I m a 2','I 2 m b','I c 2 m','I m 2 a','I b m 2','I 2 c m',
41774177
'I m m m','I b a m','I m c b','I c m a',
41784178
'I b c a','I c a b',
4179+
'I c c m','I m a a','I b m b',
41794180
'I m m a','I b m m ','I m c m','I m a m','I m m b','I c m m',),
41804181
'Fmmm':('F 2 2 2','F m m m', 'F d d d',
41814182
'F m m 2','F m 2 m','F 2 m m',

GSASII/testMagSym.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
#testMagSym
22
import sys
3+
import os
34
import wx
45
import numpy as np
56
import copy
6-
from . import GSASIIpath
7+
import importlib.util
8+
try:
9+
importlib.util.find_spec('GSASII.GSASIIGUI')
10+
except ModuleNotFoundError:
11+
print('GSAS-II not installed in Python; Hacking sys.path')
12+
sys.path.insert(0,os.path.dirname(os.path.dirname(__file__)))
13+
from GSASII import GSASIIpath
714
GSASIIpath.SetBinaryPath()
8-
from . import GSASIIspc as G2spc
9-
from . import GSASIIctrlGUI as G2G
10-
from . import GSASIIphsGUI as G2phsGUI
15+
from GSASII import GSASIIspc as G2spc
16+
from GSASII import GSASIIctrlGUI as G2G
17+
from GSASII import GSASIIphsGUI as G2phsGUI
1118

1219
try:
1320
wx.NewId

GSASII/testSSymbols.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
#test
22
import sys
3+
import os
34
import wx
4-
from . import GSASIIpath
5+
import importlib.util
6+
try:
7+
importlib.util.find_spec('GSASII.GSASIIGUI')
8+
except ModuleNotFoundError:
9+
print('GSAS-II not installed in Python; Hacking sys.path')
10+
sys.path.insert(0,os.path.dirname(os.path.dirname(__file__)))
11+
from GSASII import GSASIIpath
512
GSASIIpath.SetBinaryPath()
6-
from . import GSASIIspc as G2spc
7-
from . import GSASIIctrlGUI as G2G
13+
from GSASII import GSASIIspc as G2spc
14+
from GSASII import GSASIIctrlGUI as G2G
815

916
try:
1017
wx.NewIdRef

0 commit comments

Comments
 (0)