diff options
author | Thomas White <taw@physics.org> | 2014-10-24 16:51:51 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2014-10-24 17:05:19 +0200 |
commit | 8ca1b8127f53088e04a046a93d10a07d2dc5e2d0 (patch) | |
tree | bbc8d9966a3b9c8670d21076af8dd4f46f674efd /libcrystfel/src/stream.c | |
parent | 3ad117acb65ac707acc11ac32a50e6755203d590 (diff) |
Fix/clarify peak coordinates for rearranged panels
Diffstat (limited to 'libcrystfel/src/stream.c')
-rw-r--r-- | libcrystfel/src/stream.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index cb152088..cf891f96 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -210,12 +210,15 @@ static void write_peaks_2_3(struct image *image, FILE *ofh) r = get_q(image, f->fs, f->ss, NULL, 1.0/image->lambda); q = modulus(r.u, r.v, r.w); - p = find_panel(image->det,f->fs,f->ss); - write_fs = f->fs-p->min_fs+p->orig_min_fs; - write_ss = f->ss-p->min_ss+p->orig_min_ss; + p = find_panel(image->det, f->fs, f->ss); + + /* Convert coordinates to match arrangement of panels in HDF5 + * file */ + write_fs = f->fs - p->min_fs + p->orig_min_fs; + write_ss = f->ss - p->min_ss + p->orig_min_ss; fprintf(ofh, "%7.2f %7.2f %10.2f %10.2f %s\n", - write_fs, write_ss, q/1.0e9, f->intensity, p->name); + write_fs, write_ss, q/1.0e9, f->intensity, p->name); } |