diff options
| author | Thomas White <taw@physics.org> | 2014-11-17 11:06:42 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-11-17 11:06:42 +0100 |
| commit | 8a88f9bdd200645ceb30a2c136b865528c40b1ee (patch) | |
| tree | 2e37d474f05c1a5f39b2712de8f9114fabde5426 /libcrystfel | |
| parent | 3f58055d53717a21ea36229445bdeaa1fbc4afbf (diff) | |
Tolerate having no wavelength
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/detector.c | 2 | ||||
| -rw-r--r-- | libcrystfel/src/hdf5-file.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c index 486fb32e..e29b6d39 100644 --- a/libcrystfel/src/detector.c +++ b/libcrystfel/src/detector.c @@ -930,7 +930,7 @@ struct detector *get_detector_geometry(const char *filename, } if ( beam != NULL ) { - beam->photon_energy = -1.0; + beam->photon_energy = 0.0; beam->photon_energy_from = NULL; beam->photon_energy_scale = 1.0; } diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c index 615a2faf..c5ac5efc 100644 --- a/libcrystfel/src/hdf5-file.c +++ b/libcrystfel/src/hdf5-file.c @@ -1264,14 +1264,10 @@ int hdf5_read2(struct hdfile *f, struct image *image, struct event *ev, if ( (image->lambda > 1.0) || (image->lambda < 1e-20) ) { - /* Error message covers a silly value in the beam file - * or in the HDF5 file. */ - ERROR("Nonsensical wavelength (%e m) value " + ERROR("WARNING: Nonsensical wavelength (%e m) value " "for file: %s, event: %s.\n", image->lambda, image->filename, get_event_string(image->event)); - hdfile_close(f); - return 1; } } |