Skip to content

Commit

Permalink
remove O D from compute nested fits.
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshwani committed Feb 19, 2024
1 parent 7c8c9d5 commit fc5bc77
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions lppls/lppls.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ def fit(self, max_searches, minimizer="Nelder-Mead", obs=None):
# Increment search count on SVD convergence error, but raise all other exceptions.
try:
tc, m, w, a, b, c, c1, c2 = self.estimate_params(obs, seed, minimizer)
O = self.get_oscillations(w, tc, t1, t2)
D = self.get_damping(m, w, b, c)
return tc, m, w, a, b, c, c1, c2, O, D
# O = self.get_oscillations(w, tc, t1, t2)
# D = self.get_damping(m, w, b, c)
return tc, m, w, a, b, c, c1, c2, #O, D
except Exception as e:
# print(e)
search_count += 1
Expand Down Expand Up @@ -270,8 +270,8 @@ def compute_indicators(self, res, filter_conditions_config=None):
w = fits["w"]
b = fits["b"]
c = fits["c"]
O = fits["O"]
D = fits["D"]
# O = fits["O"]
# D = fits["D"]

# t_delta = t2 - t1
# pct_delta_min = t_delta * 0.5
Expand Down Expand Up @@ -485,7 +485,7 @@ def compute_nested_fits(
i_idx += 1
for j in range(0, window_delta, inner_increment):
obs_shrinking_slice = obs[:, j:window_size]
tc, m, w, a, b, c, c1, c2, O, D = self.fit(
tc, m, w, a, b, c, c1, c2 = self.fit(
max_searches, obs=obs_shrinking_slice
)
res[i_idx - 1].append([])
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
long_description = fh.read()

setuptools.setup(name='lppls',
version='0.6.16',
version='0.6.17',
description='A Python module for fitting the LPPLS model to data.',
packages=['lppls'],
author='Josh Nielsen',
Expand Down

0 comments on commit fc5bc77

Please sign in to comment.