diff options
-rw-r--r-- | tests/gradient_panel_move.c (renamed from tests/gradient_panel_x.c) | 6 | ||||
-rw-r--r-- | tests/meson.build | 19 |
2 files changed, 14 insertions, 11 deletions
diff --git a/tests/gradient_panel_x.c b/tests/gradient_panel_move.c index 0e3e1a3d..b3c950ab 100644 --- a/tests/gradient_panel_x.c +++ b/tests/gradient_panel_move.c @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) panel_matrices = make_panel_minvs(image.detgeom); before = make_dev_list(rps, n_refls, image.detgeom); - image.detgeom->panels[0].cnx += step; + image.detgeom->panels[0].THING_TO_MOVE += step; update_predictions(image.crystals[0]); after = make_dev_list(rps, n_refls, image.detgeom); @@ -66,11 +66,11 @@ int main(int argc, char *argv[]) float calc[3]; double obs[3]; - calc[0] = r_gradient(GPARAM_DET_TX, rps[i].refl, + calc[0] = r_gradient(TEST_GPARAM, rps[i].refl, crystal_get_cell(image.crystals[0]), image.lambda); - fs_ss_gradient(GPARAM_DET_TX, rps[i].refl, + fs_ss_gradient(TEST_GPARAM, rps[i].refl, crystal_get_cell(image.crystals[0]), &image.detgeom->panels[rps[i].peak->pn], panel_matrices[rps[i].peak->pn], diff --git a/tests/meson.build b/tests/meson.build index 6388a680..16c8f3a1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -96,16 +96,19 @@ exe = executable('prof2d_check', test('prof2d_check', exe) -# Refinement gradient checks -gradient_tests = ['gradient_panel_x', - 'gradient_cell_asx'] - -foreach name : gradient_tests - exe = executable(name, - [''.join([name, '.c']), +# Refinement gradient checks, part 1: panel positions +panel_gradient_tests = [['gradient_panel_x', 'cnx', 'GPARAM_DET_TX'], + ['gradient_panel_y', 'cny', 'GPARAM_DET_TY'], + ['gradient_panel_z', 'cnz', 'GPARAM_DET_TZ']] + +foreach name : panel_gradient_tests + exe = executable(name[0], + ['gradient_panel_move.c', 'gradient_check_utils.c'], + c_args : ['-DTHING_TO_MOVE='+name[1], + '-DTEST_GPARAM='+name[2]], dependencies : [libcrystfeldep, mdep, gsldep]) - test(name, exe) + test(name[0], exe) endforeach |