diff options
author | Thomas White <taw27@cam.ac.uk> | 2008-10-15 18:38:51 +0100 |
---|---|---|
committer | Thomas White <taw27@cam.ac.uk> | 2008-10-15 18:38:51 +0100 |
commit | 02d7823efcd3f1b4c4b413d849d85b24d11645a1 (patch) | |
tree | 23cd843c8ac31d975d608904ad2198e8463144f8 | |
parent | 363d209ab72bd42d401d86ce9137f9392f4b8e19 (diff) |
Tidy up and actually remove debugging stuff from reproject.c
-rw-r--r-- | src/reproject.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/reproject.c b/src/reproject.c index e145186..c594bab 100644 --- a/src/reproject.c +++ b/src/reproject.c @@ -33,7 +33,8 @@ void reproject_partner_features(ImageFeatureList *rflist, ImageRecord *image) { ImageFeature *partner; int idx; - partner = image_feature_closest(image->features, rflist->features[i].x, rflist->features[i].y, &d, &idx); + partner = image_feature_closest(image->features, rflist->features[i].x, rflist->features[i].y, + &d, &idx); if ( (d <= 20.0) && partner ) { rflist->features[i].partner = partner; @@ -67,11 +68,9 @@ ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList * kx = nx / image->lambda; ky = ny / image->lambda; kz = nz / image->lambda; /* This is the centre of the Ewald sphere */ - reflection_add(ctx->reflectionlist, kx, ky, kz, 1, REFLECTION_VECTOR_MARKER_1); /* Determine where "up" is */ mapping_rotate(0.0, 1.0, 0.0, &ux, &uy, &uz, omega, tilt); - reflection_add(ctx->reflectionlist, ux*50e9, uy*50e9, uz*50e9, 1, REFLECTION_VECTOR_MARKER_2); /* Determine where "right" is */ mapping_rotate(1.0, 0.0, 0.0, &rx, &ry, &rz, omega, tilt); @@ -136,7 +135,7 @@ ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList * x /= image->pixel_size; y /= image->pixel_size; } else { - fprintf(stderr, "Unrecognised formulation mode in reproject_get_reflections()\n"); + fprintf(stderr, "Unrecognised formulation mode in reproject_get_reflections\n"); return NULL; } @@ -146,13 +145,13 @@ ImageFeatureList *reproject_get_reflections(ImageRecord *image, ReflectionList * /* Sanity check */ if ( (x>=0) && (x<image->width) && (y>=0) && (y<image->height) ) { - /* Record the reflection */ - image_add_feature_reflection(flist, x, y, image, reflection->intensity, reflection); - /* Intensity should be multiplied by relrod spike function except - * reprojected reflections aren't used quantitatively for anything */ + /* Record the reflection + * Intensity should be multiplied by relrod spike function except + * reprojected reflections aren't used quantitatively for anything + */ + image_add_feature_reflection(flist, x, y, image, + reflection->intensity, reflection); - //printf("Reflection at %f, %f\n", x, y); - } /* else it's outside the picture somewhere */ } /* else this is the central beam so don't worry about it */ |