Skip to content

Provide omega period to fitGrain #820

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide omega period to fitGrain #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 2 deletions hexrd/fitgrains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ def fit_grain_FF_reduced(grain_id):
else:
grain_params = fitGrain(
grain_params, instrument, culled_results,
plane_data.latVecOps['B'], plane_data.wavelength
plane_data.latVecOps['B'], plane_data.wavelength,
omePeriod=ome_period,
)
# get chisq
# TODO: do this while evaluating fit???
Expand Down Expand Up @@ -289,7 +290,8 @@ def fit_grain_FF_reduced(grain_id):
if num_refl_valid > 12:
grain_params = fitGrain(
grain_params, instrument, culled_results_r,
plane_data.latVecOps['B'], plane_data.wavelength
plane_data.latVecOps['B'], plane_data.wavelength,
omePeriod=ome_period,
)
# get chisq
# TODO: do this while evaluating fit???
Expand Down
5 changes: 0 additions & 5 deletions hexrd/fitting/grains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ def fitGrain(gFull, instrument, reflections_dict,
DESCRIPTION.

"""
# FIXME: will currently fail if omePeriod is specifed
if omePeriod is not None:
# xyo_det[:, 2] = rotations.mapAngle(xyo_det[:, 2], omePeriod)
raise RuntimeError

gFit = gFull[gFlag]

# objFuncFitGrain can run *significantly* faster if we convert the
Expand Down
Loading