aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/detector.h
diff options
context:
space:
mode:
authorValerio Mariani <valerio.mariani@desy.de>2014-03-19 10:28:55 +0100
committerThomas White <taw@physics.org>2014-09-05 18:00:53 +0200
commitc7e4b7acbd624723c5973431c0101fe92bc3089d (patch)
tree2fd1caf4fc02280bbfb05e37538731985dd97c12 /libcrystfel/src/detector.h
parent985efc49f5ccdd47ffe37e195970afb6fc289edd (diff)
Refactoring of hdf5 reading and writing functions
Diffstat (limited to 'libcrystfel/src/detector.h')
-rw-r--r--libcrystfel/src/detector.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h
index 157c2edf..fcd44ed2 100644
--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -80,12 +80,14 @@ struct panel
double coffset;
double clen; /* Camera length in metres */
char *clen_from;
+ char *mask;
double res; /* Resolution in pixels per metre */
char badrow; /* 'x' or 'y' */
int no_index; /* Don't index peaks in this panel if non-zero */
struct rigid_group *rigid_group; /* Rigid group */
double adu_per_eV; /* Number of ADU per eV */
double max_adu; /* Treat pixel as unreliable if higher than this */
+ char *data_from;
double fsx;
double fsy;
@@ -97,6 +99,11 @@ struct panel
double xss;
double yss;
+ int orig_min_fs;
+ int orig_max_fs;
+ int orig_min_ss;
+ int orig_max_ss;
+
int w; /* Width, calculated as max_fs-min_fs+1 */
int h; /* Height, calculated as max_ss-min_ss+1 */
};
@@ -132,7 +139,6 @@ struct detector
struct badregion *bad;
int n_bad;
- char *mask;
unsigned int mask_bad;
unsigned int mask_good;