aboutsummaryrefslogtreecommitdiff
path: root/src/merge.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge.h')
-rw-r--r--src/merge.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/merge.h b/src/merge.h
index 1911584f..b33afdea 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -40,7 +40,12 @@
#include "geometry.h"
extern RefList *merge_intensities(Crystal **crystals, int n, int n_threads,
- PartialityModel pmodel, int min_meas,
- double push_res, int use_weak);
+ int min_meas, double push_res, int use_weak);
+
+extern double residual(Crystal *cr, const RefList *full, int free,
+ int *pn_used, const char *filename);
+
+extern double log_residual(Crystal *cr, const RefList *full, int free,
+ int *pn_used, const char *filename);
#endif /* MERGE */