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

swloop mex (part II) #173

Merged
merged 9 commits into from
Apr 15, 2024
Merged

swloop mex (part II) #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9972055
Add fastmode and neutron_output options to spinwave
mducle Mar 14, 2024
2b32676
Add twin and unittests to neutron_output and fastmode
mducle Mar 14, 2024
a920ec3
Add neutron_output option to swloop mex
mducle Mar 16, 2024
6a79db9
Fix neutron_output swloop option. Add unit test.
mducle Mar 18, 2024
c7c9b10
Add fastmode to swloop mex.
mducle Mar 19, 2024
ee3b35c
Remove spinwavefast; horace() uses spinwave('fastmode')
mducle Mar 20, 2024
b746876
Fix failing symbolic tests on R2024a
mducle Apr 9, 2024
b7b0891
Fix additional failing tests on R2024a
mducle Apr 15, 2024
bb79de0
Remove redundant comments
mducle Apr 15, 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
53 changes: 53 additions & 0 deletions +sw_tests/+unit_tests/unittest_spinw_spinwave.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,59 @@ function test_mex_prefs_nspinlarge(testCase)
swpref.setpref('usemex', mexpref.val);
swpref.setpref('nspinlarge', nslpref.val);
end
function test_neutron_output(testCase, mex)
swpref.setpref('usemex', mex);
objs = {testCase.swobj, testCase.swobj_tri};
hkl = {[0 0 0] [1 0 0] [0 1 0] 50};
for ii = 1:numel(objs)
swobj = copy(objs{ii});
spec0 = sw_neutron(swobj.spinwave(hkl, 'sortMode', false));
spec1 = swobj.spinwave(hkl, 'neutron_output', true);
testCase.verify_val(spec0.omega, spec1.omega, 'abs_tol', 1e-8);
testCase.verify_val(spec0.Sperp, spec1.Sperp, 'abs_tol', 1e-8);
end
end
function test_neutron_twin(testCase, mex)
swpref.setpref('usemex', mex);
swobj = copy(testCase.swobj);
swobj.addtwin('axis', [1 1 1], 'phid', 54);
swobj.unit.nformula = int32(2);
hkl = {[1 0 0] [0 1 0] [0 0 0] 50};
spec0 = sw_neutron(swobj.spinwave(hkl, 'sortMode', false));
spec1 = swobj.spinwave(hkl, 'neutron_output', true);
testCase.verify_val(spec0.omega{1}, spec1.omega{1}, 'abs_tol', 1e-8);
testCase.verify_val(spec0.omega{2}, spec1.omega{2}, 'abs_tol', 1e-8);
testCase.verify_val(spec0.Sperp{1}, spec1.Sperp{1}, 'abs_tol', 1e-8);
testCase.verify_val(spec0.Sperp{2}, spec1.Sperp{2}, 'abs_tol', 1e-8);
end
function test_fastmode(testCase, mex)
swpref.setpref('usemex', mex);
swobj = copy(testCase.swobj);
hkl = {[0 0 0] [1 0 0] [0 1 0] 50};
spec0 = sw_neutron(swobj.spinwave(hkl));
spec1 = swobj.spinwave(hkl, 'fastmode', true);
spec2 = swobj.spinwave(hkl, 'hermit', false, 'fastmode', true);
nMode = size(spec1.omega, 1);
testCase.verify_val(size(spec0.omega, 1), 2*nMode);
testCase.verify_val(spec0.omega(1:nMode,:), spec1.omega, 'abs_tol', 1e-4);
testCase.verify_val(spec0.Sperp(1:nMode,:), spec1.Sperp, 'abs_tol', 1e-8);
testCase.verify_val(spec0.Sperp(1:nMode,:), spec2.Sperp, 'abs_tol', 1e-8);
end
function test_fastmode_mex_nomex(testCase)
% Tests that fast mode gives same results for mex, no-mex and non-fastmode
swobj = copy(testCase.swobj);
hkl = {[0 0 0] [1 0 0] [0 1 0] 50};
swpref.setpref('usemex', 0);
spec0 = sw_neutron(swobj.spinwave(hkl));
spec1 = swobj.spinwave(hkl, 'fastmode', true);
swpref.setpref('usemex', 1);
spec2 = swobj.spinwave(hkl, 'fastmode', true);
nMode = size(spec1.omega, 1);
testCase.verify_val(size(spec0.omega, 1), 2*nMode);
testCase.verify_val(spec0.omega(1:nMode,:), spec2.omega, 'abs_tol', 1e-4);
testCase.verify_val(spec0.Sperp(1:nMode,:), spec1.Sperp, 'abs_tol', 1e-8);
testCase.verify_val(spec0.Sperp(1:nMode,:), spec2.Sperp, 'abs_tol', 1e-8);
end
end
methods (Test, TestTags = {'Symbolic'})
function test_sw_symbolic_no_qpts(testCase)
Expand Down
20 changes: 10 additions & 10 deletions +sw_tests/+unit_tests/unittest_sw_egrid.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,18 +372,18 @@ function test_dE_single_number(testCase)
% use small dE so only intensity in a single ebin at each q
out = sw_egrid(testCase.spectrum, 'component', 'Sperp', 'dE', 0.001);
expected_out = testCase.sw_egrid_out_sperp;
expected_out.swConv(228,[2, 4]) = 6.29705585872502e-05;
expected_out.swConv(455,3) = 2.65255873676699;
testCase.verify_obj(out, expected_out);
expected_out.swConv(228,[2, 4]) = 0.00929494936601533;
expected_out.swConv(455,3) = 2.36709828275952;
testCase.verify_obj(out, expected_out, 'abs_tol', 1e-10);
end
function test_dE_matrix_correct_numel(testCase)
% use small dE so only intensity in a single ebin at each q
dE = 0.001*ones(1, numel(testCase.sw_egrid_out_sperp.Evect)-1);
out = sw_egrid(testCase.spectrum, 'component', 'Sperp', 'dE', dE);
expected_out = testCase.sw_egrid_out_sperp;
expected_out.swConv(228,[2, 4]) = 6.29705585872502e-05;
expected_out.swConv(455,3) = 2.65255873676699;
testCase.verify_obj(out, expected_out);
expected_out.swConv(228,[2, 4]) = 0.00929494936601533;
expected_out.swConv(455,3) = 2.36709828275952;
testCase.verify_obj(out, expected_out, 'abs_tol', 1e-10);
end
function test_dE_matrix_incorrect_numel(testCase)
% use small dE so only intensity in a single ebin at each q
Expand All @@ -397,10 +397,10 @@ function test_dE_callable_func(testCase)
dE_func = @(en) 0.001;
out = sw_egrid(testCase.spectrum, 'component', 'Sperp', 'dE', dE_func);
expected_out = testCase.sw_egrid_out_sperp;
expected_out.swConv(228,[2, 4]) = 6.29705585872502e-05;
expected_out.swConv(455,3) = 2.65255873676699;
testCase.verify_obj(out, expected_out);
expected_out.swConv(228,[2, 4]) = 0.00929494936601533;
expected_out.swConv(455,3) = 2.36709828275952;
testCase.verify_obj(out, expected_out, 'abs_tol', 1e-10);
end
end

end
end
Loading
Loading