Move photon_energy to "geometry" file

1 files changed, 18 insertions, 0 deletions

diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index e5319000..9972e2ba 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -820,6 +820,15 @@ static void parse_toplevel(struct detector *det, struct beam_params *beam,
 			beam->photon_energy_from = NULL;
 		}
 
+	} else if ( strcmp(key, "photon_energy_scale") == 0 ) {
+		if ( beam == NULL ) {
+			ERROR("Geometry file contains a reference to "
+			      "photon_energy_scale, which is inappropriate in "
+			      "this situation.\n");
+		} else {
+			beam->photon_energy_scale = atof(val);
+		}
+
 	} else if ( parse_field_for_panel(&det->defaults, key, val, det) ) {
 		ERROR("Unrecognised top level field '%s'\n", key);
 	}
@@ -908,6 +917,9 @@ struct detector *get_detector_geometry(const char *filename,
 		return NULL;
 	}
 
+	beam->photon_energy = -1.0;
+	beam->photon_energy_scale = 1.0;
+
 	det->n_panels = 0;
 	det->panels = NULL;
 	det->n_bad = 0;
@@ -1247,6 +1259,12 @@ struct detector *get_detector_geometry(const char *filename,
 		}
 	}
 
+	if ( beam->photon_energy < -0.5 ) {
+		STATUS("Photon energy must be specified (note: this is now "
+		       "done in the 'geometry' file.\n");
+		reject = 1;
+	}
+
 	for ( x=0; x<=max_fs; x++ ) {
 	for ( y=0; y<=max_ss; y++ ) {
 		if ( find_panel(det, x, y) == NULL ) {