From 8ad1eddff0b3f020581e1852448752145656d16d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 10 Jan 2024 16:50:40 +0100 Subject: indexamajig: Start implementing --max-mille-level --- src/indexamajig.c | 13 +++++++++++-- src/process_image.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/indexamajig.c b/src/indexamajig.c index cca7dbba..fd95a01c 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -748,6 +748,14 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) args->iargs.milledir = strdup(arg); break; + case 418 : + if (sscanf(arg, "%d", &args->iargs.max_mille_level) != 1) + { + ERROR("Invalid value for --max-mille-level\n"); + return EINVAL; + } + break; + /* ---------- Integration ---------- */ case 501 : @@ -996,6 +1004,7 @@ int main(int argc, char *argv[]) args.iargs.data_format = DATA_SOURCE_TYPE_UNKNOWN; args.iargs.mille = 0; args.iargs.milledir = strdup("."); + args.iargs.max_mille_level = 99; argp_program_version_hook = show_version; @@ -1122,8 +1131,8 @@ int main(int argc, char *argv[]) "Estimate of the camera length, in metres."}, {"mille", 416, NULL, 0, "Generate data for detector geometry refinement using Millepede"}, - {"mille-dir", 417, "dirname", 0, - "Save Millepede data in folder"}, + {"mille-dir", 417, "dirname", 0, "Save Millepede data in folder"}, + {"max-mille-level", 418, "n", 0, "Maximum geometry refinement level"}, {NULL, 0, 0, OPTION_DOC, "Integration options:", 5}, {"integration", 501, "method", OPTION_NO_USAGE, "Integration method"}, diff --git a/src/process_image.h b/src/process_image.h index f5e27631..10c9ec31 100644 --- a/src/process_image.h +++ b/src/process_image.h @@ -76,6 +76,7 @@ struct index_args int n_threads; int mille; char *milledir; + int max_mille_level; /* Integration */ IntegrationMethod int_meth; -- cgit v1.2.3