aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/partialator.c4
-rw-r--r--src/post-refinement.c16
-rw-r--r--src/post-refinement.h2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/partialator.c b/src/partialator.c
index fc3f86c2..0f3bd104 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -717,8 +717,8 @@ static void all_residuals(Crystal **crystals, int n_crystals, RefList *full,
if ( crystal_get_user_flag(crystals[i]) ) continue;
- r = residual(crystals[i], full, 0, NULL, NULL, 1);
- free_r = residual(crystals[i], full, 1, NULL, NULL, 1);
+ r = residual(crystals[i], full, 0, NULL, NULL);
+ free_r = residual(crystals[i], full, 1, NULL, NULL);
log_r = log_residual(crystals[i], full, 0, NULL, NULL);
free_log_r = log_residual(crystals[i], full, 1, NULL, NULL);
diff --git a/src/post-refinement.c b/src/post-refinement.c
index 79ea187a..f260da7f 100644
--- a/src/post-refinement.c
+++ b/src/post-refinement.c
@@ -84,7 +84,7 @@ const char *str_prflag(enum prflag flag)
double residual(Crystal *cr, const RefList *full, int free,
- int *pn_used, const char *filename, int complain)
+ int *pn_used, const char *filename)
{
Reflection *refl;
RefListIterator *iter;
@@ -349,7 +349,7 @@ static double residual_f(const gsl_vector *v, void *pp)
update_predictions(cr);
calculate_partialities(cr, PMODEL_XSPHERE);
- res = residual(cr, pv->full, 0, NULL, NULL, 0);
+ res = residual(cr, pv->full, 0, NULL, NULL);
cell_free(crystal_get_cell(cr));
reflist_free(crystal_get_reflections(cr));
@@ -474,7 +474,7 @@ void try_reindex(Crystal *crin, const RefList *full,
if ( sym == NULL || amb == NULL ) return;
- residual_original = residual(crin, full, 0, NULL, NULL, 0);
+ residual_original = residual(crin, full, 0, NULL, NULL);
cr = crystal_copy(crin);
@@ -494,7 +494,7 @@ void try_reindex(Crystal *crin, const RefList *full,
update_predictions(cr);
calculate_partialities(cr, PMODEL_XSPHERE);
- residual_flipped = residual(cr, full, 0, NULL, NULL, 1);
+ residual_flipped = residual(cr, full, 0, NULL, NULL);
if ( residual_flipped < residual_original ) {
crystal_set_cell(crin, cell);
@@ -774,8 +774,8 @@ static void do_pr_refine(Crystal *cr, const RefList *full,
try_reindex(cr, full, sym, amb);
- residual_start = residual(cr, full, 0, NULL, NULL, 0);
- residual_free_start = residual(cr, full, 1, NULL, NULL, 0);
+ residual_start = residual(cr, full, 0, NULL, NULL);
+ residual_free_start = residual(cr, full, 1, NULL, NULL);
if ( verbose ) {
STATUS("\nPR initial: dev = %10.5e, free dev = %10.5e\n",
@@ -911,8 +911,8 @@ static void do_pr_refine(Crystal *cr, const RefList *full,
STATUS("After applying final shifts:\n");
STATUS("PR final: dev = %10.5e, free dev = %10.5e\n",
- residual(cr, full, 0, NULL, NULL, 0),
- residual(cr, full, 1, NULL, NULL, 0));
+ residual(cr, full, 0, NULL, NULL),
+ residual(cr, full, 1, NULL, NULL));
STATUS("Final R = %e m^-1\n", crystal_get_profile_radius(cr));
}
diff --git a/src/post-refinement.h b/src/post-refinement.h
index e2416a23..8c345729 100644
--- a/src/post-refinement.h
+++ b/src/post-refinement.h
@@ -74,7 +74,7 @@ extern double gradient(Crystal *cr, int k, Reflection *refl,
PartialityModel pmodel);
extern double residual(Crystal *cr, const RefList *full, int free,
- int *pn_used, const char *filename, int complain);
+ int *pn_used, const char *filename);
extern void write_test_logs(Crystal *crystal, const RefList *full,
signed int cycle, int serial);