aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R. Beyerlein <ken.beyerlein@gmail.com>2018-01-31 22:12:57 +0100
committerThomas White <taw@physics.org>2018-02-08 16:32:08 +0100
commit5384762850fafbe07900baf81c39928e7a8f253a (patch)
tree9c5654bf40c5ce75fea6750aa8d292d6032f872a
parentec8804fbba5b4e6565fc2d42341ee837e968f89d (diff)
Change Felix min-uniqueness paramter name to max-uniqueness.
-rw-r--r--libcrystfel/src/felix.c11
-rw-r--r--libcrystfel/src/felix.h2
-rw-r--r--src/indexamajig.c8
3 files changed, 10 insertions, 11 deletions
diff --git a/libcrystfel/src/felix.c b/libcrystfel/src/felix.c
index 913e8513..e226b037 100644
--- a/libcrystfel/src/felix.c
+++ b/libcrystfel/src/felix.c
@@ -60,7 +60,6 @@
#define FELIX_VERBOSE 0
-#define MIN_NGV_UNIQUE 10
/* Global private data, prepared once */
@@ -80,7 +79,7 @@ struct felix_private
float omegarange_max;
int min_measurements; /* related to "cuts" */
float min_completeness; /* related to "cuts" */
- float min_uniqueness; /* related to "cuts" */
+ float max_uniqueness; /* related to "cuts" */
int n_voxels; /* related to "frustsumsize" */
float test_fraction; /* related to "frustsumsize" */
float sigma_tth; /* related to "uncertainties" */
@@ -391,7 +390,7 @@ static char *write_ini(struct image *image, struct felix_private *gp)
fprintf(fh, "omegarange %f %f\n", gp->omegarange_min, gp->omegarange_max);
fprintf(fh, "filespecs %s %s\n", gveFilename, logFilename);
fprintf(fh, "cuts %i %f %f\n", gp->min_measurements, gp->min_completeness,
- gp->min_uniqueness);
+ gp->max_uniqueness);
fprintf(fh, "frustumsize %i %f\n", gp->n_voxels,
gp->test_fraction);
fprintf(fh, "uncertainties %f %f %f\n", gp->sigma_tth,
@@ -647,7 +646,7 @@ void *felix_prepare(IndexingMethod *indm, UnitCell *cell,
gp->omegarange_max = 1.0;
gp->min_measurements = 15;
gp->min_completeness = 0.001;
- gp->min_uniqueness = 0.5;
+ gp->max_uniqueness = 0.5;
gp->test_fraction = 0.75;
gp->sigma_tth = 0.2;
gp->sigma_eta = 0.2;
@@ -674,8 +673,8 @@ void *felix_prepare(IndexingMethod *indm, UnitCell *cell,
if ( opts->min_completeness > 0.0 ) {
gp->min_completeness = opts->min_completeness;
}
- if ( opts->min_uniqueness > 0.0 ) {
- gp->min_uniqueness = opts->min_uniqueness;
+ if ( opts->max_uniqueness > 0.0 ) {
+ gp->max_uniqueness = opts->max_uniqueness;
}
if ( opts->n_voxels > 0 ) {
gp->n_voxels = opts->n_voxels;
diff --git a/libcrystfel/src/felix.h b/libcrystfel/src/felix.h
index 32980071..6cd78fdb 100644
--- a/libcrystfel/src/felix.h
+++ b/libcrystfel/src/felix.h
@@ -42,7 +42,7 @@ struct felix_options
double ttmax; /* radians */
int min_measurements;
double min_completeness;
- double min_uniqueness;
+ double max_uniqueness;
int n_voxels;
double test_fraction;
double sigma;
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 964e6d04..0af10f0e 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
iargs.felix_opts.ttmax = -1.0;
iargs.felix_opts.min_measurements = 0;
iargs.felix_opts.min_completeness = -1.0;
- iargs.felix_opts.min_uniqueness = -1.0;
+ iargs.felix_opts.max_uniqueness = -1.0;
iargs.felix_opts.n_voxels = 0;
iargs.felix_opts.test_fraction = -1.0;
iargs.felix_opts.sigma = -1.0;
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
{"felix-tthrange-max", 1, NULL, 37},
{"felix-min-measurements", 1, NULL, 38},
{"felix-min-completeness", 1, NULL, 39},
- {"felix-min-uniqueness", 1, NULL, 40},
+ {"felix-max-uniqueness", 1, NULL, 40},
{"felix-num-voxels", 1, NULL, 41},
{"felix-test-fraction", 1, NULL, 42},
{"felix-sigma", 1, NULL, 43},
@@ -664,9 +664,9 @@ int main(int argc, char *argv[])
break;
case 40:
- if ( sscanf(optarg, "%lf", &iargs.felix_opts.min_uniqueness) != 1 )
+ if ( sscanf(optarg, "%lf", &iargs.felix_opts.max_uniqueness) != 1 )
{
- ERROR("Invalid value for --felix-min-uniqueness\n");
+ ERROR("Invalid value for --felix-max-uniqueness\n");
return 1;
}
break;