diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-02 13:47:39 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-02 13:47:39 +0000 |
| commit | 49b0bf4c38f7b2ecdb25b138abc8aa5ff06267c4 (patch) | |
| tree | 012dfcf4fcdc04870b829483c6d7913cfff9ef32 /src/basis.c | |
| parent | b819cd1defe15f492cd313129832383bf37ca82b (diff) | |
DirAx stuff
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@139 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/basis.c')
| -rw-r--r-- | src/basis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/basis.c b/src/basis.c index 19004ee..8a282e3 100644 --- a/src/basis.c +++ b/src/basis.c @@ -87,7 +87,7 @@ static int basis_lfom(ControlContext *ctx, double vx, double vy, double vz) { Reflection *check; - check = reflection_find_nearest(ctx->reflectionlist, tcentre->x+vx*j, tcentre->y+vy*j, tcentre->z+vz*j); + check = reflectionlist_find_nearest(ctx->reflectionlist, tcentre->x+vx*j, tcentre->y+vy*j, tcentre->z+vz*j); if ( check && (distance3d(check->x, check->y, check->z, tcentre->x+vx*j, tcentre->y+vy*j, tcentre->z+vz*j) < tol) ) { lfom++; } @@ -135,14 +135,14 @@ static ReflectionList *basis_find_seeds(ControlContext *ctx) { z = z_temp; /* Find the point in the middle of the "wedge" */ - scale = reflection_largest_g(ctx->reflectionlist)/6; + scale = reflectionlist_largest_g(ctx->reflectionlist)/6; x *= scale; y *= scale; z *= scale; reflection_add(ctx->reflectionlist, x, y, z, 1.0, REFLECTION_VECTOR_MARKER_2); /* Find an "origin" reflection */ - centre = reflection_find_nearest(ctx->reflectionlist, x, y, z); + centre = reflectionlist_find_nearest(ctx->reflectionlist, x, y, z); if ( !centre ) return NULL; centre->found = 1; reflection_add(ctx->reflectionlist, centre->x, centre->y, centre->z, 1.0, REFLECTION_GENERATED); @@ -161,7 +161,7 @@ static ReflectionList *basis_find_seeds(ControlContext *ctx) { accept = 1; /* Find a "candidate vector" reflection */ - vector = reflection_find_nearest_longer_unknown(ctx->reflectionlist, centre->x, centre->y, centre->z, 1e9); /* 0.5 A^-1 */ + vector = reflectionlist_find_nearest_longer_unknown(ctx->reflectionlist, centre->x, centre->y, centre->z, 1e9); if ( !vector ) { printf("BS: Only found %i seeds\n", i); return seeds; @@ -174,7 +174,7 @@ static ReflectionList *basis_find_seeds(ControlContext *ctx) { vz = vector->z - centre->z; /* Proximity test: don't duplicate seeds */ - check = reflection_find_nearest(seeds, vx, vy, vz); + check = reflectionlist_find_nearest(seeds, vx, vy, vz); if ( check ) { if ( distance3d(vx, vy, vz, check->x, check->y, check->z) < 1e9 ) { /* Too close to another seed */ @@ -209,7 +209,7 @@ static Basis *basis_assemble_seeds(ReflectionList *seeds) { int i, j, b; ReflectionList *seeds_sorted; - seeds_sorted = reflection_sort_lfom(seeds); + seeds_sorted = reflectionlist_sort_lfom(seeds); basis = malloc(10*sizeof(Basis)); |