-
Notifications
You must be signed in to change notification settings - Fork 5
Add a python equivalent to MATLABs smoothdata and use in Bayes plots #208
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -826,9 +826,7 @@ def plot_one_hist( | |
| sd_y = np.std(parameter_chain) | ||
|
|
||
| if smooth: | ||
| if sigma is None: | ||
| sigma = sd_y / 2 | ||
| counts = gaussian_filter1d(counts, sigma) | ||
| counts = moving_avg(counts) | ||
| axes.hist( | ||
| bins[:-1], | ||
| bins, | ||
|
|
@@ -1233,3 +1231,30 @@ def plot_bayes(project: ratapi.Project, results: ratapi.outputs.BayesResults): | |
| plot_corner(results) | ||
| else: | ||
| raise ValueError("Bayes plots are only available for the results of Bayesian analysis (NS or DREAM)") | ||
|
|
||
|
|
||
| def moving_avg(data: np.ndarray, window_size: int = 8) -> list[float]: | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the function can be called |
||
| """Calculate the moving average of an array with a given window size. | ||
|
|
||
| This is a python equivalent to MATLABs smoothdata(A, 'movmean') | ||
|
|
||
| Parameters | ||
| ---------- | ||
| data : np.ndarray | ||
| The input array to smooth | ||
| window_size : int | ||
| The window slides down the length of the vector, | ||
| computing an average over the elements within each window. | ||
|
|
||
| """ | ||
| i = 0 | ||
| moving_averages = [] | ||
|
|
||
| while i < len(data): | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems like it can be replaced by a for loop `` |
||
| start_window_ind = floor(float(i - window_size / 2)) if i - window_size / 2 > 0 else 0 | ||
| end_window_ind = floor(float(i + window_size / 2)) if i + window_size / 2 < len(data) else len(data) | ||
| window_average = np.sum(data[start_window_ind:end_window_ind]) / (end_window_ind + 0 - start_window_ind) | ||
| moving_averages.append(window_average) | ||
| i += 1 | ||
|
|
||
| return moving_averages | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please update docstring to reflect switch to moving average, remove sigma. I also think we should expose the window size parameter since we don't know if 8 will work for all cases
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exposing the window size means the moving average function will need a check for valid window sizes and a unit test will be helpful