Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
There are limits to how well they can be handled, but this avoids
screwing users over too much.
|
|
|
|
|
|
|
|
Some indexing methods may set it to 1 already, in which case we should
take the hint.
|
|
|
|
The detector isn't used for anything, and the tolerance is none of their
business.
|
|
|
|
|
|
Another thing that the indexing engines don't need to be repsonsible
for.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mosflm-cell-nolatt-multi-refine-bad-retry.... it's all getting a bit
too much. This commit removes all the options from the indexing methods
except for the prior information flags (cell/nocell and latt/nolatt).
All the other options are now given at the top level with new
indexamajig options, e.g. --no-multi and --no-retry. They are applied
to all the methods, with no option to (say) use retry for one method and
not for another.
This also makes the "peak alignment test" default to OFF, and
multi-lattice indexing ON. I think that the prediction refinement does
a good enough job of checking the validity of indexing solutions,
allowing us to turn off the alignment check which filters out most
multi-lattice solutions.
|
|
|
|
Fixes a regression caused by 61565336125, which broke indexamajig --no-refine.
|
|
|
|
|
|
This doesn't do much except for preventing a possibly confusing warning
message about "Failed to prepare indexing method none".
You can actually do --indexing=none,asdf, but don't tell anyone...
|
|
Doing so results in one crystal being counted as bad twice, which messes
up the logic which follows.
|
|
|
|
|
|
Previously, the indexing system passed all the information on to the
indexing engines and then forgot about it. That made it difficult to do
things like check the indexing solution after prediction refinement,
because the target unit cell was unavailable. Now, the indexing system
itself can keep some information. Of course, that information includes
the private pointers for the indexing engines themselves.
I took the opportunity to streamline things a little bit. The caller
can now set up the indexing system in one step, without having to
separately parse the names of the indexing methods. The caller no
longer has to keep track of a separate array of methods, instead just
one structure which contains everything.
|
|
|
|
|
|
Only changes from Helen's code so far:
1. Stripping trailing spaces
2. Tweaking includes (<> -> "")
3. Adding initial CrystFEL hooks at the bottom of taketwo.c
4. Moving definition of struct SpotVec to taketwo.c
5. Removing prototype for run_taketwo from taketwo.h (comment moved to .c)
6. Authorship/copyright boilerplate
|
|
|
|
Silly bug fix. Beamtime programming FTL.
|
|
Adds yet another indexing option...
|
|
This allows indexing to be attempted again (either a new method or with
"retry") if the prediction refinement fails, increasing overall indexing
rate.
Side-effect: there are some hoops which would need to be jumped through
to store the profile radius before refinement and hence enable
scripts/plot-predict-refine to work. For now, we'll ignore this as it's
clear that the prediction refinement is working.
|
|
|
|
|
|
|
|
|
|
This increases the indexing rate a bit in situations where there are
lots of weak peaks which, although they may be real, don't help
indexing. The weakest 10% of peaks get cut out and the indexing re-run.
This also allows multiple hits to be indexed, using the "inelegant peak
subtraction method", by retrying indexing in the same way after deleting
peaks which are accounted for by the lattice just found.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Neither of these ever really worked, and better algorithms exist now.
|
|
Conflicts:
libcrystfel/src/index.h
|