aboutsummaryrefslogtreecommitdiff
path: root/src/stream.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-03-14 16:30:52 +0100
committerThomas White <taw@physics.org>2012-02-22 15:27:19 +0100
commit5bc39aff3711410f15107e4d5f47e607aa018fd7 (patch)
tree6eb23e83fda0b0e8d109ce28cce1b74edb34fc27 /src/stream.c
parent538f34504bc3e3327c50dac54ee6458e46072683 (diff)
Formatting and boilerplate
Diffstat (limited to 'src/stream.c')
-rw-r--r--src/stream.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/stream.c b/src/stream.c
index 0f776f35..dacc7d9a 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -1,9 +1,9 @@
/*
* stream.c
*
- * Indexed stream tools
+ * Stream tools
*
- * (c) 2006-2010 Thomas White <taw@physics.org>
+ * (c) 2006-2011 Thomas White <taw@physics.org>
*
* Part of CrystFEL - crystallography with a FEL
*
@@ -47,24 +47,28 @@ int parse_stream_flags(const char *a)
return -1;
}
ret |= STREAM_PIXELS;
+
} else if ( strcmp(flags[i], "integrated") == 0) {
if ( ret & STREAM_PIXELS ) {
exclusive("pixels", "integrated");
return -1;
}
ret |= STREAM_INTEGRATED;
+
} else if ( strcmp(flags[i], "peaks") == 0) {
if ( ret & STREAM_PEAKS_IF_INDEXED ) {
exclusive("peaks", "peaksifindexed");
return -1;
}
ret |= STREAM_PEAKS;
+
} else if ( strcmp(flags[i], "peaksifindexed") == 0) {
if ( ret & STREAM_PEAKS ) {
exclusive("peaks", "peaksifindexed");
return -1;
}
ret |= STREAM_PEAKS_IF_INDEXED;
+
} else {
ERROR("Unrecognised stream flag '%s'\n", flags[i]);
return 0;