diff --git a/src/multiego/pairs.py b/src/multiego/pairs.py index 64b6da49..f5556d22 100644 --- a/src/multiego/pairs.py +++ b/src/multiego/pairs.py @@ -1,4 +1,4 @@ -from . import bonded, type_definitions +from . import bonded, type_definitions, interaction_matrix from .model_config import config from collections import defaultdict, deque @@ -128,8 +128,8 @@ def make_pairs_exclusion_topology(meGO_ensemble, args, meGO_LJ_14=None): ti = meGO_ensemble.sbtype_type_dict[ai] tj = meGO_ensemble.sbtype_type_dict[aj] - if (ti == "H" and tj not in type_definitions.H_ALLOWED_PARTNERS) or ( - tj == "H" and ti not in type_definitions.H_ALLOWED_PARTNERS + if (ti == "H" and tj not in interaction_matrix.H_interactions) or ( + tj == "H" and ti not in interaction_matrix.H_interactions ): continue diff --git a/src/multiego/type_definitions.py b/src/multiego/type_definitions.py index 0d8ed0f2..a6b0f61e 100644 --- a/src/multiego/type_definitions.py +++ b/src/multiego/type_definitions.py @@ -453,7 +453,7 @@ # Atom types allowed to pair with H in nth-bond repulsions. # H-X pairs where X is NOT in this set are skipped entirely. -H_ALLOWED_PARTNERS = {"H", "O", "OM", "OA"} +# H_ALLOWED_PARTNERS = H_interactions#{"H", "O", "OM", "OA", "OS"} # Data-driven c12 overrides for nth-bond repulsive pairs (egos == "mg"). # Each entry: (types_ai, types_aj, c12_value)