aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2012-10-20 06:44:13 -0700
committerThomas White <taw@bitwiz.org.uk>2012-10-20 06:44:13 -0700
commit8c35814d785b322bbc555d1a20568ed310d7e4e4 (patch)
tree626be04f1fbed1e851bad0394abd21a0ce5501f2
parent868e9aeb547d990b5dfbf0df39efc3f8d468541b (diff)
Fussiness
-rw-r--r--src/im-sandbox.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index 98278571..21b091a5 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -237,9 +237,9 @@ static void process_image(const struct index_args *iargs,
if ( image.lambda < 0.0 ) {
if ( beam != NULL ) {
ERROR("Using nominal photon energy of %.2f eV\n",
- beam->photon_energy);
+ beam->photon_energy);
image.lambda = ph_en_to_lambda(
- eV_to_J(beam->photon_energy));
+ eV_to_J(beam->photon_energy));
} else {
ERROR("No wavelength in file, so you need to give "
"a beam parameters file with -b.\n");
@@ -252,13 +252,13 @@ static void process_image(const struct index_args *iargs,
if ( image.lambda > 1000 ) {
if ( beam != NULL ) {
ERROR("Nonsensical wavelength in HDF5."
- "Using nominal photon energy from beam file: %.2f eV\n",
- beam->photon_energy);
+ "Using nominal photon energy of %.2f eV\n",
+ beam->photon_energy);
image.lambda = ph_en_to_lambda(
- eV_to_J(beam->photon_energy));
+ eV_to_J(beam->photon_energy));
} else {
- ERROR("No wavelength in file, so you need to give "
- "a beam parameters file with -b.\n");
+ ERROR("Nonsensical wavelength in file, so you need to "
+ "give a beam parameters file with -b.\n");
hdfile_close(hdfile);
free_detector_geometry(image.det);
return;
@@ -267,8 +267,6 @@ static void process_image(const struct index_args *iargs,
fill_in_values(image.det, hdfile);
-
-
if ( config_cmfilter ) {
filter_cm(&image);
}