diff options
| author | Thomas White <taw@physics.org> | 2010-10-11 18:26:57 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:02 +0100 |
| commit | c2816111b6799af3cea2c373a71781fe7423bc13 (patch) | |
| tree | 7717aaafbe7d267adabe6d098d94bd8dc2201539 /src | |
| parent | 7dcd21fc5ebf18d39f145c92f5c2038ee6c0d0a5 (diff) | |
output_pixels() fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/peaks.c | 10 | ||||
| -rw-r--r-- | src/peaks.h | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/peaks.c b/src/peaks.c index 99598fa1..69859c9a 100644 --- a/src/peaks.c +++ b/src/peaks.c @@ -979,14 +979,18 @@ void output_pixels(struct image *image, UnitCell *cell, yp = ymomv / (double)intensity; fprintf(ofh, "%3i %3i %3i %6f (at %5.2f,%5.2f)\n", - image->hits[i].h, image->hits[i].k, image->hits[i].l, - intensity, xp, yp); + it->h, it->k, it->l, intensity, xp, yp); } - fprintf(ofh, "No peak statistics, because output_pixels() was used."); + fprintf(ofh, "No peak statistics, because output_pixels() was used.\n"); /* Blank line at end */ fprintf(ofh, "\n"); + free(xmom); + free(ymom); + free(intensities); + delete_items(obs); + if ( mutex != NULL ) pthread_mutex_unlock(mutex); } diff --git a/src/peaks.h b/src/peaks.h index 3d8fdad4..ee5bccf7 100644 --- a/src/peaks.h +++ b/src/peaks.h @@ -21,10 +21,16 @@ extern void search_peaks(struct image *image, float threshold); extern void dump_peaks(struct image *image, FILE *ofh, pthread_mutex_t *mutex); + extern void output_intensities(struct image *image, UnitCell *cell, pthread_mutex_t *mutex, int polar, int sa, int use_closer, FILE *ofh, int circular_domain, double domain_r); + +extern void output_pixels(struct image *image, UnitCell *cell, + pthread_mutex_t *mutex, int do_polar, int do_sa, + FILE *ofh, int circular_domain, double domain_r); + extern int peak_sanity_check(struct image *image, UnitCell *cell, int circular_domain, double domain_r); extern int find_projected_peaks(struct image *image, UnitCell *cell, |