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

Add robust fitting back to fit_origin #552

Merged
merged 3 commits into from
Nov 1, 2023
Merged

Add robust fitting back to fit_origin #552

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1bbb91
add robustness back to fit_origin
sezelt Nov 1, 2023
b7c46d8
Merge remote-tracking branch 'origin/dev' into dev
sezelt Nov 1, 2023
fac36a7
add fit function option back
sezelt Nov 1, 2023
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
22 changes: 14 additions & 8 deletions py4DSTEM/braggvectors/braggvector_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,14 +552,20 @@ def fit_origin(
from py4DSTEM.process.calibration import fit_origin

if mask_check_data is True:
# TODO - replace this bad hack for the mask for the origin fit
mask = np.logical_not(q_meas[0] == 0)
qx0_fit, qy0_fit, qx0_residuals, qy0_residuals = fit_origin(
tuple(q_meas),
mask=mask,
)
else:
qx0_fit, qy0_fit, qx0_residuals, qy0_residuals = fit_origin(tuple(q_meas))
data_mask = np.logical_not(q_meas[0] == 0)
if mask is None:
mask = data_mask
else:
mask = np.logical_and(mask, data_mask)

qx0_fit, qy0_fit, qx0_residuals, qy0_residuals = fit_origin(
tuple(q_meas),
mask=mask,
fitfunction=fitfunction,
robust=robust,
robust_steps=robust_steps,
robust_thresh=robust_thresh,
)

# try to add to calibration
try:
Expand Down