diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2011-02-12 15:25:09 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:14 +0100 |
| commit | 24b38f3df87bcc24832c32c8649cde3d22b5e119 (patch) | |
| tree | 7b654342fb47be575d417de88fcdded43c2bad5a | |
| parent | 4d4d8e549411cfc9361e3746ba60db130db46f07 (diff) | |
Tidy up, and set intensities correctly
| -rw-r--r-- | src/hrs-scaling.c | 3 | ||||
| -rw-r--r-- | src/partialator.c | 5 | ||||
| -rw-r--r-- | src/reflist.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/hrs-scaling.c b/src/hrs-scaling.c index 9f1ada75..d5d96ffc 100644 --- a/src/hrs-scaling.c +++ b/src/hrs-scaling.c @@ -52,7 +52,6 @@ static void s_uhavha(signed int hat, signed int kat, signed int lat, if ( !get_scalable(refl) ) continue; ic = get_intensity(refl) / get_partiality(refl); - STATUS("%f / %f = %f\n", get_intensity(refl), get_partiality(refl), ic); sigi = sqrt(fabs(ic)); uha_val += 1.0 / pow(sigi, 2.0); @@ -118,7 +117,6 @@ static double iterate_scale(struct image *images, int n, uh_arr = new_list_intensity(); vh_arr = new_list_intensity(); - STATUS("%i\n", n_ref); for ( h=0; h<n_ref; h++ ) { double uh, vh; @@ -126,7 +124,6 @@ static double iterate_scale(struct image *images, int n, uh = s_uh(images, n, it->h, it->k, it->l, sym); vh = s_vh(images, n, it->h, it->k, it->l, sym); - STATUS("%f %f\n", uh, vh); set_intensity(uh_arr, it->h, it->k, it->l, uh); set_intensity(vh_arr, it->h, it->k, it->l, vh); diff --git a/src/partialator.c b/src/partialator.c index a50ea8d5..740ba740 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -112,6 +112,7 @@ static void refine_all(struct image *images, int n_total_patterns, static void select_scalable_reflections(struct image *images, int n) { int m; + int n_scalable = 0; for ( m=0; m<n; m++ ) { @@ -130,10 +131,12 @@ static void select_scalable_reflections(struct image *images, int n) if ( v < 0.1 ) scalable = 0; set_scalable(refl, scalable); + if ( scalable ) n_scalable++; } } + STATUS("%i reflections selected as scalable.\n", n_scalable); } @@ -289,7 +292,6 @@ int main(int argc, char *argv[]) } images[i].indexed_cell = cell; - images[i].filename = filename; images[i].div = beam->divergence; images[i].bw = beam->bandwidth; @@ -359,6 +361,7 @@ int main(int argc, char *argv[]) new = add_refl(images[i].reflections, ha, ka, la); get_partial(refl, &r1, &r2, &p, &clamp1, &clamp2); get_detector_pos(refl, &x, &y); + set_int(new, get_intensity(peak)); set_partial(new, r1, r2, p, clamp1, clamp2); set_detector_pos(new, 0.0, x, y); diff --git a/src/reflist.c b/src/reflist.c index e9aedaaf..aab8950a 100644 --- a/src/reflist.c +++ b/src/reflist.c @@ -53,7 +53,7 @@ struct _reflection { struct _reflection *child[2]; /* Child nodes */ struct _reflection *parent; /* Parent node */ struct _reflection *next; /* Next and previous in doubly linked */ - struct _reflection *prev; /* list of duplicate reflections */ + struct _reflection *prev; /* list of duplicate reflections */ /* Payload */ struct _refldata data; |