diff options
| author | cppxfel <helenginn@Helen'sMacBookPro> | 2017-07-18 18:23:33 +0100 |
|---|---|---|
| committer | cppxfel <helenginn@Helen'sMacBookPro> | 2017-07-18 18:23:33 +0100 |
| commit | 0494ead78ba5c9d16a780a9e8acc47fd3871d3dc (patch) | |
| tree | 743e3e079903ae47404d4809cd18400a25f252e5 | |
| parent | bf292092e93994fc70f29758f90a74282e5b9492 (diff) | |
| parent | 3ea6ecf3264ffa4541dfb121a1a684f3b0a3d4fc (diff) | |
Merge params code with whatever this git pull thingy contains because I didn't pull first.
Merge branch 'taketwo' of ssh://git.bitwiz.org.uk/crystfel into taketwo
| -rw-r--r-- | doc/man/indexamajig.1 | 8 | ||||
| -rw-r--r-- | src/indexamajig.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/man/indexamajig.1 b/doc/man/indexamajig.1 index eaf812d6..c3189f22 100644 --- a/doc/man/indexamajig.1 +++ b/doc/man/indexamajig.1 @@ -402,6 +402,14 @@ Skip the prediction refinement step. Display timing data for performance monitoring. .PD 0 +.IP \fB--taketwo-member-threshold=\fIn\fR +.IP \fB--taketwo-len-tolerance=\fIn\fR +.IP \fB--taketwo-angle-tolerance=\fIn\fR +.IP \fB--taketwo-trace-tolerance=\fIn\fR +.PD +These set low-level parameters for the TakeTwo indexing algorithm. Respectively, the minimum number of vectors in the network before the pattern is considered indexed, the length and angle tolerances (in reciprocal Angstroms and degrees, respectively) and the matrix trace tolerance for considering rotation matrices as equal. + +.PD 0 .IP \fB--felix-options\fR .PD Specify a comma-separated list of keyword arguments to change the default parameters passed to the felix indexer. For asthetics, this list can also be preceeded and followed by quotations - as in: \fB--felix-options="arg1=10,arg2=600"\fR. A list of parameters which can be modified through this option is detailed below. diff --git a/src/indexamajig.c b/src/indexamajig.c index 33eed81f..2a7a5509 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -586,6 +586,7 @@ int main(int argc, char *argv[]) ERROR("Invalid value for --taketwo-angle-tolerance\n"); return 1; } + iargs.taketwo_opts.angle_tol = deg2rad(iargs.taketwo_opts.angle_tol); break; |