aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src
diff options
context:
space:
mode:
authorValerio Mariani <valerio.mariani@desy.de>2015-02-18 17:01:45 +0100
committerThomas White <taw@physics.org>2015-02-19 11:30:29 +0100
commit211076008e20f0ff11b54fa52eae3b34147be94f (patch)
tree8ca790a4eb6694c1386ad6d670f2b7e4e4f78c90 /libcrystfel/src
parent8c249e48398ba4b04ee087fd938a8e1e701478f6 (diff)
Stop if rigid groups and rigid group collections cannot be parsed correctly
Diffstat (limited to 'libcrystfel/src')
-rw-r--r--libcrystfel/src/detector.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index c9fb0431..482c0697 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -1572,6 +1572,7 @@ out:
if ( p == NULL ) {
ERROR("Cannot add panel to rigid group\n");
ERROR("Panel not found: %s\n", bits[pi]);
+ return NULL;
}
add_to_rigid_group(rigidgroup, p);
free(bits[pi]);
@@ -1599,7 +1600,8 @@ out:
r = find_rigid_group_by_name(det, bits[rgi]);
if ( r == NULL ) {
ERROR("Cannot add rigid group to collection\n");
- ERROR("Rigid groups not found: %s\n", bits[rgi]);
+ ERROR("Rigid group not found: %s\n", bits[rgi]);
+ return NULL;
}
add_to_rigid_group_coll(rgcollection, r);
free(bits[rgi]);