aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/detector.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2015-02-19 18:13:17 +0100
committerThomas White <taw@physics.org>2015-02-19 18:13:39 +0100
commita02de84f62b98dda371f0c5003782705e9a0588e (patch)
tree14d26e682ff20308b5724021232c51b321dcebe3 /libcrystfel/src/detector.c
parent1875d6b5ed546780a345bb4f15cf5ed7189f7b7f (diff)
get_detector_geometry(): allow beam==NULL
Diffstat (limited to 'libcrystfel/src/detector.c')
-rw-r--r--libcrystfel/src/detector.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index 482c0697..e5279f1d 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -1045,12 +1045,14 @@ static void parse_toplevel(struct detector *det, struct beam_params *beam,
det->defaults.coffset = atof(val);
} else if ( strcmp(key, "photon_energy") == 0 ) {
- if ( strncmp(val, "/", 1) == 0 ) {
- beam->photon_energy = 0.0;
- beam->photon_energy_from = strdup(val);
- } else {
- beam->photon_energy = atof(val);
- beam->photon_energy_from = NULL;
+ if ( beam != NULL ) {
+ if ( strncmp(val, "/", 1) == 0 ) {
+ beam->photon_energy = 0.0;
+ beam->photon_energy_from = strdup(val);
+ } else {
+ beam->photon_energy = atof(val);
+ beam->photon_energy_from = NULL;
+ }
}
} else if ( strcmp(key, "photon_energy_scale") == 0 ) {