diff options
| author | Thomas White <taw@physics.org> | 2020-02-11 10:58:19 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-02-11 10:58:19 +0100 |
| commit | 6f2ca6294851780290877c387ada86744bbbebc6 (patch) | |
| tree | 857b2018bbf21d934256236bc44c196eda8eff15 /libcrystfel/src | |
| parent | b5de27531020c4446d4ac823246c1ff6bf932b0d (diff) | |
| parent | 1778d4c86f7afc90ed78ebd58de9a83b6233e33d (diff) | |
Merge branch 'yaroslav/pinkIndexer_fixes'
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/pinkindexer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libcrystfel/src/pinkindexer.c b/libcrystfel/src/pinkindexer.c index 8941080a..e3ecf5a9 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 == @@ -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; |