aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel/src/detector.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-06-01 19:01:52 -0700
committerThomas White <taw@physics.org>2013-06-02 10:15:47 -0700
commit7e874c2629b8e4aa8c388d72566d6ca00673da77 (patch)
tree884d07e0172a4adfae937c33c66ddc703bd8941e /libcrystfel/src/detector.h
parent3104cf229230151e8ca158144952d474f4b61aa3 (diff)
Rigid group stuff
Diffstat (limited to 'libcrystfel/src/detector.h')
-rw-r--r--libcrystfel/src/detector.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h
index 0f9be817..b6a90fbf 100644
--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -46,6 +46,15 @@ struct hdfile;
extern "C" {
#endif
+
+struct rigid_group
+{
+ char *name;
+ struct panel **panels;
+ int n_panels;
+};
+
+
struct panel
{
char name[1024]; /* Name for this panel */
@@ -62,7 +71,7 @@ struct panel
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 */
- char *rigid_group; /* Rigid group name */
+ 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 */
@@ -106,8 +115,8 @@ struct detector
unsigned int mask_bad;
unsigned int mask_good;
- char **rigid_groups;
- int num_rigid_groups;
+ struct rigid_group **rigid_groups;
+ int n_rigid_groups;
/* Location of the pixel furthest away from the beam position, which
* will have the largest value of 2theta regardless of camera length