aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/detector.h
diff options
context:
space:
mode:
Diffstat (limited to 'libcrystfel/src/detector.h')
-rw-r--r--libcrystfel/src/detector.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h
index 65865da7..3fa3c141 100644
--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -10,8 +10,8 @@
* Authors:
* 2009-2014 Thomas White <taw@physics.org>
* 2011-2012 Richard Kirian <rkirian@asu.edu>
- * 2011 Andrew Aquila
* 2014 Valerio Mariani
+ * 2011 Andrew Aquila
*
* This file is part of CrystFEL.
*
@@ -42,6 +42,7 @@ struct detector;
struct panel;
struct badregion;
struct detector;
+struct hdfile;
#include "hdf5-file.h"
#include "image.h"
@@ -90,6 +91,8 @@ struct panel
double max_adu; /* Treat pixel as unreliable if higher than this */
char *data;
+ struct dim_structure *dim_structure;
+
double fsx;
double fsy;
double ssx;
@@ -158,6 +161,9 @@ struct detector
double furthest_in_fs;
double furthest_in_ss;
+ int path_dim;
+ int dim_dim;
+
struct panel defaults;
};
@@ -189,7 +195,8 @@ extern void get_pixel_extents(struct detector *det,
double *min_x, double *min_y,
double *max_x, double *max_y);
-extern void fill_in_values(struct detector *det, struct hdfile *f);
+extern void fill_in_values(struct detector *det, struct hdfile *f,
+ struct event* ev);
extern struct detector *copy_geom(const struct detector *in);