Skip to content

Commit 916eb9e

Browse files
authored
Merge pull request #15 from maicos-devel/fix_docs
Take docstring macros from scatterkit instead of MAICoS
2 parents 28ef1ff + 823ca74 commit 916eb9e

4 files changed

Lines changed: 35 additions & 2 deletions

File tree

CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ CHANGELOG file
99
- keep the format consistent (79 char width, Y/M/D date format) and do not
1010
use tabs but use spaces for formatting
1111
12+
Unreleased
13+
----------
14+
Henrik Stooß
15+
16+
- Migrate the doc dict over from MAICoS (#15)
1217

1318
v0.1 (2025/11/11)
1419
-----------------

src/scatterkit/diporderstructurefactor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
import MDAnalysis as mda
1313
import numpy as np
1414
from maicos.core import AnalysisBase
15-
from maicos.lib.util import get_center, render_docs, unit_vectors_planar
15+
from maicos.lib.util import get_center, unit_vectors_planar
1616
from maicos.lib.weights import diporder_weights
1717

1818
from .lib.math import compute_structure_factor
19+
from .lib.util import render_docs
1920

2021

2122
@render_docs

src/scatterkit/lib/util.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,32 @@
9797
Ending q (1/Å)
9898
dq : float
9999
bin_width (1/Å)""",
100+
PDF_PARAMETERS="""g1 : MDAnalysis.core.groups.AtomGroup
101+
First AtomGroup.
102+
g2 : MDAnalysis.core.groups.AtomGroup
103+
Second AtomGroup.""",
104+
BIN_WIDTH_PARAMETER="""bin_width : float
105+
Width of the bins (in Å).""",
106+
RADIAL_CLASS_PARAMETERS="""rmin : float
107+
Minimal radial coordinate relative to the center of mass of the refgroup for
108+
evaluation (in Å).
109+
rmax : float
110+
Maximal radial coordinate relative to the center of mass of the refgroup for
111+
evaluation (in Å).
112+
113+
If ``rmax=None``, the box extension is taken.""",
114+
BIN_METHOD_PARAMETER="""bin_method : {``"com"``, ``"cog"``, ``"coc"``}
115+
Method for the position binning.
116+
117+
The possible options are center of mass (``"com"``), center of geometry (``"cog"``),
118+
and center of charge (``"coc"``).""",
119+
GROUPING_PARAMETER="""grouping : {``"atoms"``, ``"residues"``, ``"segments"``, ``"molecules"``, ``"fragments"``}
120+
Atom grouping for the calculations.
121+
122+
The possible grouping options are the atom positions (in the case where
123+
``grouping="atoms"``) or the center of mass of the specified grouping unit (in the
124+
case where ``grouping="residues"``, ``"segments"``, ``"molecules"`` or
125+
``"fragments"``).""", # noqa: E501
100126
)
101127
"""Dictionary containing the keys and the actual docstring used by :func:`scatterkit.lib.util.render_docs`.
102128

src/scatterkit/rdfdiporder.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
import MDAnalysis as mda
1313
import numpy as np
1414
from maicos.core import AnalysisBase
15-
from maicos.lib.util import get_center, render_docs
15+
from maicos.lib.util import get_center
1616
from MDAnalysis.lib import distances
1717

18+
from .lib.util import render_docs
1819
from .lib.weights import diporder_pair_weights
1920

2021

0 commit comments

Comments
 (0)