diff options
author | Thomas White <taw@physics.org> | 2017-02-02 15:08:59 +0100 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2017-02-02 15:08:59 +0100 |
commit | 6ece93b3ab590da9da08fdc42e8177ca64056145 (patch) | |
tree | 3de5cd3bc4d193a40d28d5c19cc4ca85dd53c3b0 /libcrystfel/src/index.c | |
parent | 2cefd4a8807d87cbe459c83d4b944d32ee38d2af (diff) | |
parent | 80b54c66c36c46a247d6d015be60ea9e73aa025f (diff) |
Merge branch 'master' into taketwo
Diffstat (limited to 'libcrystfel/src/index.c')
-rw-r--r-- | libcrystfel/src/index.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index e0bebfa4..e7fd879d 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -3,12 +3,12 @@ * * Perform indexing (somehow) * - * Copyright © 2012-2016 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * Copyright © 2012 Lorenzo Galli * * Authors: - * 2010-2016 Thomas White <taw@physics.org> + * 2010-2017 Thomas White <taw@physics.org> * 2010-2011 Richard Kirian <rkirian@asu.edu> * 2012 Lorenzo Galli * 2013 Cornelius Gati <cornelius.gati@cfel.de> @@ -434,10 +434,16 @@ static int finished_retry(IndexingMethod indm, int r, struct image *image) } } - void index_pattern(struct image *image, IndexingMethod *indms, IndexingPrivate **iprivs) { + index_pattern_2(image, indms, iprivs, NULL); +} + + +void index_pattern_2(struct image *image, IndexingMethod *indms, + IndexingPrivate **iprivs, int *ping) +{ int n = 0; ImageFeatureList *orig; @@ -465,6 +471,7 @@ void index_pattern(struct image *image, ntry++; done = finished_retry(indms[n], r, image); if ( ntry > 5 ) done = 1; + if ( ping != NULL ) (*ping)++; } while ( !done ); |