Skip to content

Fixed inverse q-spacing in the geometric extrapolation function #571

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

Merged
merged 5 commits into from
Jan 19, 2024
Merged

Fixed inverse q-spacing in the geometric extrapolation function #571

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81ffb2e
Fixed inverse q-spacing in the geometric extrapolation function
Jun 27, 2023
23b05a9
Merge branch 'master' into 568-fix-geometric-extrapolation-when-point…
caitwolf Jun 27, 2023
f07dc5d
fixing typo from resolving merge conflict to ensure inverse term of l…
Jun 27, 2023
a2b169e
Merge branch 'master' into 568-fix-geometric-extrapolation-when-point…
caitwolf Nov 21, 2023
98053f4
switched the log_delta_q parameter in the first place so the variable…
caitwolf Jan 18, 2024
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
6 changes: 3 additions & 3 deletions sasmodels/resolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,20 +510,20 @@ def geometric_extrapolation(q, q_min, q_max, points_per_decade=None):
data_min, data_max = q[0], q[-1]
if points_per_decade is None:
if data_max > data_min:
log_delta_q = (len(q) - 1) / (log(data_max) - log(data_min))
log_delta_q = (log(data_max) - log(data_min)) / (len(q) - 1)
else:
log_delta_q = log(10.) / DEFAULT_POINTS_PER_DECADE
else:
log_delta_q = log(10.) / points_per_decade
if q_min < data_min:
if q_min < 0:
q_min = data_min*MINIMUM_ABSOLUTE_Q
n_low = int(np.ceil(log_delta_q * (log(q[0])-log(q_min))))
n_low = int(np.ceil((log(q[0])-log(q_min)) / log_delta_q))
q_low = np.logspace(log10(q_min), log10(q[0]), n_low+1)[:-1]
else:
q_low = []
if q_max > data_max:
n_high = int(np.ceil(log_delta_q * (log(q_max)-log(data_max))))
n_high = int(np.ceil((log(q_max)-log(data_max)) / log_delta_q))
q_high = np.logspace(log10(data_max), log10(q_max), n_high+1)[1:]
else:
q_high = []
Expand Down