diff options
| author | Thomas White <taw@physics.org> | 2013-02-18 10:47:12 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-18 10:47:12 +0100 |
| commit | 64fb806753a89a29cf7a67ed280d8b51b52edd14 (patch) | |
| tree | 85da50c5f5a4b94cacd02569ecd72c2a9d4db4cb /libcrystfel/src/index.c | |
| parent | 2a33b77d38b6d322e456fa1e2cefcbe50620dc39 (diff) | |
Read GrainSpotter's output properly
Diffstat (limited to 'libcrystfel/src/index.c')
| -rw-r--r-- | libcrystfel/src/index.c | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 89fdec4f..eee2e814 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -51,6 +51,7 @@ #include "grainspotter.h" #include "geometry.h" #include "cell-utils.h" +#include "grainspotter.h" IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell, @@ -68,6 +69,7 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell, int i; IndexingMethod in; + char *str; in = indm[n]; @@ -82,16 +84,17 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell, iprivs[n] = mosflm_prepare(&indm[n], cell, filename, det, beam, ltl); break; - - case INDEXING_GRAINSPOTTER : - iprivs[n] = indexing_private(indm[n]); - break; - case INDEXING_REAX : iprivs[n] = reax_prepare(&indm[n], cell, filename, det, beam, ltl); break; + case INDEXING_GRAINSPOTTER : + iprivs[n] = grainspotter_prepare(&indm[n], cell, + filename, det, beam, + ltl); + break; + default : ERROR("Don't know how to prepare indexing method %i\n", indm[n]); @@ -101,8 +104,9 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell, if ( iprivs[n] == NULL ) return NULL; - STATUS("Prepared indexing method %i: %s\n", - n, indexer_str(indm[n])); + str = indexer_str(indm[n]); + STATUS("Prepared indexing method %i: %s\n", n, str); + free(str); if ( in != indm[n] ) { ERROR("Note: flags were altered to take into account " @@ -149,14 +153,14 @@ void cleanup_indexing(IndexingMethod *indms, IndexingPrivate **privs) mosflm_cleanup(privs[n]); break; - case INDEXING_GRAINSPOTTER : - free(priv[n]); - break; - case INDEXING_REAX : reax_cleanup(privs[n]); break; + case INDEXING_GRAINSPOTTER : + grainspotter_cleanup(privs[n]); + break; + default : ERROR("Don't know how to clean up indexing method %i\n", indms[n]); @@ -213,6 +217,10 @@ static int try_indexer(struct image *image, IndexingMethod indm, return reax_index(image, ipriv); break; + case INDEXING_GRAINSPOTTER : + return grainspotter_index(image, ipriv); + break; + default : ERROR("Unrecognised indexing method: %i\n", indm); break; @@ -321,8 +329,13 @@ char *indexer_str(IndexingMethod indm) strcpy(str, "reax"); break; + case INDEXING_GRAINSPOTTER : + strcpy(str, "grainspotter"); + break; + default : - ERROR("Unrecognised indexing method %i\n", indm); + ERROR("Unrecognised indexing method %i\n", + indm & INDEXING_METHOD_MASK); strcpy(str, "(unknown)"); break; |