aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/detector.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2015-07-07 11:01:47 +0200
committerThomas White <taw@physics.org>2015-07-07 11:17:03 +0200
commitf50d2f8a6bad4e1fbac7ef078cf51471848b3b31 (patch)
tree877a6a312ab16ceef77936602da12c3211a1ac86 /libcrystfel/src/detector.c
parent0fe3d70479d6e0a8d50ac6f833b37b336233e9db (diff)
Add mask_file to geometry file, to allow bad pixel mask to be stored separately
Diffstat (limited to 'libcrystfel/src/detector.c')
-rw-r--r--libcrystfel/src/detector.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libcrystfel/src/detector.c b/libcrystfel/src/detector.c
index 9bbd4208..ae70e406 100644
--- a/libcrystfel/src/detector.c
+++ b/libcrystfel/src/detector.c
@@ -941,6 +941,9 @@ static int parse_field_for_panel(struct panel *panel, const char *key,
}
panel->mask = strdup(val);
+ } else if ( strcmp(key, "mask_file") == 0 ) {
+ panel->mask_file = strdup(val);
+
} else if ( strcmp(key, "coffset") == 0) {
panel->coffset = atof(val);
} else if ( strcmp(key, "res") == 0 ) {
@@ -1247,6 +1250,7 @@ struct detector *get_detector_geometry(const char *filename,
det->defaults.adu_per_eV = NAN;
det->defaults.max_adu = +INFINITY;
det->defaults.mask = NULL;
+ det->defaults.mask_file = NULL;
det->defaults.data = NULL;
det->defaults.dim_structure = NULL;
strncpy(det->defaults.name, "", 1023);