Skip to content
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.

Sign up for GitHub

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

More usability improvements sw fitpowder (DRAFT IN PROG) #210

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

More usability improvements sw fitpowder (DRAFT IN PROG) #210

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7e78cd
Fix bug in estimate_scale_factor - background already added to ycalc
RichardWaiteSTFC Jan 8, 2025
f7dd48e
Add new function to fit bg and scale parameters to all data
RichardWaiteSTFC Jan 8, 2025
127156e
Support any ndbase optimizer in fit_background
RichardWaiteSTFC Jan 8, 2025
d04fe5c
Add method to plot background region on figures
RichardWaiteSTFC Jan 9, 2025
9aa01e4
Add function (and tests) to set background region
RichardWaiteSTFC Jan 9, 2025
4c25403
Set sensible background when changing strategy
RichardWaiteSTFC Jan 9, 2025
2869cff
Handle edges/nans properly in avg. of error when taking 1D cuts
RichardWaiteSTFC Jan 9, 2025
cc82c7f
Add method to clear background region
RichardWaiteSTFC Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Handle edges/nans properly in avg. of error when taking 1D cuts
  • Loading branch information
@RichardWaiteSTFC
RichardWaiteSTFC committed Jan 9, 2025
commit 2869cff75d201485b44129d505ee88f0aa5d0c41
3 changes: 2 additions & 1 deletion swfiles/sw_fitpowder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,8 +769,9 @@ function plot_1d_cuts_of_2d_data(obj, qmins, qmaxs, params)
'This function is only valid for 2D data');
cut = struct('x', obj.ebin_cens, 'qmin', qmin, 'qmax', qmax);
ikeep = obj.modQ_cens > qmin & obj.modQ_cens <= qmax;
ifinite = isfinite(obj.y(:, ikeep));
cut.y = mean(obj.y(:, ikeep), 2, 'omitnan');
cut.e = sqrt(sum(obj.e(:, ikeep).^2, 2))/sum(ikeep);
cut.e = sqrt(sum(obj.e(:, ikeep).^2, 2))./sum(ifinite, 2);
end
function ycalc = rebin_powspec_to_1D_cuts(obj, ycalc)
% sum up successive nQ points along |Q| axis (dim=2)
Expand Down
Loading