debugged image type validation in siemens raw data files

Author: tclose

fileformats/medimage/raw/pet/siemens.py

@@ -63,7 +63,9 @@ def image_type(self) -> str:
                     f"Image type of {self} ({image_type!r}) does not match expected "
                     f"({self.expected_image_type!r})"
                 )
-        return image_type
+            return image_type
+        assert isinstance(self._image_type_seq[-1], str)
+        return self._image_type_seq[-1]
 
     @mtime_cached_property
     def _image_type_seq(self) -> ty.List[str]:
@@ -130,29 +132,29 @@ def dicom_header_limits(self) -> ty.Tuple[int, int]:  # type: ignore[override]
 
 
 class Vnd_Siemens_Biograph128Vision_Vr20b_PetListMode(
-    Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData, PetListMode
+    Vnd_Siemens_Biograph128Vision_Vr20b_LargePetRawData, PetListMode
 ):
     expected_image_type = "PET_LISTMODE"
 
 
 class Vnd_Siemens_Biograph128Vision_Vr20b_PetSinogram(
-    Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData, PetSinogram
+    Vnd_Siemens_Biograph128Vision_Vr20b_LargePetRawData, PetSinogram
 ):
     "histogrammed projection data in a reconstruction-friendly format"
 
     expected_image_type = "PET_SINO_DYNAMIC"
 
 
 class Vnd_Siemens_Biograph128Vision_Vr20b_PetCountRate(
-    Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData, PetCountRate
+    Vnd_Siemens_Biograph128Vision_Vr20b_LargePetRawData, PetCountRate
 ):
     "number of prompt/random/single events per unit time"
 
     expected_image_type = "PET_COUNTRATE"
 
 
 class Vnd_Siemens_Biograph128Vision_Vr20b_PetNormalisation(
-    Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData, PetNormalisation
+    Vnd_Siemens_Biograph128Vision_Vr20b_LargePetRawData, PetNormalisation
 ):
     "normalisation scan or the current cross calibration factor"
 

scripts/debug_ptd_read.py

@@ -1,7 +1,9 @@
 from pathlib import Path
-from fileformats.medimage.raw import Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData
 
-ptd = Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData(
+# from fileformats.medimage.raw import Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData
+from fileformats.medimage.raw import Vnd_Siemens_Biograph128Vision_Vr20b_PetListMode
+
+ptd = Vnd_Siemens_Biograph128Vision_Vr20b_PetListMode(
     Path(
         "/Users/tclose/Data/tbp/PET_Raw_Data_0602/"
         "PHYSICS_SUV_TEST_PVE_F18.PT.PET_Onco_(Adult).602.PET_LISTMODE.2023.07.27.08.49.11.676000.2.0.2761856.ptd"
@@ -10,4 +12,13 @@
 
 mdata = ptd.metadata
 
+# ptd = Vnd_Siemens_Biograph128Vision_Vr20b_PetRawData(
+#     Path(
+#         "/Users/tclose/Data/tbp/PET_Raw_Data_0602/"
+#         "PHYSICS_SUV_TEST_PVE_F18.PT.PET_Onco_(Adult).602.PET_LISTMODE.2023.07.27.08.49.11.676000.2.0.2761856.ptd"
+#     ).expanduser()
+# )
+
+# mdata = ptd.metadata
+
 assert mdata