aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-07-21 11:08:57 +0200
committerThomas White <taw@physics.org>2017-07-21 11:08:57 +0200
commit75b1335652f292b5a211c1ba03637d70dd5b0995 (patch)
tree7e1af408edec8290df49c6a2c502470ae6a38353 /libcrystfel
parent04f1fbddf6d416d5d8c3b59d017c10d23d2b1aa2 (diff)
Add a warning about mask_file when mask is not set
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/src/detector.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index e3b351ff..6834d4c5 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -1536,6 +1536,13 @@ struct detector *get_detector_geometry_2(const char *filename,
reject = 1;
}
+ if ( (p->mask_file != NULL) && (p->mask == NULL) ) {
+ ERROR("You have specified 'mask_file' but not 'mask'. "
+ "'mask_file' will therefore have no effect. "
+ "(panel %s)\n", p->name);
+ reject = 1;
+ }
+
/* The default rail direction */
if ( isnan(p->rail_x) ) {
p->rail_x = 0.0;