aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-11-22 10:52:56 +0100
committerThomas White <taw@physics.org>2018-11-22 13:17:05 +0100
commit7a5c4bf8792a3d7aaaa72b37fb683c22134f3a39 (patch)
treed040d35ab42a08e71205dbe5e53c1ce0f065862e
parent7c841071a20020e0dcdeee8460bcc7b2d09ec6e8 (diff)
Rename prediction refinement residual function
Because there's another function with this name in merge.c
-rw-r--r--libcrystfel/src/predict-refine.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libcrystfel/src/predict-refine.c b/libcrystfel/src/predict-refine.c
index cccd5d0b..6b151d48 100644
--- a/libcrystfel/src/predict-refine.c
+++ b/libcrystfel/src/predict-refine.c
@@ -548,7 +548,7 @@ static int iterate(struct reflpeak *rps, int n, UnitCell *cell,
}
-static double residual(struct reflpeak *rps, int n, struct detector *det)
+static double pred_residual(struct reflpeak *rps, int n, struct detector *det)
{
int i;
double res = 0.0;
@@ -629,7 +629,7 @@ int refine_prediction(struct image *image, Crystal *cr)
rps[i].Ih = rps[i].peak->intensity / max_I;
}
- //STATUS("Initial residual = %e\n", residual(rps, n, image->det));
+ //STATUS("Initial residual = %e\n", pred_residual(rps, n, image->det));
/* Refine */
for ( i=0; i<MAX_CYCLES; i++ ) {
@@ -637,12 +637,12 @@ int refine_prediction(struct image *image, Crystal *cr)
if ( iterate(rps, n, crystal_get_cell(cr), image,
&total_x, &total_y, &total_z) ) return 1;
//STATUS("Residual after %i = %e\n", i,
- // residual(rps, n, image->det));
+ // pred_residual(rps, n, image->det));
}
- //STATUS("Final residual = %e\n", residual(rps, n, image->det));
+ //STATUS("Final residual = %e\n", pred_residual(rps, n, image->det));
snprintf(tmp, 255, "predict_refine/final_residual = %e",
- residual(rps, n, image->det));
+ pred_residual(rps, n, image->det));
crystal_add_notes(cr, tmp);
crystal_set_det_shift(cr, total_x, total_y);