aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-08-14 17:11:28 +0200
committerThomas White <taw@physics.org>2013-09-13 14:31:23 +0200
commitf56ec1433c41a23fd2f476069876477961bfc0c6 (patch)
treea52987888e58aa349977c115cc46c5e7e68d948b /src
parent40add33252890583d20cc79e0e604e470cf2600b (diff)
Debugging/verbosity tweaks
Diffstat (limited to 'src')
-rw-r--r--src/post-refinement.c12
-rw-r--r--src/post-refinement.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/post-refinement.c b/src/post-refinement.c
index 88c609c1..05e1829a 100644
--- a/src/post-refinement.c
+++ b/src/post-refinement.c
@@ -351,8 +351,6 @@ static int check_eigen(gsl_matrix *M, gsl_vector *e_val, int verbose)
if ( verbose ) {
STATUS("Condition number: %e / %e = %5.2f\n",
vmax, vmin, vmax/vmin);
-
-
STATUS("%i out of %i eigenvalues filtered.\n", n_filt, n);
}
@@ -463,7 +461,7 @@ static double pr_iterate(Crystal *cr, const RefList *full,
RefList *reflections;
double max_shift;
int nref = 0;
- const int verbose = 1;
+ const int verbose = 0;
reflections = crystal_get_reflections(cr);
@@ -483,7 +481,6 @@ static double pr_iterate(Crystal *cr, const RefList *full,
double p, l;
Reflection *match;
double gradients[NUM_PARAMS];
- const double osf = crystal_get_osf(cr);
if ( !get_refinable(refl) ) continue;
@@ -498,7 +495,7 @@ static double pr_iterate(Crystal *cr, const RefList *full,
I_full = get_intensity(match);
/* Actual measurement of this reflection from this pattern? */
- I_partial = osf * get_intensity(refl);
+ I_partial = get_intensity(refl) * crystal_get_osf(cr);
p = get_partiality(refl);
l = get_lorentz(refl);
@@ -545,7 +542,10 @@ static double pr_iterate(Crystal *cr, const RefList *full,
nref++;
}
- if ( verbose ) show_matrix_eqn(M, v);
+ if ( verbose ) {
+ STATUS("The original equation:\n");
+ show_matrix_eqn(M, v);
+ }
//STATUS("%i reflections went into the equations.\n", nref);
if ( nref == 0 ) {
diff --git a/src/post-refinement.h b/src/post-refinement.h
index 63b6ff66..b964975e 100644
--- a/src/post-refinement.h
+++ b/src/post-refinement.h
@@ -56,8 +56,8 @@ enum {
REF_CSX,
REF_CSY,
REF_CSZ,
- REF_DIV,
NUM_PARAMS,
+ REF_DIV,
REF_R,
};