diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2013-02-06 20:56:56 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2013-02-06 20:56:56 +0100 |
| commit | df22900f8dba733e8c563704f2686f0e315655f4 (patch) | |
| tree | edfa14caba1f3b35f3442937db1e84f8656c3874 | |
| parent | d9fc791021317d6823078a3f3779a79aa3bc84b4 (diff) | |
Some small(ish) fixes
| -rw-r--r-- | src/partialator.c | 4 | ||||
| -rw-r--r-- | src/process_hkl.c | 2 | ||||
| -rw-r--r-- | src/scaling-report.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/partialator.c b/src/partialator.c index 30f9bfe4..8b51f826 100644 --- a/src/partialator.c +++ b/src/partialator.c @@ -504,7 +504,7 @@ int main(int argc, char *argv[]) return 1; } crystals = crystals_new; - crystals[n_crystals] = crystal_new(); + crystals[n_crystals] = cur->crystals[i]; cr = crystals[n_crystals]; crystal_set_image(cr, cur); @@ -532,7 +532,7 @@ int main(int argc, char *argv[]) close_stream(st); /* Make initial estimates */ - STATUS("Performing initial scaling.\n"); + STATUS("\nPerforming initial scaling.\n"); if ( noscale ) STATUS("Scale factors fixed at 1.\n"); full = scale_intensities(crystals, n_crystals, reference, nthreads, noscale); diff --git a/src/process_hkl.c b/src/process_hkl.c index 4ba901e6..a8abc2e8 100644 --- a/src/process_hkl.c +++ b/src/process_hkl.c @@ -269,7 +269,7 @@ static void display_progress(int n_images, int n_crystals, int n_crystals_used) if ( tcgetpgrp(STDERR_FILENO) != getpgrp() ) return; pthread_mutex_lock(&stderr_lock); - fprintf(stderr, "\r%i images processed, %i crystals, %i crystals used", + fprintf(stderr, "\r%i images processed, %i crystals, %i crystals used.", n_images, n_crystals, n_crystals_used); pthread_mutex_unlock(&stderr_lock); diff --git a/src/scaling-report.c b/src/scaling-report.c index 3de82517..b161a01e 100644 --- a/src/scaling-report.c +++ b/src/scaling-report.c @@ -3,11 +3,11 @@ * * Write a nice PDF of scaling parameters * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, - * a research centre of the Helmholtz Association. + * Copyright © 2012-2013 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. * * Authors: - * 2010-2012 Thomas White <taw@physics.org> + * 2010-2013 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * |