diff options
| author | Thomas White <taw@physics.org> | 2021-07-08 10:34:44 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-07-08 10:34:44 +0200 |
| commit | d4b2f68c39be2399dd54d93802f190ef0413f8f3 (patch) | |
| tree | 884131fe1990824dc8a2c30f43b91e3b501b33e7 /libcrystfel | |
| parent | fdce01adf9fc5950904b644ea755760cb32ec5b2 (diff) | |
Revert "Bump stream version to 2.4"
Rationale: Although the format has technically changed, CrystFEL 0.9.1
and older do not read the "hdf5/" lines anyway. The new "header" lines
are just noise, as far as they are concerned. However, increasing the
version number causes older CrystFEL versions to reject streams written
by newer CrystFEL versions. This is inconvenient, but will be a
particular problem since CrystFEL 0.10.0 will most likely be released
without a working "geoptimiser". We therefore need to be able to use
older CrystFEL versions for refining geometry. Older versions are
perfectly capable of reading newer streams.
In general, the semantics of stream version numbers are a bit messed up,
and we need to work out what they really mean.
This reverts commit fdce01adf9fc5950904b644ea755760cb32ec5b2.
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/stream.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index a9edd6c6..09a505a7 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -56,7 +56,7 @@ /** \file stream.h */ #define LATEST_MAJOR_VERSION (2) -#define LATEST_MINOR_VERSION (4) +#define LATEST_MINOR_VERSION (3) #define AT_LEAST_VERSION(st, a, b) ((st->major_version>=(a)) \ && (st->minor_version>=(b))) @@ -1262,9 +1262,6 @@ Stream *stream_open_for_read(const char *filename) } else if ( strncmp(line, "CrystFEL stream format 2.3", 26) == 0 ) { st->major_version = 2; st->minor_version = 3; - } else if ( strncmp(line, "CrystFEL stream format 2.4", 26) == 0 ) { - st->major_version = 2; - st->minor_version = 4; } else { ERROR("Invalid stream, or stream format is too new.\n"); stream_close(st); |