aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcrystfel/src/felix.c5
-rw-r--r--libcrystfel/src/felix.h1
-rw-r--r--src/indexamajig.c10
3 files changed, 15 insertions, 1 deletions
diff --git a/libcrystfel/src/felix.c b/libcrystfel/src/felix.c
index e02cfb44..73a1423f 100644
--- a/libcrystfel/src/felix.c
+++ b/libcrystfel/src/felix.c
@@ -658,7 +658,7 @@ void *felix_prepare(IndexingMethod *indm, UnitCell *cell,
gp->orispace_frustum = 1;
gp->orispace_octa = 0;
gp->readhkl_file = NULL;
- gp->maxtime = 30.0;
+ gp->maxtime = 120.0;
gp->tthrange_min = deg2rad(0.0);
gp->tthrange_max = deg2rad(30.0);
@@ -688,6 +688,9 @@ void *felix_prepare(IndexingMethod *indm, UnitCell *cell,
gp->sigma_eta = opts->sigma;
gp->sigma_omega = opts->sigma;
}
+ if (opts->domega > 0.0 ) {
+ gp->domega = opts -> domega;
+ }
return (IndexingPrivate *)gp;
}
diff --git a/libcrystfel/src/felix.h b/libcrystfel/src/felix.h
index 48ffbe9c..4cb9c266 100644
--- a/libcrystfel/src/felix.h
+++ b/libcrystfel/src/felix.h
@@ -46,6 +46,7 @@ struct felix_options
int n_voxels;
double test_fraction;
double sigma;
+ double domega;
};
extern void *felix_prepare(IndexingMethod *indm, UnitCell *cell,
diff --git a/src/indexamajig.c b/src/indexamajig.c
index a417eaf6..29870957 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -298,6 +298,7 @@ int main(int argc, char *argv[])
iargs.felix_opts.n_voxels = 0;
iargs.felix_opts.test_fraction = -1.0;
iargs.felix_opts.sigma = -1.0;
+ iargs.felix_opts.domega = -1.0;
/* Long options */
const struct option longopts[] = {
@@ -389,6 +390,7 @@ int main(int argc, char *argv[])
{"felix-test-fraction", 1, NULL, 42},
{"felix-sigma", 1, NULL, 43},
{"serial-start", 1, NULL, 44},
+ {"felix-domega", 1, NULL, 45},
{0, 0, NULL, 0}
};
@@ -698,6 +700,14 @@ int main(int argc, char *argv[])
return 1;
}
break;
+
+ case 45:
+ if ( sscanf(optarg, "%lf", &iargs.felix_opts.domega) != 1 )
+ {
+ ERROR("Invalid value for --felix-domega\n");
+ return 1;
+ }
+ break;
case 0 :
break;