aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-11-19 11:11:25 +0100
committerThomas White <taw@physics.org>2014-11-21 16:48:47 +0100
commit698402c50ee46bae40d0761c8fe1f3f6176e3041 (patch)
tree6005425f67cf9a7940eed42aa001e8ece10e5c5a /libcrystfel/src
parent1cd2c211e10df4befab71a41e781d12bee25c23a (diff)
Formatting, and fix a comment
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/stream.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c
index 27b1abc1..2d4d6260 100644
--- a/libcrystfel/src/stream.c
+++ b/libcrystfel/src/stream.c
@@ -97,7 +97,7 @@ static int read_peaks(FILE *fh, struct image *image)
first = 0;
if ( r == 4 ) {
image_add_feature(image->features, x, y,
- image, intensity, NULL);
+ image, intensity, NULL);
}
} while ( rval != NULL );
@@ -250,7 +250,8 @@ static RefList *read_stream_reflections_2_3(FILE *fh, struct detector *det)
if ( strcmp(line, REFLECTION_END_MARKER) == 0 ) return out;
r = sscanf(line, "%i %i %i %f %f %f %f %f %f %s",
- &h, &k, &l, &intensity, &sigma, &pk, &bg, &fs, &ss, pn);
+ &h, &k, &l, &intensity, &sigma, &pk, &bg,
+ &fs, &ss, pn);
if ( (r != 10) && (!first) ) {
reflist_free(out);
@@ -384,7 +385,7 @@ static RefList *read_stream_reflections_2_2(FILE *fh)
} while ( rval != NULL );
- /* Got read error of some kind before finding PEAK_LIST_END_MARKER */
+ /* Got read error of some kind before finding REFLECTION_END_MARKER */
return NULL;
}