Skip to content

Commit 0e75129

Browse files
committed
ENH: improve SG key formatting in GetSpaceGroup
Try to match key formats in `short_name` and `pdb_name`.
1 parent b7e5070 commit 0e75129

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/diffpy/structure/spacegroups.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,14 @@ def GetSpaceGroup(sgid):
4343
emsg = "Unknown space group identifier %r" % sgid
4444
if not isinstance(sgid, six.string_types):
4545
raise ValueError(emsg)
46-
# short name case adjusted
47-
sgkey = sgid.strip()
46+
sgbare = sgid.strip()
47+
# short_name case adjusted
48+
sgkey = sgbare.replace(' ', '')
4849
sgkey = sgkey[:1].upper() + sgkey[1:].lower()
4950
if sgkey in _sg_lookup_table:
5051
return _sg_lookup_table[sgkey]
51-
# long name all upper case
52-
sgkey = sgid.strip().upper()
53-
if sgkey in _sg_lookup_table:
54-
return _sg_lookup_table[sgkey]
55-
# try to remove any blanks
56-
sgkey = sgid.replace(' ', '')
52+
# pdb_name case adjusted
53+
sgkey = sgbare[:1].upper() + sgbare[1:].lower()
5754
if sgkey in _sg_lookup_table:
5855
return _sg_lookup_table[sgkey]
5956
# nothing worked, sgid is unknown identifier

0 commit comments

Comments
 (0)