diff options
| author | Thomas White <taw@physics.org> | 2011-09-27 16:47:14 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:38 +0100 |
| commit | d749e8713072d7fd48693be1075274a3fe4057e8 (patch) | |
| tree | 1a2419b01fee68f1a09376d567e344dcb16d8211 /src/partialator.c | |
| parent | 14a89c74bf8c17309f042e7e2ef7fbfe4fed13e9 (diff) | |
partialator: Loads of work on the scaling report
Diffstat (limited to 'src/partialator.c')
| -rw-r--r-- | src/partialator.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/partialator.c b/src/partialator.c index 4a987077..d566eb64 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -428,8 +428,6 @@ int main(int argc, char *argv[]) return 1; } - sr = sr_header("scaling-report.pdf", infile, cmdline); - /* Fill in what we know about the images so far */ rewind(fh); nobs = 0; @@ -496,7 +494,9 @@ int main(int argc, char *argv[]) STATUS("Performing initial scaling.\n"); full = scale_intensities(images, n_usable_patterns, reference); - sr_before(sr, images, n_usable_patterns, full); + sr = sr_titlepage(images, n_usable_patterns, "scaling-report.pdf", + infile, cmdline); + sr_iteration(sr, 0, images, n_usable_patterns, full); /* Iterate */ for ( i=0; i<n_iter; i++ ) { @@ -532,8 +532,12 @@ int main(int argc, char *argv[]) full = scale_intensities(images, n_usable_patterns, reference); + sr_iteration(sr, i+1, images, n_usable_patterns, full); + } + sr_finish(sr); + n_dud = 0; for ( i=0; i<n_usable_patterns; i++ ) { if ( images[i].pr_dud ) n_dud++; @@ -543,8 +547,6 @@ int main(int argc, char *argv[]) /* Output results */ write_reflist(outfile, full, images[0].indexed_cell); - sr_after(sr, images, n_usable_patterns, full); - /* Clean up */ for ( i=0; i<n_usable_patterns; i++ ) { reflist_free(images[i].reflections); |