Skip to content

Commit

Permalink
reorder residence methods
Browse files Browse the repository at this point in the history
  • Loading branch information
orionarcher committed Apr 2, 2023
1 parent 1e242c7 commit 9b96772
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions solvation_analysis/residence.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ class Residence:
{'BN': 4.02, 'FEC': 3.79, 'PF6': 1.15}
"""

def __init__(self, solvation_data, step):
self.solvation_data = solvation_data
self._auto_covariances = self._calculate_auto_covariance_dict()
self._residence_times_cutoff = self._calculate_residence_times_with_cutoff(self._auto_covariances, step)
self._residence_times_fit, self._fit_parameters = self._calculate_residence_times_with_fit(
self._auto_covariances,
step
)

@staticmethod
def from_solute(solute):
"""
Expand Down Expand Up @@ -270,12 +279,3 @@ def fit_parameters(self):
arameters for the exponential fit to the autocorrelation function.
"""
return self._fit_parameters

def __init__(self, solvation_data, step):
self.solvation_data = solvation_data
self._auto_covariances = self._calculate_auto_covariance_dict()
self._residence_times_cutoff = self._calculate_residence_times_with_cutoff(self._auto_covariances, step)
self._residence_times_fit, self._fit_parameters = self._calculate_residence_times_with_fit(
self._auto_covariances,
step
)

0 comments on commit 9b96772

Please sign in to comment.