diff options
| author | Thomas White <taw@physics.org> | 2017-07-20 17:29:34 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-07-20 17:29:34 +0200 |
| commit | ffca045ff453e41a0aed290e89c24324ddd97bec (patch) | |
| tree | 7591496b23baa7dd3a1ea15d961439fdad9b12e7 | |
| parent | 0494ead78ba5c9d16a780a9e8acc47fd3871d3dc (diff) | |
Change units for TakeTwo parameters
| -rw-r--r-- | libcrystfel/src/taketwo.c | 6 | ||||
| -rw-r--r-- | src/indexamajig.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libcrystfel/src/taketwo.c b/libcrystfel/src/taketwo.c index 12b608f8..ecd2c447 100644 --- a/libcrystfel/src/taketwo.c +++ b/libcrystfel/src/taketwo.c @@ -115,11 +115,7 @@ struct TakeTwoCell /* Tolerance for rot_mats_are_similar */ #define TRACE_TOLERANCE (deg2rad(3.0)) -/** TODO: - * - * - May need to be capable of playing with the tolerances/#defined stuff. - * - Multiple lattices - */ +/* TODO: Multiple lattices */ /* ------------------------------------------------------------------------ diff --git a/src/indexamajig.c b/src/indexamajig.c index 2a7a5509..d232b66f 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -175,7 +175,7 @@ static void show_help(const char *s) " --taketwo-member-threshold Minimum number of members in network\n" " --taketwo-len-tolerance Reciprocal space length tolerance (1/A)\n" " --taketwo-angle-tolerance Reciprocal space angle tolerance (in degrees)\n" -" --taketwo-trace-tolerance Rotation matrix trace tolerance\n" +" --taketwo-trace-tolerance Rotation matrix equivalence tolerance (in degrees)\n" ); } @@ -578,6 +578,7 @@ int main(int argc, char *argv[]) ERROR("Invalid value for --taketwo-len-tolerance\n"); return 1; } + iargs.taketwo_opts.len_tol *= 1e10; break; case 34: @@ -596,6 +597,7 @@ int main(int argc, char *argv[]) ERROR("Invalid value for --taketwo-trace-tolerance\n"); return 1; } + iargs.taketwo_opts.trace_tol = deg2rad(iargs.taketwo_opts.trace_tol); break; case 0 : |