From 5bc39aff3711410f15107e4d5f47e607aa018fd7 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 14 Mar 2011 16:30:52 +0100 Subject: Formatting and boilerplate --- src/stream.c | 8 ++++++-- src/stream.h | 4 ++-- 2 files changed, 8 insertions(+), 4 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 + * (c) 2006-2011 Thomas White * * 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; diff --git a/src/stream.h b/src/stream.h index 71ab4b79..3869e515 100644 --- a/src/stream.h +++ b/src/stream.h @@ -1,9 +1,9 @@ /* * stream.h * - * Indexed stream tools + * Stream tools * - * (c) 2006-2010 Thomas White + * (c) 2006-2011 Thomas White * * Part of CrystFEL - crystallography with a FEL * -- cgit v1.2.3