diff options
| author | Thomas White <taw@physics.org> | 2020-07-28 14:46:19 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:45 +0200 |
| commit | 013c762b667a0fede74377cb0f9799d3b3262640 (patch) | |
| tree | 7959944636531421246917a81226321f9bab5eca /tests | |
| parent | 4ac5b40dd5f7e4dadf98fa85408ca9230c3d7dbb (diff) | |
Expose a couple more functions for easier testing
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/prof2d_check.c | 10 | ||||
| -rw-r--r-- | tests/ring_check.c | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 799e43eb..01abe3eb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -51,10 +51,6 @@ add_test(prof2d_check prof2d_check) add_executable(ring_check ring_check.c) target_include_directories(ring_check PRIVATE ${COMMON_INCLUDES}) target_link_libraries(ring_check PRIVATE ${COMMON_LIBRARIES}) -if (FDIP_FOUND) - target_include_directories(ring_check PRIVATE ${FDIP_INCLUDES}) - target_link_libraries(ring_check PRIVATE ${FDIP_LIBRARIES}) -endif (FDIP_FOUND) add_test(ring_check ring_check) add_executable(symmetry_check symmetry_check.c) diff --git a/tests/prof2d_check.c b/tests/prof2d_check.c index f291c915..28ecd67c 100644 --- a/tests/prof2d_check.c +++ b/tests/prof2d_check.c @@ -31,10 +31,18 @@ #include <image.h> #include <utils.h> +#include <cell.h> +#include <cell-utils.h> +#include <geometry.h> +#include <integration.h> #include "histogram.h" -#include "../libcrystfel/src/integration.c" +extern void integrate_prof2d(IntegrationMethod meth, + Crystal *cr, struct image *image, IntDiag int_diag, + signed int idh, signed int idk, signed int idl, + double ir_inn, double ir_mid, double ir_out, + pthread_mutex_t *term_lock, int **masks); #define ADD_PX(fs, ss, val) \ diff --git a/tests/ring_check.c b/tests/ring_check.c index dac0d90f..f4830068 100644 --- a/tests/ring_check.c +++ b/tests/ring_check.c @@ -33,8 +33,13 @@ #include <image.h> #include <utils.h> -#include "../libcrystfel/src/peaks.c" +extern int integrate_peak(struct image *image, + int p_cfs, int p_css, int pn, + double *pfs, double *pss, + double *intensity, double *sigma, + double ir_inn, double ir_mid, double ir_out, + int *saturated); /* The third integration check draws a Poisson background and checks that, on * average, it gets subtracted by the background subtraction. */ |