diff options
| author | Thomas White <taw@physics.org> | 2020-10-07 18:13:44 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-10-07 18:13:44 +0200 |
| commit | bccf6547a6efb77e2564562af1daf25136283ac5 (patch) | |
| tree | 8def029847ac437195b84843df0df7f774c4613b | |
| parent | 2a8f415df845064186baa833f9fe1ad91c0f5753 (diff) | |
Revert "Move asdf out of set of indexers used by default"
This reverts commit 62183aacf906f4aff771295aa378cff039dd50ff.
The apparent slowness was due to a bug introduced in August 2019.
See 2a8f415df845064186baa833f9fe1ad91c0f5753.
| -rw-r--r-- | libcrystfel/src/index.c | 5 | ||||
| -rw-r--r-- | src/crystfelindexingopts.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c index 7379a462..5a7c1ae9 100644 --- a/libcrystfel/src/index.c +++ b/libcrystfel/src/index.c @@ -1210,12 +1210,11 @@ 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); - - /* The following methods are all too slow for general use */ + /* Don't automatically use TakeTwo, Felix or PinkIndexer (yet) */ //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 520956d1..f88e4be2 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", FALSE, FALSE, FALSE); + add_method(io->indm_store, "asdf", "ASDF", TRUE, TRUE, FALSE); add_method(io->indm_store, "felix", "Felix", FALSE, TRUE, FALSE); treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(io->indm_store)); |