aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-05-11 14:16:01 +0200
committerThomas White <taw@physics.org>2012-02-22 15:27:26 +0100
commitdaff801125be1682eb4957ac0579b34a237c7b40 (patch)
treeafd21074d26b4b2c5b01b14d1ff3da2d02258f02
parentad1e432cc4c172dd8335ba02f8a2688e2cdb0a0e (diff)
Formatting
-rw-r--r--src/geometry.c4
-rw-r--r--src/peaks.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/geometry.c b/src/geometry.c
index 1e61c26d..ed24e9a7 100644
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -284,8 +284,8 @@ double integrate_all(struct image *image, RefList *reflections)
double xp, yp;
get_detector_pos(refl, &xp, &yp);
- if ( integrate_peak(image, xp, yp, &x, &y,
- &intensity, NULL, NULL, NULL, 0, 0) ) continue;
+ if ( integrate_peak(image, xp, yp, &x, &y, &intensity, NULL,
+ NULL, NULL, 0, 0) ) continue;
itot += intensity;
}
diff --git a/src/peaks.c b/src/peaks.c
index 7db2ccc9..efe50b9b 100644
--- a/src/peaks.c
+++ b/src/peaks.c
@@ -380,7 +380,8 @@ static void search_peaks_in_panel(struct image *image, float threshold,
* Don't bother doing polarisation/SA correction, because the
* intensity of this peak is only an estimate at this stage. */
r = integrate_peak(image, mask_fs, mask_ss,
- &f_fs, &f_ss, &intensity, NULL, NULL, NULL, 0, 1);
+ &f_fs, &f_ss, &intensity,
+ NULL, NULL, NULL, 0, 1);
if ( r ) {
/* Bad region - don't detect peak */
nrej_bad++;
@@ -640,7 +641,7 @@ void integrate_reflections(struct image *image, int polar, int use_closer)
/* Record intensity and set redundancy to 1 on success */
if ( r == 0 ) {
set_int(refl, intensity);
- set_esd_intensity(refl,sigma);
+ set_esd_intensity(refl, sigma);
set_redundancy(refl, 1);
}