diff options
Diffstat (limited to 'src/dw-hdfsee.c')
| -rw-r--r-- | src/dw-hdfsee.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index a73b4abf..4dd04940 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -8,7 +8,7 @@ * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2013 Thomas White <taw@physics.org> + * 2009-2014 Thomas White <taw@physics.org> * 2014 Valerio Mariani * 2014 Takanori Nakane * 2012 Richard Kirian @@ -1017,7 +1017,6 @@ static void load_features_from_file(struct image *image, const char *filename) do { char line[1024]; float intensity, sigma, fs, ss; - float add_fs, add_ss; char phs[1024]; char pn[32]; int r; @@ -1029,24 +1028,28 @@ static void load_features_from_file(struct image *image, const char *filename) if ( rval == NULL ) continue; chomp(line); - /* Try long format (from stream) */ + /* Try long reflection format (from stream) */ r = sscanf(line, "%i %i %i %f %s %f %f %f %f %s", &h, &k, &l, &intensity, phs, &sigma, &cts, &fs, &ss, pn); if ( r == 10 ) { + char name[32]; snprintf(name, 31, "%i %i %i", h, k, l); - p = find_panel_by_name(image->det, pn); - add_fs = fs-p->orig_min_fs+p->min_fs; - add_ss = ss-p->orig_min_ss+p->min_ss; - image_add_feature(image->features, add_fs, add_ss, + /* Convert coordinates to match rearranged panels in + * memory */ + fs = fs-p->orig_min_fs+p->min_fs; + ss = ss-p->orig_min_ss+p->min_ss; + + image_add_feature(image->features, fs, ss, image, 1.0, strdup(name)); continue; } + /* Try long peak format from stream */ r = sscanf(line, "%f %f %f %f %s", &fs, &ss, &d, &intensity, pn); if ( r != 5 ) continue; @@ -1056,9 +1059,12 @@ static void load_features_from_file(struct image *image, const char *filename) ERROR("Unable to find panel %s\n", pn); } else { - add_fs = fs - p->orig_min_fs + p->min_fs; - add_ss = ss - p->orig_min_ss + p->min_ss; - image_add_feature(image->features, add_fs, add_ss, + /* Convert coordinates to match rearranged panels in + * memory */ + fs = fs - p->orig_min_fs + p->min_fs; + ss = ss - p->orig_min_ss + p->min_ss; + + image_add_feature(image->features, fs, ss, image, 1.0, "peak"); } |