aboutsummaryrefslogtreecommitdiff
path: root/tests/ring_check.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ring_check.c')
-rw-r--r--tests/ring_check.c92
1 files changed, 42 insertions, 50 deletions
diff --git a/tests/ring_check.c b/tests/ring_check.c
index e0667e37..f4830068 100644
--- a/tests/ring_check.c
+++ b/tests/ring_check.c
@@ -7,7 +7,7 @@
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2011-2016 Thomas White <taw@physics.org>
+ * 2011-2020 Thomas White <taw@physics.org>
* 2012 Andrew Martin <andrew.martin@desy.de>
*
* This file is part of CrystFEL.
@@ -27,19 +27,19 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
#include <stdlib.h>
#include <stdio.h>
#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. */
@@ -60,14 +60,14 @@ static void third_integration_check(struct image *image, int n_trials,
double fsp, ssp;
int r;
- for ( fs=0; fs<image->det->panels[0].w; fs++ ) {
- for ( ss=0; ss<image->det->panels[0].h; ss++ ) {
- image->dp[0][fs+image->det->panels[0].w*ss]
+ for ( fs=0; fs<image->detgeom->panels[0].w; fs++ ) {
+ for ( ss=0; ss<image->detgeom->panels[0].h; ss++ ) {
+ image->dp[0][fs+image->detgeom->panels[0].w*ss]
= poisson_noise(rng, 1000.0);
}
}
- r = integrate_peak(image, 64, 64, &image->det->panels[0],
+ r = integrate_peak(image, 64, 64, 0,
&fsp, &ssp, &intensity, &sigma,
10.0, 15.0, 17.0, NULL);
@@ -119,9 +119,9 @@ static void fourth_integration_check(struct image *image, int n_trials,
double fsp, ssp;
int r;
- for ( fs=0; fs<image->det->panels[0].w; fs++ ) {
- for ( ss=0; ss<image->det->panels[0].h; ss++ ) {
- int idx = fs+image->det->panels[0].w*ss;
+ for ( fs=0; fs<image->detgeom->panels[0].w; fs++ ) {
+ for ( ss=0; ss<image->detgeom->panels[0].h; ss++ ) {
+ int idx = fs+image->detgeom->panels[0].w*ss;
image->dp[0][idx] = poisson_noise(rng, 1000.0);
if ( (fs-64)*(fs-64) + (ss-64)*(ss-64) > 9*9 ) continue;
image->dp[0][idx] += 1000.0;
@@ -129,7 +129,7 @@ static void fourth_integration_check(struct image *image, int n_trials,
}
}
- r = integrate_peak(image, 64, 64, &image->det->panels[0],
+ r = integrate_peak(image, 64, 64, 0,
&fsp, &ssp, &intensity, &sigma,
10.0, 15.0, 17.0, NULL);
@@ -188,30 +188,24 @@ int main(int argc, char *argv[])
image.dp[0] = malloc(128*128*sizeof(float));
image.bad = malloc(sizeof(uint16_t *));
image.bad[0] = calloc(128*128, sizeof(int));
- image.beam = NULL;
image.lambda = ph_eV_to_lambda(1000.0);
- image.det = calloc(1, sizeof(struct detector));
- image.det->n_panels = 1;
- image.det->panels = calloc(1, sizeof(struct panel));
-
- image.det->panels[0].fsx = 1.0;
- image.det->panels[0].fsy = 0.0;
- image.det->panels[0].ssx = 0.0;
- image.det->panels[0].ssy = 1.0;
- image.det->panels[0].xfs = 1.0;
- image.det->panels[0].yfs = 0.0;
- image.det->panels[0].xss = 0.0;
- image.det->panels[0].yss = 1.0;
- image.det->panels[0].cnx = -64.0;
- image.det->panels[0].cny = -64.0;
- image.det->panels[0].clen = 1.0;
- image.det->panels[0].res = 1.0;
- image.det->panels[0].w = 128;
- image.det->panels[0].h = 128;
- image.det->panels[0].adu_per_eV = NAN;
- image.det->panels[0].adu_per_photon = 1.0;
- image.det->panels[0].max_adu = +INFINITY; /* No cutoff */
+ image.detgeom = calloc(1, sizeof(struct detgeom));
+ image.detgeom->n_panels = 1;
+ image.detgeom->panels = calloc(1, sizeof(struct detgeom_panel));
+
+ image.detgeom->panels[0].fsx = 1.0;
+ image.detgeom->panels[0].fsy = 0.0;
+ image.detgeom->panels[0].ssx = 0.0;
+ image.detgeom->panels[0].ssy = 1.0;
+ image.detgeom->panels[0].cnx = -64.0;
+ image.detgeom->panels[0].cny = -64.0;
+ image.detgeom->panels[0].cnz = 1.0;
+ image.detgeom->panels[0].pixel_pitch = 1.0;
+ image.detgeom->panels[0].w = 128;
+ image.detgeom->panels[0].h = 128;
+ image.detgeom->panels[0].adu_per_photon = 1.0;
+ image.detgeom->panels[0].max_adu = +INFINITY; /* No cutoff */
memset(image.dp[0], 0, 128*128*sizeof(float));
@@ -219,7 +213,7 @@ int main(int argc, char *argv[])
image.crystals = NULL;
/* First check: no intensity -> no peak, or very low intensity */
- r = integrate_peak(&image, 64, 64, &image.det->panels[0],
+ r = integrate_peak(&image, 64, 64, 0,
&fsp, &ssp, &intensity, &sigma,
10.0, 15.0, 17.0, NULL);
STATUS(" First check: integrate_peak() returned %i", r);
@@ -238,15 +232,15 @@ int main(int argc, char *argv[])
/* Second check: uniform peak gives correct I and low sigma(I) */
npx = 0;
- for ( fs=0; fs<image.det->panels[0].w; fs++ ) {
- for ( ss=0; ss<image.det->panels[0].h; ss++ ) {
+ for ( fs=0; fs<image.detgeom->panels[0].w; fs++ ) {
+ for ( ss=0; ss<image.detgeom->panels[0].h; ss++ ) {
if ( (fs-64)*(fs-64) + (ss-64)*(ss-64) > 9*9 ) continue;
- image.dp[0][fs+image.det->panels[0].w*ss] = 1000.0;
+ image.dp[0][fs+image.detgeom->panels[0].w*ss] = 1000.0;
npx++;
}
}
- r = integrate_peak(&image, 64, 64, &image.det->panels[0],
+ r = integrate_peak(&image, 64, 64, 0,
&fsp, &ssp, &intensity, &sigma,
10.0, 15.0, 17.0, NULL);
if ( r ) {
@@ -280,16 +274,16 @@ int main(int argc, char *argv[])
/* Fifth check: uniform peak on uniform background */
npx = 0;
- for ( fs=0; fs<image.det->panels[0].w; fs++ ) {
- for ( ss=0; ss<image.det->panels[0].h; ss++ ) {
- image.dp[0][fs+image.det->panels[0].w*ss] = 1000.0;
+ for ( fs=0; fs<image.detgeom->panels[0].w; fs++ ) {
+ for ( ss=0; ss<image.detgeom->panels[0].h; ss++ ) {
+ image.dp[0][fs+image.detgeom->panels[0].w*ss] = 1000.0;
if ( (fs-64)*(fs-64) + (ss-64)*(ss-64) > 9*9 ) continue;
- image.dp[0][fs+image.det->panels[0].w*ss] += 1000.0;
+ image.dp[0][fs+image.detgeom->panels[0].w*ss] += 1000.0;
npx++;
}
}
- r = integrate_peak(&image, 64, 64, &image.det->panels[0],
+ r = integrate_peak(&image, 64, 64, 0,
&fsp, &ssp, &intensity, &sigma,
10.0, 15.0, 17.0, NULL);
if ( r ) {
@@ -315,9 +309,7 @@ int main(int argc, char *argv[])
}
- free(image.beam);
- free(image.det->panels);
- free(image.det);
+ detgeom_free(image.detgeom);
free(image.dp[0]);
free(image.dp);
gsl_rng_free(rng);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 23:43:56 +0000