diff options
| author | Thomas White <taw@physics.org> | 2019-05-08 14:37:27 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-05-14 10:02:50 +0200 |
| commit | 636eb6116961296791bae35c40fd9438aa946827 (patch) | |
| tree | b195c2c1e897d7d4c778a60bd81bd231819f70a7 /libcrystfel/src/hdf5-file.c | |
| parent | 59770f9bffbd47de5b518244a6dfcfbdfc8dad09 (diff) | |
Remove image.num_peaks and num_saturated_peaks
These values were inconsistently set by different parts of the code,
e.g. different peak search methods. num_saturated_peaks was even set
during final integration. Now, the peak count is taken from the
ImageFeatureList, so it's authoritative.
Diffstat (limited to 'libcrystfel/src/hdf5-file.c')
| -rw-r--r-- | libcrystfel/src/hdf5-file.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c index 7aa8165d..ff96adb1 100644 --- a/libcrystfel/src/hdf5-file.c +++ b/libcrystfel/src/hdf5-file.c @@ -396,8 +396,6 @@ int get_peaks_cxi_2(struct image *image, struct hdfile *f, const char *p, } image->features = image_feature_list_new(); - image->num_peaks = 0; - image->num_saturated_peaks = 0; for ( pk=0; pk<num_peaks; pk++ ) { float fs, ss, val; @@ -416,7 +414,6 @@ int get_peaks_cxi_2(struct image *image, struct hdfile *f, const char *p, ss = ss - p->orig_min_ss; image_add_feature(image->features, fs, ss, p, image, val, NULL); - image->num_peaks++; } @@ -542,8 +539,6 @@ int get_peaks_2(struct image *image, struct hdfile *f, const char *p, } image->features = image_feature_list_new(); - image->num_peaks = 0; - image->num_saturated_peaks = 0; for ( i=0; i<size[0]; i++ ) { float fs, ss, val; @@ -563,7 +558,6 @@ int get_peaks_2(struct image *image, struct hdfile *f, const char *p, image_add_feature(image->features, fs, ss, p, image, val, NULL); - image->num_peaks++; } |