FormatMRC: relax MZ check (#740)

MZ is expected to either equal NZ, or MZ == 1 for a "volume stack" containing a single volume.
cctbx · Jul 10, 2024 · 4e46bec · 4e46bec
1 parent e8c2c92
commit 4e46bec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/newsfragments/740.bugfix b/newsfragments/740.bugfix
@@ -0,0 +1,2 @@
+``FormatMRC``: relax restrictive check on the overloaded MZ header
+value, which caused failures to read files where MZ == 1
diff --git 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