diff options
| -rw-r--r-- | libcrystfel/src/xgandalf.c | 2 | ||||
| -rw-r--r-- | libcrystfel/src/xgandalf.h | 2 | ||||
| -rw-r--r-- | src/indexamajig.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libcrystfel/src/xgandalf.c b/libcrystfel/src/xgandalf.c index f40391c8..69275ba7 100644 --- a/libcrystfel/src/xgandalf.c +++ b/libcrystfel/src/xgandalf.c @@ -124,7 +124,7 @@ void *xgandalf_prepare(IndexingMethod *indm, float tolerance = xgandalf_opts->tolerance; samplingPitch_t samplingPitch = xgandalf_opts->sampling_pitch; gradientDescentIterationsCount_t gradientDescentIterationsCount = - xgandalf_opts->grad_desc_iteration_selector; + xgandalf_opts->grad_desc_iterations; if (*indm & INDEXING_USE_CELL_PARAMETERS) { xgandalf_private_data->cellTemplate = cell; diff --git a/libcrystfel/src/xgandalf.h b/libcrystfel/src/xgandalf.h index be9033cb..5bfe8085 100644 --- a/libcrystfel/src/xgandalf.h +++ b/libcrystfel/src/xgandalf.h @@ -14,7 +14,7 @@ struct xgandalf_options { unsigned int sampling_pitch; - unsigned int grad_desc_iteration_selector; + unsigned int grad_desc_iterations; float tolerance; unsigned int no_deviation_from_provided_cell; float minLatticeVectorLength_A; diff --git a/src/indexamajig.c b/src/indexamajig.c index 352ce200..424ac474 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -342,7 +342,7 @@ int main(int argc, char *argv[]) iargs.taketwo_opts.angle_tol = -1.0; iargs.taketwo_opts.trace_tol = -1.0; iargs.xgandalf_opts.sampling_pitch = 6; - iargs.xgandalf_opts.grad_desc_iteration_selector = 4; + iargs.xgandalf_opts.grad_desc_iterations = 4; iargs.xgandalf_opts.tolerance = 0.02; iargs.xgandalf_opts.no_deviation_from_provided_cell = 0; iargs.xgandalf_opts.minLatticeVectorLength_A = 30; @@ -815,15 +815,15 @@ int main(int argc, char *argv[]) case 351: if (sscanf(optarg, "%u", &iargs.xgandalf_opts.sampling_pitch) != 1) { - ERROR("Invalid value for --xgandalf-sampling-pitch-selector\n"); + ERROR("Invalid value for --xgandalf-sampling-pitch\n"); return 1; } break; case 352: - if (sscanf(optarg, "%u", &iargs.xgandalf_opts.grad_desc_iteration_selector) != 1) + if (sscanf(optarg, "%u", &iargs.xgandalf_opts.grad_desc_iterations) != 1) { - ERROR("Invalid value for --xgandalf-grad-desc-iterations-selector\n"); + ERROR("Invalid value for --xgandalf-grad-desc-iterations\n"); return 1; } break; |