aboutsummaryrefslogtreecommitdiff
path: root/src/refine.c
diff options
context:
space:
mode:
authortaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2008-05-02 16:33:52 +0000
committertaw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1>2008-05-02 16:33:52 +0000
commitdadacff0823b881b687e48312aafa5351d4818e0 (patch)
tree16cf0b0c0e87e7889dbc5fdf464094a100a62515 /src/refine.c
parent8bf9a47ec32431e9600926547b98473a17d15b9a (diff)
More testing
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@281 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/refine.c')
-rw-r--r--src/refine.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/refine.c b/src/refine.c
index d0fc8cc..b3ac84a 100644
--- a/src/refine.c
+++ b/src/refine.c
@@ -212,7 +212,7 @@ static void refine_simplex_contract(SimplexVertex *s, int v, int v_best) {
s[v].dcx = s[v_best].dcx + 0.5 * (s[v].dcx - s[v_best].dcx);
s[v].dcy = s[v_best].dcy + 0.5 * (s[v].dcy - s[v_best].dcy);
s[v].dcz = s[v_best].dcz + 0.5 * (s[v].dcz - s[v_best].dcz);
-
+
}
static double refine_iteration(SimplexVertex *s, Deviation *d, int nf) {
@@ -326,7 +326,7 @@ double refine_do_cell(ControlContext *ctx) {
Deviation *d;
double delta;
int i, nf, f, it, maxiter;
- const double tol = 0.0001e9; /* Stopping condition */
+ const double tol = 0.00001e9; /* Stopping condition */
//const double tol = 0.001; /* For testing */
if ( !ctx->cell_lattice ) {
@@ -342,6 +342,7 @@ double refine_do_cell(ControlContext *ctx) {
/* Determine the size of the 'deviation table' */
nf = 0;
for ( i=0; i<ctx->images->n_images; i++ ) {
+
int j;
if ( !ctx->images->images[i].rflist ) {
@@ -352,6 +353,8 @@ double refine_do_cell(ControlContext *ctx) {
if ( ctx->images->images[i].rflist->features[j].partner != NULL ) nf++;
}
+ printf("%i features from image %i\n", nf, i);
+
}
if ( REFINE_DEBUG ) printf("RF: There are %i partnered features in total\n", nf);