diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-09-28 23:58:28 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-09-28 23:58:28 +0000 |
| commit | 9e7d459d47907accbc496f2f1c4c74f131086873 (patch) | |
| tree | c5a0a7a472929f7003bc3e5ebd8ec30581424648 /src/reproject.c | |
| parent | 555bc4f60c845bf47aee94e4b7963382838c9f57 (diff) | |
s/reflectioncontext/reflectionlist/
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@137 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/reproject.c')
| -rw-r--r-- | src/reproject.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/reproject.c b/src/reproject.c index ed359fc..38f15ff 100644 --- a/src/reproject.c +++ b/src/reproject.c @@ -18,7 +18,7 @@ #define MAX_IMAGE_REFLECTIONS 8*1024 -ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, ReflectionContext *rctx, ControlContext *ctx) { +ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, ReflectionList *reflectionlist, ControlContext *ctx) { ImageReflection *refl; Reflection *reflection; @@ -42,7 +42,7 @@ ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, Reflect kx = nx / image.lambda; ky = ny / image.lambda; kz = nz / image.lambda; /* This is the centre of the Ewald sphere */ - //reflection_add(ctx->reflectionctx, kx, ky, kz, 1, REFLECTION_VECTOR_MARKER_1); + //reflection_add(ctx->reflectionlist, kx, ky, kz, 1, REFLECTION_VECTOR_MARKER_1); /* Determine where "up" is * See above. */ @@ -50,10 +50,10 @@ ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, Reflect ux = uxt; uy = cos(tilt)*uyt + sin(tilt)*uzt; uz = -sin(tilt)*uyt + cos(tilt)*uzt; uxt = ux; uyt = uy; uzt = uz; ux = uxt*cos(-omega) + uyt*-sin(omega); uy = -uxt*sin(omega) + uyt*cos(omega); uz = uzt; - //reflection_add(ctx->reflectionctx, ux*50e9, uy*50e9, uz*50e9, 1, REFLECTION_VECTOR_MARKER_2); + //reflection_add(ctx->reflectionlist, ux*50e9, uy*50e9, uz*50e9, 1, REFLECTION_VECTOR_MARKER_2); refl = malloc(MAX_IMAGE_REFLECTIONS*sizeof(ImageReflection)); - reflection = rctx->reflections; + reflection = reflectionlist->reflections; i = 0; do { @@ -99,8 +99,8 @@ ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, Reflect double psi, disc; - //reflection_add(ctx->reflectionctx, xl, yl, zl, 1, REFLECTION_GENERATED); - //reflection_add(ctx->reflectionctx, xi, yi, zi, 1, REFLECTION_MARKER); + //reflection_add(ctx->reflectionlist, xl, yl, zl, 1, REFLECTION_GENERATED); + //reflection_add(ctx->reflectionlist, xi, yi, zi, 1, REFLECTION_MARKER); /* Calculate azimuth of point in image (clockwise from "up", will be changed later) */ cx = yi*nz-zi*ny; cy = nx*zi-nz*xi; cz = ny*xi-nx*yi; /* c = i x n */ @@ -110,9 +110,9 @@ ImageReflection *reproject_get_reflections(ImageRecord image, size_t *n, Reflect rx = cy*nz-cz*ny; ry = nx*cz-nz*cx; rz = ny*cx-nx*cy; /* r = [i x n] x n */ disc = angle_between(rx, ry, rz, ux, uy, uz); // if ( (i==20) && !done_debug ) { - // reflection_add(ctx->reflectionctx, xi, yi, zi, 1, REFLECTION_VECTOR_MARKER_3); - // reflection_add(ctx->reflectionctx, cx, cy, cz, 1, REFLECTION_VECTOR_MARKER_4); - // reflection_add(ctx->reflectionctx, rx, ry, rz, 1, REFLECTION_VECTOR_MARKER_4); + // reflection_add(ctx->reflectionlist, xi, yi, zi, 1, REFLECTION_VECTOR_MARKER_3); + // reflection_add(ctx->reflectionlist, cx, cy, cz, 1, REFLECTION_VECTOR_MARKER_4); + // reflection_add(ctx->reflectionlist, rx, ry, rz, 1, REFLECTION_VECTOR_MARKER_4); // printf("psi=%f deg, disc=%f deg\n", rad2deg(psi), rad2deg(disc)); // } if ( (psi >= M_PI_2) && (disc >= M_PI_2) ) { |