Skip to content

Commit 63183fd

Browse files
committed
update docs
1 parent 0f4d218 commit 63183fd

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

CodeEntropy/axes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AxesManager:
1818

1919
def __init__(self):
2020
"""
21-
Initializes the LevelManager with placeholders for level-related data,
21+
Initializes the AxesManager with placeholders for level-related data,
2222
including translational and rotational axes, number of beads, and a
2323
general-purpose data container.
2424
"""

CodeEntropy/levels.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ def get_matrices(
100100
to.
101101
force_partitioning (float): Factor to adjust force contributions,
102102
default is 0.5.
103+
customised_axes (bool): Whether to use customised axes for rotating
104+
forces.
103105
104106
Returns:
105107
force_matrix (np.ndarray): Accumulated force covariance matrix.
@@ -235,6 +237,8 @@ def get_combined_forcetorque_matrices(
235237
to.
236238
force_partitioning (float): Factor to adjust force contributions,
237239
default is 0.5.
240+
customised_axes (bool): Whether to use customised axes for rotating
241+
forces.
238242
239243
Returns:
240244
forcetorque_matrix (np.ndarray): Accumulated torque covariance matrix.
@@ -250,14 +254,15 @@ def get_combined_forcetorque_matrices(
250254
weighted_forces = [None for _ in range(number_beads)]
251255
weighted_torques = [None for _ in range(number_beads)]
252256

257+
# Create axes manager for custom axes
258+
axes_manager = AxesManager()
259+
253260
# Calculate forces/torques for each bead
254261
for bead_index in range(number_beads):
255262
bead = list_of_beads[bead_index]
256-
257263
# Set up axes
258264
# translation and rotation use different axes
259265
# how the axes are defined depends on the level
260-
axes_manager = AxesManager()
261266
if level == "residue" and customised_axes:
262267
trans_axes, rot_axes, center, moment_of_inertia = (
263268
axes_manager.get_residue_axes(data_container, bead_index)
@@ -470,6 +475,8 @@ def get_weighted_torques(
470475
contributions (typically 0.5).
471476
moment_of_inertia : np.ndarray
472477
Moment of inertia (3,)
478+
customised_axes: bool
479+
Whether to use customised axes for rotating forces.
473480
474481
Returns
475482
-------

docs/getting_started.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,18 @@ The top_traj_file argument is necessary to identify your simulation data, the ot
137137
- How to group molecules for averaging
138138
- ``molecules``
139139
- ``str``
140+
* - ``--kcal_force_units``
141+
- Set input units as kcal/mol
142+
- ``bool``
143+
- ``False``
144+
* - ``--combined_forcetorque``
145+
- Use the combined force-torque covariance matrix for the highest level to match the 2019 paper
146+
- ``bool``
147+
- ``True``
148+
* - ``--customised_axes``
149+
- Use custom bonded axes to get COM, MOI and PA that match the 2019 paper
150+
- ``bool``
151+
- ``True``
140152

141153
Averaging
142154
^^^^^^^^^

0 commit comments

Comments
 (0)