diff options
| -rw-r--r-- | src/indexamajig.c | 12 | ||||
| -rw-r--r-- | src/pattern_sim.c | 2 | ||||
| -rw-r--r-- | src/peaks.c | 6 | ||||
| -rw-r--r-- | src/peaks.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index f8398a2e..87dfb6dc 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -57,7 +57,7 @@ struct process_args int config_gpu; int config_simulate; int config_nomatch; - int config_unpolar; + int config_polar; int config_sanity; int config_satcorr; int config_sa; @@ -257,7 +257,7 @@ static void *process_image(void *pargsv) int config_gpu = pargs->config_gpu; int config_simulate = pargs->config_simulate; int config_nomatch = pargs->config_nomatch; - int config_unpolar = pargs->config_unpolar; + int config_polar = pargs->config_polar; IndexingMethod indm = pargs->indm; const double *intensities = pargs->intensities; const unsigned int *counts = pargs->counts; @@ -350,7 +350,7 @@ static void *process_image(void *pargsv) /* Measure intensities if requested */ if ( config_nearbragg ) { output_intensities(&image, image.indexed_cell, - pargs->output_mutex, config_unpolar, + pargs->output_mutex, config_polar, pargs->config_sa); } @@ -414,7 +414,7 @@ int main(int argc, char *argv[]) int config_gpu = 0; int config_verbose = 0; int config_alternate = 0; - int config_unpolar = 0; + int config_polar = 1; int config_sanity = 0; int config_satcorr = 0; int config_sa = 1; @@ -456,7 +456,7 @@ int main(int argc, char *argv[]) {"intensities", 1, NULL, 'q'}, {"pdb", 1, NULL, 'p'}, {"prefix", 1, NULL, 'x'}, - {"unpolarized", 0, &config_unpolar, 1}, + {"unpolarized", 0, &config_polar, 0}, {"check-sanity", 0, &config_sanity, 1}, {"sat-corr", 0, &config_satcorr, 1}, {"no-sa", 0, &config_sa, 0}, @@ -618,7 +618,7 @@ int main(int argc, char *argv[]) pargs->config_gpu = config_gpu; pargs->config_simulate = config_simulate; pargs->config_nomatch = config_nomatch; - pargs->config_unpolar = config_unpolar; + pargs->config_polar = config_polar; pargs->config_sanity = config_sanity; pargs->config_satcorr = config_satcorr; pargs->config_sa = config_sa; diff --git a/src/pattern_sim.c b/src/pattern_sim.c index d6c6fc24..91c5247e 100644 --- a/src/pattern_sim.c +++ b/src/pattern_sim.c @@ -413,7 +413,7 @@ int main(int argc, char *argv[]) if ( config_nearbragg ) { find_projected_peaks(&image, cell); - output_intensities(&image, cell, NULL, 1, 1); + output_intensities(&image, cell, NULL, 0, 1); } if ( powder_fn != NULL ) { diff --git a/src/peaks.c b/src/peaks.c index a91fba99..0f70642d 100644 --- a/src/peaks.c +++ b/src/peaks.c @@ -565,7 +565,7 @@ int peak_sanity_check(struct image *image, UnitCell *cell) void output_intensities(struct image *image, UnitCell *cell, - pthread_mutex_t *mutex, int unpolar, int sa) + pthread_mutex_t *mutex, int polar, int sa) { int i; int n_found; @@ -635,7 +635,7 @@ void output_intensities(struct image *image, UnitCell *cell, * so instead re-integrate using old coordinates. * This will produce further revised coordinates. */ r = integrate_peak(image, f->x, f->y, &x, &y, - &intensity, !unpolar, sa); + &intensity, polar, sa); if ( r ) { /* The original peak (which also went through * integrate_peak(), but with the mangled @@ -653,7 +653,7 @@ void output_intensities(struct image *image, UnitCell *cell, r = integrate_peak(image, image->hits[i].x,image->hits[i].y, - &x, &y, &intensity, !unpolar, sa); + &x, &y, &intensity, polar, sa); if ( r ) { /* Plain old ordinary peak veto */ n_veto++; diff --git a/src/peaks.h b/src/peaks.h index b01120fb..2a24c5fa 100644 --- a/src/peaks.h +++ b/src/peaks.h @@ -22,7 +22,7 @@ extern void search_peaks(struct image *image); extern void dump_peaks(struct image *image, pthread_mutex_t *mutex); extern void output_intensities(struct image *image, UnitCell *cell, - pthread_mutex_t *mutex, int unpolar, int sa); + pthread_mutex_t *mutex, int polar, int sa); extern int peak_sanity_check(struct image *image, UnitCell *cell); extern int find_projected_peaks(struct image *image, UnitCell *cell); |