diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2015-03-19 09:45:03 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2015-03-19 09:46:25 +0100 |
| commit | a3bfd1e7199cf0d366667f189ff488d6601f80e9 (patch) | |
| tree | d6b2ccb819e1d958c2a207d7c799ecbfcec0704a /libcrystfel | |
| parent | a2d166507007bc68b6e2e66cff745c44975b5baf (diff) | |
hdf5_read(): Create simple geometry
This allows unpack_panels() to be called, and hence the same data
structures to be available in the simple and geometry cases. Some
changes were necessary to hdfsee, which previously created the simple
geometery itself
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/hdf5-file.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c index 0c1ea92a..3a08884a 100644 --- a/libcrystfel/src/hdf5-file.c +++ b/libcrystfel/src/hdf5-file.c @@ -1405,8 +1405,15 @@ int hdf5_read(struct hdfile *f, struct image *image, const char *element, } image->data = buf; + if ( image->det != NULL ) { + ERROR("WARNING: hdf5_read() called with geometry structure.\n"); + } + image->det = simple_geometry(image); + if ( satcorr ) debodge_saturation(f, image); + unpack_panels(image, image->det); + if ( image->beam != NULL ) { fill_in_beam_parameters(image->beam, f, NULL, image); |