diff options
| author | Thomas White <taw@physics.org> | 2020-06-16 16:25:20 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:44 +0200 |
| commit | 9d958b9db93e2009f403ad81fc7846036914f8fe (patch) | |
| tree | be210d70f13488710a445bf7a398167239d13fa2 /libcrystfel/src/datatemplate_priv.h | |
| parent | 43dca1cd95610a2c736e53160ecdbfb04f7a2c1e (diff) | |
Remove events.c, part 2
New event parsing, done at the last minute in image-hdf5.c
Diffstat (limited to 'libcrystfel/src/datatemplate_priv.h')
| -rw-r--r-- | libcrystfel/src/datatemplate_priv.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/libcrystfel/src/datatemplate_priv.h b/libcrystfel/src/datatemplate_priv.h index 75e9adfe..0cf2f025 100644 --- a/libcrystfel/src/datatemplate_priv.h +++ b/libcrystfel/src/datatemplate_priv.h @@ -32,6 +32,12 @@ #ifndef DATATEMPLATE_PRIV_H #define DATATEMPLATE_PRIV_H +/* Maximum number of dimensions expected in data files */ +#define MAX_DIMS (16) + +/* Maximum number of placeholders expected in path structure */ +#define MAX_PATH_PARTS (16) + enum adu_per_unit { ADU_PER_PHOTON, @@ -55,6 +61,12 @@ struct dt_rg_collection }; +/* Special values for dimension IDs */ +#define DIM_FS (-1) +#define DIM_SS (-2) +#define DIM_UNDEFINED (-3) +#define DIM_PLACEHOLDER (-4) + /** * Represents one panel of a detector */ @@ -100,11 +112,11 @@ struct panel_template /** Treat pixel as unreliable if higher than this */ double max_adu; - /** Location of data in file */ + /** Location of data in file (possibly with placeholders) */ char *data; - /** Dimension structure */ - struct dim_structure *dim_structure; + /** Dimensions (see definitions for DIM_FS etc above) */ + signed int dims[MAX_DIMS]; /** \name Transformation matrix from pixel coordinates to lab frame */ /*@{*/ @@ -177,9 +189,6 @@ struct _datatemplate struct dt_rg_collection **rigid_group_collections; int n_rg_collections; - int path_dim; - int dim_dim; - char *peak_list; struct panel_template defaults; /* FIXME: Shouldn't be stored */ |