diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2011-03-06 20:59:26 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:17 +0100 |
| commit | 8e765e886801508695db4b1dbb4439fc2ece78b3 (patch) | |
| tree | 36d1abda9591bc7b64def97f314db844260608d0 /src/index.c | |
| parent | 40c59769dce7d1deb38cc3f3cd2bab2a81f9ab52 (diff) | |
Remove template indexing
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/index.c b/src/index.c index 3d2246bc..d6375834 100644 --- a/src/index.c +++ b/src/index.c @@ -30,7 +30,6 @@ #include "detector.h" #include "index.h" #include "index-priv.h" -#include "templates.h" /* Base class constructor for unspecialised indexing private data */ @@ -67,10 +66,6 @@ IndexingPrivate **prepare_indexing(IndexingMethod *indm, UnitCell *cell, case INDEXING_MOSFLM : iprivs[n] = indexing_private(indm[n]); break; - case INDEXING_TEMPLATE : - iprivs[n] = generate_templates(cell, filename, det, - nominal_photon_energy); - break; } } @@ -98,8 +93,6 @@ void cleanup_indexing(IndexingPrivate **priv) case INDEXING_MOSFLM : free(priv[n]); break; - case INDEXING_TEMPLATE : - free_templates(priv[n]); } n++; @@ -153,18 +146,14 @@ void index_pattern(struct image *image, UnitCell *cell, IndexingMethod *indm, STATUS("Running MOSFLM...\n"); run_mosflm(image, cell); break; - case INDEXING_TEMPLATE : - match_templates(image, ipriv[n]); - break; } - if ( image->ncells == 0 ) { STATUS("No candidate cells found.\n"); n++; continue; } - if ( (cellr == CELLR_NONE) || (indm[n] == INDEXING_TEMPLATE) ) { + if ( cellr == CELLR_NONE ) { image->indexed_cell = cell_new_from_cell( image->candidate_cells[0]); if ( verbose ) { @@ -254,9 +243,6 @@ 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], "template") == 0) { - list[i] = INDEXING_TEMPLATE; - *need_cell = 1; } else { ERROR("Unrecognised indexing method '%s'\n", methods[i]); |