Skip to content

Commit 83d827d

Browse files
committed
fixing and adding additional test cases for the grouping by molecule integration
1 parent fcf83ef commit 83d827d

5 files changed

Lines changed: 386 additions & 147 deletions

File tree

CodeEntropy/entropy.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def execute(self):
6969

7070
self._handle_water_entropy(start, end, step)
7171
reduced_atom, number_molecules, levels, groups = self._initialize_molecules()
72-
number_frames = len(reduced_atom.trajectory)
7372

7473
force_matrices, torque_matrices = self._level_manager.build_covariance_matrices(
7574
self,
@@ -85,7 +84,6 @@ def execute(self):
8584
states_ua, states_res = self._level_manager.build_conformational_states(
8685
self,
8786
reduced_atom,
88-
number_molecules,
8987
levels,
9088
groups,
9189
start,
@@ -847,12 +845,16 @@ class OrientationalEntropy(EntropyManager):
847845
and orientational degrees of freedom.
848846
"""
849847

850-
def __init__(self, run_manager, args, universe, data_logger, level_manager):
848+
def __init__(
849+
self, run_manager, args, universe, data_logger, level_manager, group_molecules
850+
):
851851
"""
852852
Initializes the OrientationalEntropy manager with all required components and
853853
sets the gas constant used in orientational entropy calculations.
854854
"""
855-
super().__init__(run_manager, args, universe, data_logger, level_manager)
855+
super().__init__(
856+
run_manager, args, universe, data_logger, level_manager, group_molecules
857+
)
856858

857859
def orientational_entropy_calculation(self, neighbours_dict):
858860
"""

CodeEntropy/levels.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,10 @@ def build_conformational_states(
978978
ce,
979979
)
980980

981-
states_res[group_id] += states
981+
if states_res[group_id] is None:
982+
states_res[group_id] = states
983+
else:
984+
states_res[group_id] += states
982985

983986
logger.debug(f"states_ua {states_ua}")
984987
logger.debug(f"states_res {states_res}")

0 commit comments

Comments
 (0)