aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-03-03 16:33:49 +0100
committerThomas White <taw@physics.org>2014-03-03 16:33:49 +0100
commitfe5bde1c898298b72873874b8b2843303b37bff6 (patch)
tree03afd0400417426a5b544b83bb16ad5b95850d07
parent3482c52093c8bbbfc60bfd900c1c78ec7d72d019 (diff)
Swap peak,bg and fs,ss to keep fs,ss in the same place
-rw-r--r--libcrystfel/src/stream.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c
index b204f9a9..db8a4f72 100644
--- a/libcrystfel/src/stream.c
+++ b/libcrystfel/src/stream.c
@@ -156,7 +156,7 @@ static RefList *read_stream_reflections(FILE *fh)
if ( strcmp(line, REFLECTION_END_MARKER) == 0 ) return out;
r = sscanf(line, "%i %i %i %f %f %f %f %f %f",
- &h, &k, &l, &intensity, &sigma, &fs, &ss, &pk, &bg);
+ &h, &k, &l, &intensity, &sigma, &pk, &bg, &fs, &ss);
if ( (r != 9) && (!first) ) {
reflist_free(out);
return NULL;
@@ -187,8 +187,8 @@ static void write_stream_reflections(FILE *fh, RefList *list)
Reflection *refl;
RefListIterator *iter;
- fprintf(fh, " h k l I sigma(I) fs/px ss/px"
- " peak background\n");
+ fprintf(fh, " h k l I sigma(I) peak background"
+ " fs/px ss/px\n");
for ( refl = first_refl(list, &iter);
refl != NULL;
@@ -210,8 +210,8 @@ static void write_stream_reflections(FILE *fh, RefList *list)
if ( get_redundancy(refl) == 0 ) continue;
fprintf(fh,
- "%4i %4i %4i %10.2f %10.2f %6.1f %6.1f %10.2f %10.2f\n",
- h, k, l, intensity, esd_i, fs, ss, pk, bg);
+ "%4i %4i %4i %10.2f %10.2f %10.2f %10.2f %6.1f %6.1f\n",
+ h, k, l, intensity, esd_i, pk, bg, fs, ss);
}