diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-19 16:25:08 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-19 16:25:08 +0000 |
| commit | 45864cb5113ec4dde6afe1d23ea53f75402b9ece (patch) | |
| tree | b3d4dad81bcfa34037cb067e1356303b32401df1 /src/itrans-stat.c | |
| parent | 7c4c25f2eda4f0a0780cf2edb087452ceb63f226 (diff) | |
Refactor image handling code
Remove itrans-lsq
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@158 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/itrans-stat.c')
| -rw-r--r-- | src/itrans-stat.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/itrans-stat.c b/src/itrans-stat.c index 21cf415..e08bd26 100644 --- a/src/itrans-stat.c +++ b/src/itrans-stat.c @@ -500,7 +500,7 @@ static gsl_matrix *itrans_peaksearch_stat_iterate(gsl_matrix *m, unsigned int *c } -unsigned int itrans_peaksearch_stat(ImageRecord *imagerecord, ControlContext *ctx) { +ImageFeatureList *itrans_peaksearch_stat(ImageRecord *imagerecord) { unsigned int n_reflections; gsl_matrix *m; @@ -508,6 +508,9 @@ unsigned int itrans_peaksearch_stat(ImageRecord *imagerecord, ControlContext *ct int i; double px,py; uint16_t *image = imagerecord->image; + ImageFeatureList *flist; + + flist = image_feature_list_new(); m = itrans_peaksearch_stat_createImageMatrix(image, imagerecord->width, imagerecord->height); p = itrans_peaksearch_stat_iterate(m, &n_reflections); @@ -516,13 +519,14 @@ unsigned int itrans_peaksearch_stat(ImageRecord *imagerecord, ControlContext *ct px = gsl_matrix_get(p,0,i); py = gsl_matrix_get(p,1,i); - reflection_add_from_dp(ctx, (px-imagerecord->x_centre), (py-imagerecord->y_centre), imagerecord, 1.0); + image_add_feature(flist, (px-imagerecord->x_centre), (py-imagerecord->y_centre), imagerecord, 1.0); } + gsl_matrix_free(m); gsl_matrix_free(p); - return n_reflections; + return flist; } |