aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/index.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-01-08 17:22:02 +0100
committerThomas White <taw@physics.org>2013-01-08 17:22:02 +0100
commitefb829adf0c494a3ed632cef472ac1e8e5267765 (patch)
treeaa2bb32f5b11642667658cf926f5fbbf743b552b /libcrystfel/src/index.c
parent10a8969c10ac739aa2aa3de826f6bf2aa9940262 (diff)
Skeleton indexing method for GrainSpotter
Diffstat (limited to 'libcrystfel/src/index.c')
-rw-r--r--libcrystfel/src/index.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index 7d912902..86ab8c1a 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"
@@ -97,6 +98,10 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell,
iprivs[n] = indexing_private(indm[n]);
break;
+ case INDEXING_GRAINSPOTTER :
+ iprivs[n] = indexing_private(indm[n]);
+ break;
+
case INDEXING_REAX :
iprivs[n] = reax_prepare();
break;
@@ -132,6 +137,10 @@ void cleanup_indexing(IndexingPrivate **priv)
free(priv[n]);
break;
+ case INDEXING_GRAINSPOTTER :
+ free(priv[n]);
+ break;
+
case INDEXING_REAX :
reax_cleanup(priv[n]);
break;
@@ -196,6 +205,10 @@ void index_pattern(struct image *image, UnitCell *cell, IndexingMethod *indm,
run_mosflm(image, cell);
break;
+ case INDEXING_GRAINSPOTTER :
+ run_grainspotter(image, cell);
+ break;
+
case INDEXING_REAX :
reax_index(ipriv[n], image, cell);
break;
@@ -294,6 +307,8 @@ IndexingMethod *build_indexer_list(const char *str, int *need_cell)
list[i] = INDEXING_DIRAX;
} else if ( strcmp(methods[i], "mosflm") == 0) {
list[i] = INDEXING_MOSFLM;
+ } else if ( strcmp(methods[i], "grainspotter") == 0) {
+ list[i] = INDEXING_GRAINSPOTTER;
} else if ( strcmp(methods[i], "reax") == 0) {
list[i] = INDEXING_REAX;
*need_cell = 1;