diff options
| author | Thomas White <taw@physics.org> | 2015-06-16 13:24:07 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2015-06-16 13:24:07 +0200 |
| commit | b9c6d025ffe338d8e766513ee3a1b231e62d1e5d (patch) | |
| tree | 0cd7da99c3685fb779e5f1e03419c976947f58bd /src/partialator.c | |
| parent | 32b4811735a718f169071bc35ec9d0913e8ad4ed (diff) | |
partialator: Improve rejection
Diffstat (limited to 'src/partialator.c')
| -rw-r--r-- | src/partialator.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/partialator.c b/src/partialator.c index dc0d647f..d5e1aef5 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -301,6 +301,7 @@ static void show_duds(Crystal **crystals, int n_crystals) int n_noref = 0; int n_solve = 0; int n_early = 0; + int n_cc = 0; for ( j=0; j<n_crystals; j++ ) { int flag; @@ -327,6 +328,10 @@ static void show_duds(Crystal **crystals, int n_crystals) n_early++; break; + case 6: + n_cc++; + break; + default: STATUS("Unknown flag %i\n", flag); break; @@ -339,6 +344,7 @@ static void show_duds(Crystal **crystals, int n_crystals) STATUS(" %i not enough reflections.\n", n_noref); STATUS(" %i solve failed.\n", n_solve); STATUS(" %i early rejection.\n", n_early); + STATUS(" %i bad CC.\n", n_cc); } } @@ -741,14 +747,14 @@ int main(int argc, char *argv[]) } /* Make a first pass at cutting out crap */ -// STATUS("Checking patterns.\n"); -// early_rejection(crystals, n_crystals); + STATUS("Checking patterns.\n"); + early_rejection(crystals, n_crystals); /* Make initial estimates */ full = merge_intensities(crystals, n_crystals, nthreads, pmodel, min_measurements, push_res); - check_rejection(crystals, n_crystals); + check_rejection(crystals, n_crystals, full); show_duds(crystals, n_crystals); @@ -773,14 +779,13 @@ int main(int argc, char *argv[]) init_free_dev, final_free_dev); show_duds(crystals, n_crystals); - check_rejection(crystals, n_crystals); + check_rejection(crystals, n_crystals, full); /* Re-estimate all the full intensities */ reflist_free(full); full = merge_intensities(crystals, n_crystals, nthreads, pmodel, min_measurements, push_res); - check_rejection(crystals, n_crystals); write_pgraph(full, crystals, n_crystals, i+1); } |