From a0c43b49789c78bcbbfc3a6d3da63eeeafadc148 Mon Sep 17 00:00:00 2001 From: Yaroslav Gevorkov Date: Fri, 7 Feb 2020 21:25:05 +0100 Subject: fix error message for photon_energy not known at indexer_prepare --- libcrystfel/src/pinkindexer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libcrystfel/src') diff --git a/libcrystfel/src/pinkindexer.c b/libcrystfel/src/pinkindexer.c index 8941080a..9b731839 100644 --- a/libcrystfel/src/pinkindexer.c +++ b/libcrystfel/src/pinkindexer.c @@ -157,9 +157,9 @@ void *pinkIndexer_prepare(IndexingMethod *indm, UnitCell *cell, struct pinkIndexer_options *pinkIndexer_opts, struct detector *det, struct beam_params *beam) { - if ( beam->photon_energy_from != NULL && pinkIndexer_opts->customPhotonEnergy > 0) { + if ( beam->photon_energy_from != NULL && pinkIndexer_opts->customPhotonEnergy <= 0) { ERROR("For pinkIndexer, the photon_energy must be defined as a " - "constant in the geometry file or a parameter\n"); + "constant in the geometry file or as a parameter (see --pinkIndexer-override-photon-energy)\n"); return NULL; } if ( (det->panels[0].clen_from != NULL) && pinkIndexer_opts->refinement_type == -- cgit v1.2.3 From 190204f3806cd343097afad62a29523bd109cc7f Mon Sep 17 00:00:00 2001 From: Yaroslav Gevorkov Date: Fri, 7 Feb 2020 21:26:05 +0100 Subject: add error message for too small reflection radius when using electrons --- libcrystfel/src/pinkindexer.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libcrystfel/src') diff --git a/libcrystfel/src/pinkindexer.c b/libcrystfel/src/pinkindexer.c index 9b731839..e3ecf5a9 100644 --- a/libcrystfel/src/pinkindexer.c +++ b/libcrystfel/src/pinkindexer.c @@ -222,6 +222,10 @@ void *pinkIndexer_prepare(IndexingMethod *indm, UnitCell *cell, reflectionRadius_1_per_A = pinkIndexer_opts->reflectionRadius * 1e10; /* m^-1 to A^-1*/ } + if(beamEenergy_eV > 75000 && nonMonochromaticity < 0.02 && reflectionRadius_1_per_A < 0.0005){ + STATUS("Trying to index electron diffraction? It might be helpful to set a higher reflection radius (see documentation for --pinkIndexer-reflection-radius)") + } + float divergenceAngle_deg = 0.01; //fake float tolerance = pinkIndexer_opts->tolerance; -- cgit v1.2.3