diff options
| author | Thomas White <taw@physics.org> | 2013-02-18 09:36:31 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2013-02-18 09:36:31 +0100 |
| commit | 2a33b77d38b6d322e456fa1e2cefcbe50620dc39 (patch) | |
| tree | 96c64406f834be9e8423c1565b5dd88a47e682f1 /libcrystfel/src/index.c | |
| parent | bca26df2b4ad88b56752d62a19b289946f262f94 (diff) | |
| parent | 76d3f48ddf33cc82dc2aaa52c43463dd8bb9cc70 (diff) | |
Merge branch 'tom/grainspotter' into tom/multicrystal
Conflicts:
libcrystfel/Makefile.am
libcrystfel/src/index.c
libcrystfel/src/index.h
Diffstat (limited to 'libcrystfel/src/index.c')
| -rw-r--r-- | libcrystfel/src/index.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 275ea4c1..89fdec4f 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -48,6 +48,7 @@ #include "index.h" #include "index-priv.h" #include "reax.h" +#include "grainspotter.h" #include "geometry.h" #include "cell-utils.h" @@ -82,6 +83,10 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell, 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); @@ -144,6 +149,10 @@ 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; @@ -360,6 +369,9 @@ IndexingMethod *build_indexer_list(const char *str) } else if ( strcmp(methods[i], "mosflm") == 0) { list[++nmeth] = INDEXING_DEFAULTS_MOSFLM; + } else if ( strcmp(methods[i], "grainspotter") == 0) { + list[++nmeth] = INDEXING_DEFAULTS_GRAINSPOTTER; + } else if ( strcmp(methods[i], "reax") == 0) { list[++nmeth] = INDEXING_DEFAULTS_REAX; |