diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-08-13 12:47:02 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-08-13 12:47:02 +0000 |
| commit | 04667dc68a17a5a5bc12237cfc3462d9b628c350 (patch) | |
| tree | 725e042824f5331c0ef898b11c4568c7e832c9a2 | |
| parent | 87335ef7bc9016ea1e5386599932e28c1d8926f0 (diff) | |
Re-add commented mugwatches
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@287 bf6ca9ba-c028-0410-8290-897cf20841d1
| -rw-r--r-- | src/refine.c | 8 | ||||
| -rw-r--r-- | src/refinetest2d.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/refine.c b/src/refine.c index 5de8df3..987fba1 100644 --- a/src/refine.c +++ b/src/refine.c @@ -33,10 +33,10 @@ #define DISPFACTOR 1.0e9 /* Number of parameters */ -#define NUM_PARAMS 9 +#define NUM_PARAMS 4 /* Refine debug */ -#define REFINE_DEBUG 0 +#define REFINE_DEBUG 1 /* A simplex is an array of ten of these */ typedef struct { @@ -408,6 +408,8 @@ double refine_do_cell(ControlContext *ctx) { d[f].dy = dly; d[f].dz = dlz; + printf("Feature %3i: %8f %8f %8f\n", f, dlx/DISPFACTOR, dly/DISPFACTOR, dlz/DISPFACTOR); + f++; } @@ -432,7 +434,7 @@ double refine_do_cell(ControlContext *ctx) { memcpy(&s[9], &s[0], sizeof(SimplexVertex)); s[9].dcz = delta; /* Iterate */ - maxiter = 500; + maxiter = 5000; for ( it=0; it<maxiter; it++ ) { double conv; diff --git a/src/refinetest2d.c b/src/refinetest2d.c index ea4d206..03b65d6 100644 --- a/src/refinetest2d.c +++ b/src/refinetest2d.c @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) { ctx->x_centre = 256; ctx->y_centre = 256; ctx->pixel_size = 5e7; - image_add(ctx->images, NULL, 512, 512, deg2rad(0.0), ctx); + image_add(ctx->images, NULL, 512, 512, deg2rad(90.0), ctx); ctx->images->images[0].features = image_feature_list_new(); /* Fudge to avoid horrifying pointer-related death */ @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) { /* The "real" reflections */ reflections_real = reflection_list_from_cell(cell_real); ctx->images->images[0].features = reproject_get_reflections(&ctx->images->images[0], reflections_real); -// printf("RT: %i test features generated.\n", ctx->images->images[0].features->n_features); + printf("RT: %i test features generated.\n", ctx->images->images[0].features->n_features); /* The "model" cell to be refined */ ctx->cell = malloc(sizeof(Basis)); |