From 7b8c47ebf4a4e43214aaa29c3ad12c42391e54b7 Mon Sep 17 00:00:00 2001 From: David Waterman Date: Mon, 1 Jul 2024 16:56:02 +0100 Subject: [PATCH 1/3] MZ is expected to either equal NZ, or MZ == 1 for a "volume stack" containing a single volume. --- src/dxtbx/format/FormatMRC.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dxtbx/format/FormatMRC.py b/src/dxtbx/format/FormatMRC.py index 4b84858a5..9eefb2fef 100644 --- a/src/dxtbx/format/FormatMRC.py +++ b/src/dxtbx/format/FormatMRC.py @@ -63,9 +63,12 @@ def _unpack_header(header): # For image stacks, NX==MX etc. should always be true. Assert this # to ensure we fail on an MRC file of the wrong type. - assert hd["nx"] == hd["mx"] - assert hd["ny"] == hd["my"] - assert hd["nz"] == hd["mz"] + try: + assert hd["nx"] == hd["mx"] + assert hd["ny"] == hd["my"] + assert (hd["nz"] == hd["mz"]) or (hd["mz"] == 1) + except AssertionError: + raise ValueError("Unexpected data size values in the header") return hd From c211ed7bafbda68ecb2cc8ee1bacf21a6d8c31cb Mon Sep 17 00:00:00 2001 From: David Waterman Date: Mon, 1 Jul 2024 16:58:56 +0100 Subject: [PATCH 2/3] News --- newsfragments/xxx.bugfix | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 newsfragments/xxx.bugfix diff --git a/newsfragments/xxx.bugfix b/newsfragments/xxx.bugfix new file mode 100644 index 000000000..93337e3d6 --- /dev/null +++ b/newsfragments/xxx.bugfix @@ -0,0 +1,2 @@ +``FormatMRC``: relax restrictive check on the overloaded MZ header +value, which caused failures to read files where MZ == 1 From 3c3787a0c41ba2e007637deb129fb09e2f593c8b Mon Sep 17 00:00:00 2001 From: DiamondLightSource-build-server Date: Mon, 1 Jul 2024 16:01:17 +0000 Subject: [PATCH 3/3] Rename newsfragments/xxx.bugfix to newsfragments/740.bugfix --- newsfragments/{xxx.bugfix => 740.bugfix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newsfragments/{xxx.bugfix => 740.bugfix} (100%) diff --git a/newsfragments/xxx.bugfix b/newsfragments/740.bugfix similarity index 100% rename from newsfragments/xxx.bugfix rename to newsfragments/740.bugfix