diff options
author | Thomas White <taw@physics.org> | 2020-06-08 14:24:40 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:44 +0200 |
commit | 0cf65bb0dc64e83cfce994bfd3fda5f4326ea04d (patch) | |
tree | 4bc43ac385d0875e7ed01860fc8eae6a652b526d /libcrystfel/src | |
parent | e38424f169d4d89a433f96094de551350e80c641 (diff) |
Remove old in_bad_region_dtempl
Diffstat (limited to 'libcrystfel/src')
-rw-r--r-- | libcrystfel/src/image.c | 59 |
1 files changed, 2 insertions, 57 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index ca9d7028..9712c7a6 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -398,63 +398,8 @@ static void create_detgeom(struct image *image, DataTemplate *dtempl) /* FIXME: Units for wavelength/photon energy in DataTemplate */ image->lambda = ph_eV_to_lambda(get_value(image, dtempl->wavelength_from)); image->detgeom = detgeom; - /* FIXME: spectrum */ -} - - -/* Return non-zero if pixel fs,ss on panel p is in a bad region - * as specified in the geometry file (regions only, not including - * masks, NaN/inf, no_index etc */ -static int in_bad_region_dtempl(DataTemplate *dtempl, - struct panel_template *p, - double fs, double ss) -{ - double rx, ry; - double xs, ys; - int i; - - /* Convert xs and ys, which are in fast scan/slow scan coordinates, - * to x and y */ - xs = fs*p->fsx + ss*p->ssx; - ys = fs*p->fsy + ss*p->ssy; - - rx = xs + p->cnx; - ry = ys + p->cny; - - for ( i=0; i<dtempl->n_bad; i++ ) { - - struct dt_badregion *b = &dtempl->bad[i]; - - if ( (b->panel != NULL) - && (strcmp(b->panel, p->name) != 0) ) continue; - - if ( b->is_fsss ) { - int nfs, nss; - - /* fs/ss bad regions are specified according - * to the original coordinates */ - nfs = fs + p->orig_min_fs; - nss = ss + p->orig_min_ss; - - if ( nfs < b->min_fs ) continue; - if ( nfs > b->max_fs ) continue; - if ( nss < b->min_ss ) continue; - if ( nss > b->max_ss ) continue; - - } else { - - if ( rx < b->min_x ) continue; - if ( rx > b->max_x ) continue; - if ( ry < b->min_y ) continue; - if ( ry > b->max_y ) continue; - - } - - return 1; - } - - return 0; + /* FIXME: spectrum */ } @@ -520,7 +465,7 @@ struct image *image_read(DataTemplate *dtempl, const char *filename, int fs, ss; for ( fs=0; fs<p_w; fs++ ) { for ( ss=0; ss<p_h; ss++ ) { - if ( in_bad_region_dtempl(dtempl, p, fs, ss) + if ( data_template_in_bad_region(dtempl, i, fs, ss) || isnan(image->dp[i][fs+ss*p_w]) || isinf(image->dp[i][fs+ss*p_w]) ) { |