aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2011-07-09 09:01:52 +0200
committerThomas White <taw@physics.org>2012-02-22 15:27:32 +0100
commit9bd287bf7d7af36c70fc0a56ff688e98dac6d3d8 (patch)
tree87a4aa2f039b79b02002bb021464c4ec7d16fe40 /src
parent45d7553145989d64ec70ee16904a3d9e8439bc16 (diff)
Put selection routines in the right order
Diffstat (limited to 'src')
-rw-r--r--src/partialator.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/partialator.c b/src/partialator.c
index 987893a7..070aeee3 100644
--- a/src/partialator.c
+++ b/src/partialator.c
@@ -475,9 +475,6 @@ int main(int argc, char *argv[])
STATUS("Performing initial scaling.\n");
full = scale_intensities(images, n_usable_patterns, reference);
- select_reflections_for_refinement(images, n_usable_patterns, full,
- have_reference);
-
/* Iterate */
for ( i=0; i<n_iter; i++ ) {
@@ -510,6 +507,8 @@ int main(int argc, char *argv[])
}
/* Refine the geometry of all patterns to get the best fit */
+ select_reflections_for_refinement(images, n_usable_patterns,
+ comp, have_reference);
refine_all(images, n_usable_patterns, det,
comp, nthreads, fhg, fhp);
@@ -518,9 +517,6 @@ int main(int argc, char *argv[])
struct image *cur = &images[j];
- update_partialities(cur, &n_expected,
- &n_found, &n_notfound);
-
nobs += select_scalable_reflections(cur->reflections,
reference);
@@ -531,9 +527,6 @@ int main(int argc, char *argv[])
full = scale_intensities(images, n_usable_patterns,
reference);
- select_reflections_for_refinement(images, n_usable_patterns,
- full, have_reference);
-
fclose(fhg);
fclose(fhp);