From 62183aacf906f4aff771295aa378cff039dd50ff Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 6 Oct 2020 15:42:13 +0200 Subject: Move asdf out of set of indexers used by default Sadly, it has the same fatal flaw as TakeTwo: taking forever on a minority of patterns. --- libcrystfel/src/index.c | 5 +++-- src/crystfelindexingopts.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 9c90c164..e16fd9c3 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -1203,11 +1203,12 @@ char *detect_indexing_methods(UnitCell *cell) do_probe(mosflm_probe, cell, methods); do_probe(dirax_probe, cell, methods); - do_probe(asdf_probe, cell, methods); do_probe(xds_probe, cell, methods); do_probe(xgandalf_probe, cell, methods); - /* Don't automatically use TakeTwo, Felix or PinkIndexer (yet) */ + + /* The following methods are all too slow for general use */ //do_probe(taketwo_probe, cell, methods); + //do_probe(asdf_probe, cell, methods); //do_probe(felix_probe, cell, methods); //do_probe(pinkIndexer_probe, cell, methods); diff --git a/src/crystfelindexingopts.c b/src/crystfelindexingopts.c index f88e4be2..520956d1 100644 --- a/src/crystfelindexingopts.c +++ b/src/crystfelindexingopts.c @@ -182,7 +182,7 @@ static GtkWidget *make_indexing_methods(CrystFELIndexingOpts *io) add_method(io->indm_store, "xgandalf", "XGANDALF", TRUE, TRUE, FALSE); add_method(io->indm_store, "pinkIndexer", "PinkIndexer", FALSE, TRUE, FALSE); add_method(io->indm_store, "taketwo", "TakeTwo", FALSE, TRUE, FALSE); - add_method(io->indm_store, "asdf", "ASDF", TRUE, TRUE, FALSE); + add_method(io->indm_store, "asdf", "ASDF", FALSE, FALSE, FALSE); add_method(io->indm_store, "felix", "Felix", FALSE, TRUE, FALSE); treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(io->indm_store)); -- cgit v1.2.3