diff options
| author | Thomas White <taw@physics.org> | 2014-11-10 19:09:49 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-11-10 19:09:49 +0100 |
| commit | 35ab2f314a551568ca2db485bba1199bb67148f5 (patch) | |
| tree | eb466c8a46935307a15bcbd1ca3fd065a7bb3357 /libcrystfel/src | |
| parent | e3135a2154b1aa1c137664030972a09e50b7f1d8 (diff) | |
Fussiness
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/detector.c | 20 | ||||
| -rw-r--r-- | libcrystfel/src/detector.h | 3 | ||||
| -rw-r--r-- | libcrystfel/src/stream.c | 3 |
3 files changed, 17 insertions, 9 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 39a84b6c..f220d755 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -1604,10 +1604,10 @@ void get_pixel_extents(struct detector *det, } -int write_detector_geometry(const char* geometry_filename, +int write_detector_geometry(const char *geometry_filename, const char *output_filename, struct detector *det) { - FILE *ifh; + FILE *ifh; FILE *fh; if ( geometry_filename == NULL ) return 2; @@ -1641,13 +1641,21 @@ int write_detector_geometry(const char* geometry_filename, p = find_panel_by_name(det, bits[0]); if ( strncmp(bits[1], "fs = ", 5) == 0) { - fprintf(fh, "%s/fs = %+fx %+fy\n", p->name, p->fsx, p->fsy); + fprintf(fh, "%s/fs = %+fx %+fy\n", + p->name, p->fsx, p->fsy); + } else if ( strncmp(bits[1], "ss = ", 5) == 0) { - fprintf(fh, "%s/ss = %+fx %+fy\n", p->name, p->ssx, p->ssy); + fprintf(fh, "%s/ss = %+fx %+fy\n", + p->name, p->ssx, p->ssy); + } else if ( strncmp(bits[1], "corner_x = ", 11) == 0) { - fprintf(fh, "%s/corner_x = %g\n", p->name, p->cnx); + fprintf(fh, "%s/corner_x = %g\n", + p->name, p->cnx); + } else if ( strncmp(bits[1], "corner_y = ", 11) == 0) { - fprintf(fh, "%s/corner_y = %g\n", p->name, p->cny); + fprintf(fh, "%s/corner_y = %g\n", + p->name, p->cny); + } else { fputs(line, fh); } diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h index 2cec61c2..9db695d9 100644 --- a/libcrystfel/src/detector.h +++ b/libcrystfel/src/detector.h @@ -222,7 +222,8 @@ extern double smallest_q(struct image *image); extern struct panel *find_panel_by_name(struct detector *det, const char *name); extern int write_detector_geometry(const char* geometry_filename, - const char *output_filename, struct detector *det); + const char *output_filename, + struct detector *det); extern void mark_resolution_range_as_bad(struct image *image, diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 988570bc..dfa1bebe 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -266,12 +266,11 @@ static RefList *read_stream_reflections_2_3(FILE *fh, struct detector *det) double ph; char *v; struct panel *p; - float write_fs = 0; - float write_ss = 0; refl = add_refl(out, h, k, l); set_intensity(refl, intensity); if ( det != NULL ) { + double write_fs, write_ss; p = find_panel_by_name(det,pn); write_fs = fs - p->orig_min_fs + p->min_fs; write_ss = ss - p->orig_min_ss + p->min_ss; |