diff options
| author | Thomas White <taw@physics.org> | 2014-09-11 10:34:21 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-09-11 10:34:21 +0200 |
| commit | 8d6f4e740f669fca4fa580bdfa9e6809bf28aaaa (patch) | |
| tree | c5a5980fbcb57fcd68d20ba44f22868c5fe1cb94 /libcrystfel | |
| parent | f4fae5c2b602c51fa3b4e37d7ab84a405d9a997b (diff) | |
Tidy up a bit
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/stream.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 66e8a179..04627a0c 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -140,10 +140,9 @@ static int read_peaks_2_3(FILE *fh, struct image *image) if ( r == 5 ) { - p = find_panel_by_name(image->det, pn); if ( p == NULL ) { - ERROR("Panel not found: %s\n"); + ERROR("Panel not found: %s\n", pn); return 1; } @@ -153,11 +152,8 @@ static int read_peaks_2_3(FILE *fh, struct image *image) image_add_feature(image->features, add_x, add_y, image, intensity, NULL); - printf("Here4\n"); - } - } while ( rval != NULL ); /* Got read error of some kind before finding PEAK_LIST_END_MARKER */ @@ -253,7 +249,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 %s %f %i %f %f %s", - &h, &k, &l, &intensity, phs, &sigma, &cts, &fs, &ss, pn); + &h, &k, &l, &intensity, phs, &sigma, &cts, + &fs, &ss, pn); if ( (r != 10) && (!first) ) { reflist_free(out); return NULL; |