Skip to content

Commit 913382e

Browse files
authored
Merge pull request #182 from stevenhua0320/change-utility-script
chore: change utility script to snake_case method.
2 parents ad7e720 + 991889b commit 913382e

File tree

2 files changed

+55
-32
lines changed

2 files changed

+55
-32
lines changed

devutils/sgtbx_extra_groups.py

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from diffpy.structure.spacegroups import SpaceGroup, SymOp, is_space_group_identifier, mmLibSpaceGroupList
2121

2222

23-
def tupleToSGArray(tpl):
23+
def tuple_to_sg_array(tpl):
2424
if not _rtarrays:
2525
import diffpy.structure.SpaceGroups as sgmod
2626

@@ -40,19 +40,19 @@ def tupleToSGArray(tpl):
4040
_rtarrays = {}
4141

4242

43-
def mmSpaceGroupFromSymbol(symbol):
43+
def mm_space_group_from_symbol(symbol):
4444
"""Construct SpaceGroup instance from a string symbol using sgtbx
4545
data."""
4646
sginfo = sgtbx.space_group_info(symbol)
4747
symop_list = []
48-
symop_list = getSymOpList(sginfo.group())
48+
symop_list = get_symop_list(sginfo.group())
4949
sgtype = sginfo.type()
5050
uhm = sgtype.lookup_symbol()
5151
sgsmbls = sgtbx.space_group_symbols(uhm)
5252
kw = {}
5353
kw["number"] = sgtype.number()
5454
kw["num_sym_equiv"] = len(symop_list)
55-
kw["num_primitive_sym_equiv"] = countUniqueRotations(symop_list)
55+
kw["num_primitive_sym_equiv"] = count_unique_rotations(symop_list)
5656
kw["short_name"] = sgsmbls.hermann_mauguin().replace(" ", "")
5757
pgt = sgsmbls.point_group_type()
5858
pgn = "PG" + re.sub(r"-(\d)", "\\1bar", pgt)
@@ -64,77 +64,77 @@ def mmSpaceGroupFromSymbol(symbol):
6464
return mmsg
6565

6666

67-
def adjustMMSpaceGroupNumber(mmsg):
67+
def adjust_mm_space_group_number(mmsg):
6868
sg0 = [x for x in mmLibSpaceGroupList if x.number == mmsg.number]
69-
if sg0 and cmpSpaceGroups(sg0[0], mmsg):
69+
if sg0 and cmp_space_groups(sg0[0], mmsg):
7070
return
7171
while mmsg.number in sgnumbers:
7272
mmsg.number += 1000
7373
sgnumbers.append(mmsg.number)
7474

7575

76-
def getSymOpList(grp):
76+
def get_symop_list(grp):
7777
symop_list = []
7878
for op in grp:
7979
r_sgtbx = op.r().as_double()
8080
t_sgtbx = op.t().as_double()
81-
R = tupleToSGArray(r_sgtbx)
82-
t = tupleToSGArray(t_sgtbx)
81+
R = tuple_to_sg_array(r_sgtbx)
82+
t = tuple_to_sg_array(t_sgtbx)
8383
symop_list.append(SymOp(R, t))
8484
return symop_list
8585

8686

87-
def countUniqueRotations(symop_list):
87+
def count_unique_rotations(symop_list):
8888
unique_rotations = set()
8989
for op in symop_list:
9090
tpl = tuple(op.R.flatten())
9191
unique_rotations.add(tpl)
9292
return len(unique_rotations)
9393

9494

95-
def cmpSpaceGroups(sg0, sg1):
95+
def cmp_space_groups(sg0, sg1):
9696
if sg0 is sg1:
9797
return True
98-
s0 = hashMMSpaceGroup(sg0)
99-
s1 = hashMMSpaceGroup(sg1)
98+
s0 = hash_mm_space_group(sg0)
99+
s1 = hash_mm_space_group(sg1)
100100
return s0 == s1
101101

102102

