aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-08-30 17:14:18 +0200
committerThomas White <taw@physics.org>2018-08-30 17:16:22 +0200
commit92f2ebfd11d0ccd91ab299f95ffb2d99a457643d (patch)
treed3e2e5b0e6354f809146ec1fbf6170ddfe8d5a11
parent597bb9b3931076e69930b71d4d252ed6ece2f12e (diff)
Reword error messages about dimensions in geometry file
-rw-r--r--libcrystfel/src/detector.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index 8d33731a..d4d8b768 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -1429,6 +1429,8 @@ struct detector *get_detector_geometry_2(const char *filename,
if ( det->panels[i].dim_structure->dims[di] ==
HYSL_UNDEFINED ) {
dim_dim_reject = 1;
+ ERROR("Dimension %i for panel %s is undefined.\n",
+ di, det->panels[i].name);
}
if ( det->panels[i].dim_structure->dims[di] ==
HYSL_PLACEHOLDER ) {
@@ -1446,18 +1448,23 @@ struct detector *get_detector_geometry_2(const char *filename,
}
if ( found_ss != 1 ) {
- ERROR("Only one slow scan dim coordinate is allowed\n");
+ ERROR("Exactly one slow scan dim coordinate is needed "
+ "(found %i for panel %s)\n", found_ss,
+ det->panels[i].name);
dim_dim_reject = 1;
}
if ( found_fs != 1 ) {
- ERROR("Only one fast scan dim coordinate is allowed\n");
+ ERROR("Exactly one fast scan dim coordinate is needed "
+ "(found %i for panel %s)\n", found_fs,
+ det->panels[i].name);
dim_dim_reject = 1;
}
if ( panel_dim_dim > 1 ) {
ERROR("Maximum one placeholder dim coordinate is "
- "allowed\n");
+ "allowed (found %i for panel %s)\n",
+ panel_dim_dim, det->panels[i].name);
dim_dim_reject = 1;
}