103-
def findEquivalentMMSpaceGroup(grp):
103+
def find_equivalent_mm_space_group(grp):
104104
if not _equivmmsg:
105105
for sgn in mmLibSpaceGroupList:
106-
ssgn = hashMMSpaceGroup(sgn)
106+
ssgn = hash_mm_space_group(sgn)
107107
_equivmmsg.setdefault(ssgn, sgn)
108-
ssg = hashSgtbxGroup(grp)
108+
ssg = hash_sgtbx_group(grp)
109109
return _equivmmsg.get(ssg)
110110

111111

112112
_equivmmsg = {}
113113

114114

115-
def findEquivalentSgtbxSpaceGroup(sgmm):
115+
def find_equivalent_sgtbx_space_group(sgmm):
116116
if not _equivsgtbx:
117117
for smbls in sgtbx.space_group_symbol_iterator():
118118
uhm = smbls.universal_hermann_mauguin()
119119
grp = sgtbx.space_group_info(uhm).group()
120-
hgrp = hashSgtbxGroup(grp)
120+
hgrp = hash_sgtbx_group(grp)
121121
_equivsgtbx.setdefault(hgrp, grp)
122-
hgmm = hashMMSpaceGroup(sgmm)
122+
hgmm = hash_mm_space_group(sgmm)
123123
return _equivsgtbx.get(hgmm)
124124

125125

126126
_equivsgtbx = {}
127127

128128

129-
def hashMMSpaceGroup(sg):
129+
def hash_mm_space_group(sg):
130130
lines = [str(sg.number % 1000)] + sorted(map(str, sg.iter_symops()))
131131
s = "\n".join(lines)
132132
return s
133133

134134

135-
def hashSgtbxGroup(grp):
135+
def hash_sgtbx_group(grp):
136136
n = grp.type().number()
137-
lines = [str(n)] + sorted(map(str, getSymOpList(grp)))
137+
lines = [str(n)] + sorted(map(str, get_symop_list(grp)))
138138
s = "\n".join(lines)
139139
return s
140140

@@ -157,19 +157,19 @@ def hashSgtbxGroup(grp):
157157
"""
158158

159159

160-
def SGCode(mmsg):
160+
def sg_code(mmsg):
161161
src0 = _SGsrc % mmsg.__dict__
162-
src1 = src0.replace("@SYMOPS@", SymOpsCode(mmsg))
162+
src1 = src0.replace("@SYMOPS@", symops_code(mmsg))
163163
return src1
164164

165165

166-
def SymOpsCode(mmsg):
167-
lst = ["%8s%s," % ("", SymOpCode(op)) for op in mmsg.iter_symops()]
166+
def symops_code(mmsg):
167+
lst = ["%8s%s," % ("", symop_code(op)) for op in mmsg.iter_symops()]
168168
src = "\n".join(lst).strip()
169169
return src
170170

171171

172-
def SymOpCode(op):
172+
def symop_code(op):
173173
if not _rtnames:
174174
import diffpy.structure.SpaceGroups as sgmod
175175

@@ -193,18 +193,18 @@ def main():
193193
for smbls in sgtbx.space_group_symbol_iterator():
194194
uhm = smbls.universal_hermann_mauguin()
195195
grp = sgtbx.space_group_info(uhm).group()
196-
if findEquivalentMMSpaceGroup(grp):
196+
if find_equivalent_mm_space_group(grp):
197197
continue
198198
shn = smbls.hermann_mauguin().replace(" ", "")
199199
if is_space_group_identifier(shn):
200200
continue
201-
sg = mmSpaceGroupFromSymbol(uhm)
202-
hsg = hashMMSpaceGroup(sg)
201+
sg = mm_space_group_from_symbol(uhm)
202+
hsg = hash_mm_space_group(sg)
203203
if hsg in duplicates:
204204
continue
205-
adjustMMSpaceGroupNumber(sg)
205+
adjust_mm_space_group_number(sg)
206206
duplicates.add(hsg)
207-
print(SGCode(sg))
207+
print(sg_code(sg))
208208
return
209209

210210

news/change-utility-script.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* No news added: Change any utility scripts that outside of package distribution method to snake_cae method
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

0 commit comments

Comments
 (0)