simind-python-connector 1.0.0__tar.gz → 2.0.0__tar.gz

{simind_python_connector-1.0.0/simind_python_connector.egg-info → simind_python_connector-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simind-python-connector
-Version: 1.0.0
+Version: 2.0.0
 Summary: Python SIMIND Monte Carlo connector with STIR/SIRF/PyTomography adaptors
 Author-email: Sam Porter <sam.porter.18@ucl.ac.uk>, Rebecca Gillen <rebecca.gillen.18@ucl.ac.uk>, "Efstathios (Stahis) Varzakis" <efstathios.varzakis.22@ucl.ac.uk>
 Maintainer-email: Sam Porter <sam.porter.18@ucl.ac.uk>
@@ -87,12 +87,18 @@ install a licensed SIMIND installation.
 pip install simind-python-connector
 ```
 
-Import path remains:
+Import with:
 
 ```python
 import simind_python_connector
 ```
 
+For example plotting dependencies:
+
+```bash
+pip install "simind-python-connector[examples]"
+```
+
 ### Adaptor Dependencies
 
 `SimindPythonConnector` works without SIRF/STIR/PyTomography.
@@ -168,6 +174,9 @@ and ensure SIMIND data files are available under:
 The Docker helper scripts use this layout and automatically wire SIMIND paths
 when the binary exists at `./simind/simind`.
 
+For direct local runs outside the repository helpers, make sure the SIMIND
+executable is available as `simind` on `PATH`.
+
 ## Quick Start
 ```python
 import numpy as np
@@ -268,7 +277,7 @@ bash scripts/run_container_examples.sh
 ```
 
 ## Contributing
-Please see our [Contributing Guide](CONTRIBUTING.md).
+Please see the [Contributing Guide](docs/contributing.rst).
 
 ## License
 Apache License 2.0

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/README.md

@@ -44,12 +44,18 @@ install a licensed SIMIND installation.
 pip install simind-python-connector
 ```
 
-Import path remains:
+Import with:
 
 ```python
 import simind_python_connector
 ```
 
+For example plotting dependencies:
+
+```bash
+pip install "simind-python-connector[examples]"
+```
+
 ### Adaptor Dependencies
 
 `SimindPythonConnector` works without SIRF/STIR/PyTomography.
@@ -125,6 +131,9 @@ and ensure SIMIND data files are available under:
 The Docker helper scripts use this layout and automatically wire SIMIND paths
 when the binary exists at `./simind/simind`.
 
+For direct local runs outside the repository helpers, make sure the SIMIND
+executable is available as `simind` on `PATH`.
+
 ## Quick Start
 ```python
 import numpy as np
@@ -225,7 +234,7 @@ bash scripts/run_container_examples.sh
 ```
 
 ## Contributing
-Please see our [Contributing Guide](CONTRIBUTING.md).
+Please see the [Contributing Guide](docs/contributing.rst).
 
 ## License
 Apache License 2.0

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/backends.rst

@@ -14,7 +14,7 @@ Dependency Matrix
    * - Component
      - Required dependency
    * - ``SimindPythonConnector``
-     - SIMIND only (no SIRF/STIR/PyTomography requirement)
+     - SIMIND executable on ``PATH`` (no SIRF/STIR/PyTomography requirement)
    * - ``StirSimindAdaptor``
      - STIR Python (``stir``)
    * - ``SirfSimindAdaptor``

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/changelog.rst

@@ -7,17 +7,76 @@ All notable changes to this project are documented in this file.
 
 The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_, and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
 
-Unreleased
-----------
+2.0.0 - 2026-10-09
+------------------
 
-Changed
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+- ``STIRSPECTAcquisitionDataBuilder`` no longer flips projection data along the
+  last axis.
+- Runtime-operator switches passed to ``run()`` apply to that run only. They
+  are no longer kept on the connector for later runs.
+- Each run deletes earlier outputs that share the output prefix before SIMIND
+  starts.
+- The STIR backend needs ``stirextra`` as well as ``stir``.
+- STIR/SIRF adaptors take the z voxel spacing from a different axis (see
+  Fixed). Results change for anisotropic voxels.
+- Invalid inputs now raise ``ValueError``: empty, non-finite or negative source
+  and attenuation maps, array shapes that do not match the header, and
+  ``output_prefix`` values that contain a path. Energy-window validation raises
+  ``ValueError`` instead of ``AssertionError``.
+
+Fixed
+~~~~~
+
+- The packaged ``configs/input.smc`` is now included in the wheel. SMC parsing
+  handles fixed-width fields and checks section counts.
+- STIR/SIRF adaptors read the z voxel spacing from the correct axis:
+  ``voxel_sizes()`` is ``(z, y, x)``, and raw ``get_grid_spacing()`` is
+  ``(unused, z, y, x)``.
+- Voxel-map dimension indices 76, 77, 78, 79, 81 and 82 are set correctly.
+- The executor resolves ``SIMIND_BIN`` and accepts executable paths that
+  contain spaces. The connector no longer changes the process working directory.
+- Runtime switches apply to one run only. Output prefixes cannot escape the
+  output directory. Stale outputs are removed, and ``.win``, ``.smi`` and
+  ``.dmi`` inputs are kept.
+- Energy-window validation raises ``ValueError`` instead of failing an
+  ``assert``.
+- The Interfile loader honours data offsets, strips quoted values and rejects
+  truncated or oversized payloads. The SIMIND-to-STIR converter keeps data-file
+  lines and applies the radius scale factor.
+- Attenuation utilities handle the ``rho*1000`` selector and STIR ``#`` header
+  keys, and reject unknown attenuation types.
+- Image and acquisition builders validate array shapes, split multi-energy data
+  deterministically and no longer flip images. The DICOM builder handles missing
+  timing information and 2D pixel data.
+- Backend adaptors are imported lazily, so the core package imports without
+  STIR, SIRF or PyTomography.
+
+Removed
 ~~~~~~~
 
-- Updated user-facing branding to ``simind-python-connector`` and added explicit non-affiliation
-  and external-SIMIND-install disclaimers in README/docs.
+- The legacy ``scripts/simulation.py``.
 
-[1.0.0] - 2026-03-05
---------------------
+1.0.1 - 2026-04-16
+------------------
+
+Fixed
+~~~~~
+
+- Corrected installation documentation to lead with the PyPI package install
+  path instead of editable development installs.
+- Clarified that SIMIND is an external runtime dependency and must be available
+  as ``simind`` on ``PATH`` for local connector runs.
+- Updated contributing and testing documentation to use Ruff for linting,
+  import sorting, and formatting checks.
+- Updated examples documentation to include the DICOM-driven adaptor examples.
+- Fixed the GitHub Actions coverage target after the import package rename.
+- Fixed README links and release metadata for the patch release.
+
+1.0.0 - 2026-04-16
+------------------
 
 **Breaking Changes**
 ~~~~~~~~~~~~~~~~~~~~
@@ -56,6 +115,10 @@ Added
 Changed
 ~~~~~~~
 
+- Renamed the PyPI distribution to ``simind-python-connector``.
+- Renamed the import package to ``simind_python_connector``.
+- Updated user-facing branding to ``simind-python-connector`` and added explicit non-affiliation
+  and external-SIMIND-install disclaimers in README/docs.
 - ``SimindPythonConnector`` is now the central execution path for adaptor
   workflows.
 - ``StirSimindAdaptor`` and ``SirfSimindAdaptor`` now delegate SIMIND setup/run

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/conf.py

@@ -13,7 +13,7 @@ sys.path.insert(0, os.path.abspath(".."))
 project = "simind-python-connector"
 copyright = f"{datetime.now().year}, Sam Porter, Efstathios Varzakis"
 author = "Sam Porter, Efstathios Varzakis"
-release = "1.0.0"
+release = "2.0.0"
 for dist_name in ("simind-python-connector",):
     try:
         release = importlib_metadata.version(dist_name)

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/contributing.rst

@@ -32,10 +32,9 @@ Before submitting:
     # Run all tests
     python -m pytest tests/ -v
 
-    # Check code formatting
-    black --check .
+    # Check linting and formatting
     ruff check .
-    isort --check-only .
+    ruff format --check .
 
 Documentation Updates
 ---------------------
@@ -44,5 +43,4 @@ If you make changes that affect the documentation:
 
 .. code-block:: bash
 
-    cd docs/
-    make html  # Build documentation locally
+    sphinx-build -b html docs docs/_build/html

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/examples.rst

@@ -56,6 +56,18 @@ See the following examples for comprehensive use:
    Simulate with the PyTomography adaptor and run PyTomography OSEM in one Python workflow.
    Uses ``configs/Example.yaml`` plus Y-90 runtime switches (``FI`` and ``CC``).
 
+8A. **STIR Adaptor from DICOM** - ``examples/08A_stir_adaptor_from_dicom.py``
+
+   Build a STIR adaptor workflow from DICOM-derived scanner/input data.
+
+8B. **SIRF Adaptor from DICOM** - ``examples/08B_sirf_adaptor_from_dicom.py``
+
+   Build a SIRF adaptor workflow from DICOM-derived scanner/input data.
+
+8C. **PyTomography Adaptor from DICOM** - ``examples/08C_pytomography_adaptor_from_dicom.py``
+
+   Build a PyTomography adaptor workflow from DICOM-derived scanner/input data.
+
 Running Examples
 ----------------
 
@@ -72,13 +84,16 @@ Each example can be run individually:
     python examples/07A_stir_adaptor_osem.py
     python examples/07B_sirf_adaptor_osem.py
     python examples/07C_pytomography_adaptor_osem.py
+    python examples/08A_stir_adaptor_from_dicom.py
+    python examples/08B_sirf_adaptor_from_dicom.py
+    python examples/08C_pytomography_adaptor_from_dicom.py
 
-Or run all examples sequentially:
+Or run all core Python connector examples sequentially:
 
 .. code-block:: bash
 
     cd scripts/
-    python run_all_examples.py  # Run all examples sequentially
+    python run_all_examples.py
 
 Or run one backend-specific adaptor example inside each isolated Docker image:
 
@@ -100,6 +115,9 @@ Each example creates output in its own directory under ``output/``:
 - ``output/stir_adaptor_osem/`` - STIR adaptor simulation + STIR OSEM reconstruction
 - ``output/sirf_adaptor_osem/`` - SIRF adaptor simulation + SIRF OSEM reconstruction
 - ``output/pytomography_adaptor_osem/`` - PyTomography adaptor simulation + PyTomography OSEM reconstruction
+- ``output/dicom_projection_objects/stir/`` - STIR adaptor setup from DICOM-derived inputs
+- ``output/dicom_projection_objects/sirf/`` - SIRF adaptor setup from DICOM-derived inputs
+- ``output/dicom_projection_objects/pytomography/`` - PyTomography adaptor setup from DICOM-derived inputs
 
 Each OSEM example also writes a summary plot with:
 - input source slice

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/geometry.rst

@@ -35,10 +35,11 @@ Units
 - STIR/SIRF image geometry is typically expressed in **mm**.
 - Connectors handle conversion internally via voxel-size settings (for example,
   runtime switch ``PX`` is set in cm for SIMIND).
-- STIR/SIRF adaptor voxel size extraction expects z-spacing in mm. It uses
-  ``voxel_sizes()[2]`` when available, and falls back to ``get_grid_spacing()``
-  using the last spatial element (index 3 for 4-element spacing, index 2 for
-  3-element spacing).
+- STIR/SIRF adaptor voxel size extraction expects z-spacing in mm. Images
+  report ``voxel_sizes()`` as ``(z, y, x)``, so the **first** element is the z
+  spacing. Raw ``get_grid_spacing()`` sequences follow the STIR coordinate
+  layout ``(unused, z, y, x)`` and use index 1; coordinate objects with a
+  ``z`` accessor use that accessor directly.
 
 Example Configuration Guardrails
 --------------------------------

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/index.rst

@@ -1,5 +1,5 @@
 simind-python-connector Documentation
-====================
+=====================================
 
 .. toctree::
    :maxdepth: 2

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/installation.rst

@@ -7,6 +7,8 @@ Prerequisites
 -------------
 
 - Python 3.9+
+- A separate SIMIND installation for running simulations. SIMIND is not
+  distributed with this package or installed by pip.
 - Optional backend libraries depending on workflow:
   - STIR Python for STIR-based paths
   - SIRF for SIRF-based paths
@@ -15,18 +17,34 @@ Prerequisites
 Install the Python Package
 --------------------------
 
-1. Clone the repository:
+Install the released package from PyPI:
 
-   .. code-block:: bash
+.. code-block:: bash
+
+    pip install simind-python-connector
+
+Import it with:
+
+.. code-block:: python
+
+    import simind_python_connector
+
+Install the examples extra if you want to run the plotting examples:
+
+.. code-block:: bash
+
+    pip install "simind-python-connector[examples]"
 
-      git clone https://github.com/samdporter/simind-python-connector.git
-      cd simind-python-connector
+Development Install
+-------------------
 
-2. Install in editable/development mode:
+For local development from a checkout:
 
-   .. code-block:: bash
+.. code-block:: bash
 
-      pip install -e ".[dev]"
+    git clone https://github.com/samdporter/simind-python-connector.git
+    cd simind-python-connector
+    pip install -e ".[dev,examples]"
 
 SIMIND Requirement (External Dependency)
 ----------------------------------------
@@ -48,10 +66,10 @@ documentation:
 - SIMIND manual page:
   https://www.msf.lu.se/en/research/simind-monte-carlo-program/manual
 
-Recommended Local Layout
-~~~~~~~~~~~~~~~~~~~~~~~~
+Repo/Docker Layout
+~~~~~~~~~~~~~~~~~~
 
-For the package scripts and Docker setup, place SIMIND under:
+For the repository helper scripts and Docker setup, place SIMIND under:
 
 .. code-block:: text
 
@@ -70,11 +88,19 @@ If needed, make the binary executable:
 
     chmod +x ./simind/simind
 
-Local (Non-Docker) Runtime Environment
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Local Runtime Environment
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For direct local runs, ensure the SIMIND executable is available as ``simind``
+on ``PATH``. If your SIMIND installation needs ``SMC_DIR``, set it to the
+SIMIND data directory:
+
+.. code-block:: bash
+
+    export PATH="/path/to/simind/bin:$PATH"
+    export SMC_DIR="/path/to/simind/smc_dir/"
 
-For direct local runs, ensure SIMIND is on ``PATH`` and ``SMC_DIR`` points to
-the SIMIND data directory:
+When working from this repository with the layout above, those commands become:
 
 .. code-block:: bash
 

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/testing.rst

@@ -137,31 +137,36 @@ The default CI job runs the tests that avoid heavyweight dependencies. These foc
 
 * **Conversion maths** – ``tests/test_schneider_density.py`` exercises the HU-to-density pipelines.
 * **Configuration & builders** – ``tests/test_simulation_config.py`` and ``tests/test_acquisition_builder_unit.py`` validate YAML/SMC handling plus Interfile header generation without a SIRF runtime.
-* **Utility helpers** – ``tests/test_components.py``, ``tests/test_utils.py``, and ``tests/test_utils_small.py`` cover enums, file parsing, and temporary-directory/energy-window helpers.
-* **Backend guards** – ``tests/test_backends.py`` ensures the dynamic backend selection code behaves without importing SIRF.
+* **Connector behavior** – ``tests/test_python_connector.py``, ``tests/test_connectors_base.py``, and ``tests/test_connector_backend_separation.py`` cover the connector-first API without requiring reconstruction packages.
+* **Utility helpers** – ``tests/test_utils.py``, ``tests/test_utils_small.py``, ``tests/test_interfile_parser.py``, and ``tests/test_interfile_numpy.py`` cover file parsing and small helper functions.
+* **Backend guards** – ``tests/test_backends.py``, ``tests/test_marker_policy.py``, and ``tests/test_examples_backend_separation.py`` ensure optional backend imports remain isolated.
 
-SIRF-Dependent Suites
-~~~~~~~~~~~~~~~~~~~~~
+Backend-Dependent Suites
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-Tests that construct real SIRF/STIR objects carry the ``requires_sirf`` marker and are skipped in CI. These include:
+Tests that construct real STIR/SIRF/PyTomography objects carry dependency
+markers and are skipped when those packages are unavailable. These include:
 
-* ``tests/test_simind_simulator.py`` and ``tests/test_simind_projector.py`` for the legacy projector/simulator path.
-* ``tests/test_arithmetic_operations.py`` for wrapped acquisition arithmetic.
-* ``tests/test_coordinator.py`` for the SIMIND coordinator.
-* SIRF-backed helpers in ``tests/test_utils.py`` and ``tests/test_components.py``.
+* ``tests/test_native_adaptors.py`` for STIR/SIRF adaptor behavior.
+* ``tests/test_pytomography_adaptor.py`` for PyTomography tensor and output adaptation.
+* ``tests/test_arithmetic_operations.py`` and ``tests/test_sirf_stir_utils.py`` for backend wrapper/helper behavior.
 
-CIL and Hybrid Dependencies
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+SIMIND and Container Diagnostics
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Two suites rely on additional packages:
+SIMIND-dependent tests use ``requires_simind`` and are skipped unless the
+``simind`` command is available. Container and geometry diagnostics include:
 
-* ``tests/test_cil_partitioner.py`` (``requires_sirf`` + ``requires_cil``) exercises the CIL partitioner adapter.
-* ``tests/test_step_size_rules.py`` (``requires_cil``) checks Armijo step-size helpers with lightweight stand-ins.
+* ``tests/test_integration.py`` for full workflow checks.
+* ``tests/test_container_library_isolation.py`` for backend container import isolation.
+* ``tests/test_geometry_isolation_forward_projection.py`` and ``tests/test_osem_geometry_diagnostics.py`` for backend geometry diagnostics.
 
 Integration Test
 ~~~~~~~~~~~~~~~~
 
-``tests/test_integration.py`` orchestrates a full example run and needs both SIMIND and SIRF. It is marked with ``integration``, ``requires_simind``, and ``requires_sirf``.
+``tests/test_integration.py`` orchestrates a full example run and needs
+external runtime dependencies. It is marked with dependency markers so it is
+skipped in lightweight CI environments.
 
 Configuration Files
 -------------------
@@ -223,7 +228,7 @@ Continuous Integration
 GitHub Actions is used to run tests automatically. The CI workflow:
 
 1. **Installs only basic Python dependencies** (no SIRF/SIMIND)
-2. **Runs code quality checks** (black, isort, ruff)
+2. **Runs code quality checks** (``ruff check`` and ``ruff format --check``)
 3. **Executes CI-friendly tests** using dependency markers
 4. **Generates coverage reports** for the tested code
 5. **Builds and validates the package**

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/docs/usage.rst

@@ -9,6 +9,10 @@ Quick Start
 Use ``SimindPythonConnector`` when you want direct Python control of SIMIND
 inputs/outputs without any reconstruction-package dependency.
 
+The Python package does not bundle SIMIND. Before calling ``run()``, make sure
+the SIMIND executable is available as ``simind`` on ``PATH``; see
+:doc:`installation`.
+
 .. code-block:: python
 
     import numpy as np

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simind-python-connector"
-version = "1.0.0"
+version = "2.0.0"
 description = "Python SIMIND Monte Carlo connector with STIR/SIRF/PyTomography adaptors"
 readme = "README.md"
 requires-python = ">=3.9"

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/simind_python_connector/__init__.py

@@ -14,7 +14,7 @@ for _dist_name in ("simind-python-connector", __name__):
     except _meta.PackageNotFoundError:
         continue
 else:  # editable / source checkout
-    __version__ = "1.0.0"
+    __version__ = "2.0.0"
 
 
 def __getattr__(name: str) -> Any:

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/simind_python_connector/backends/__init__.py

@@ -19,6 +19,7 @@ Usage:
 
 import importlib
 import logging
+import os
 from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 
 from .base import AcquisitionDataInterface, ImageDataInterface
@@ -233,6 +234,9 @@ def create_image_data(
     if isinstance(filepath_or_object, ImageDataInterface):
         return filepath_or_object
 
+    if isinstance(filepath_or_object, os.PathLike):
+        filepath_or_object = os.fspath(filepath_or_object)
+
     backend_hint = detect_image_backend(filepath_or_object)
     if backend_hint is None:
         backend_hint = detect_backend_from_interface(filepath_or_object)
@@ -314,6 +318,9 @@ def create_acquisition_data(
     if isinstance(filepath_or_object, AcquisitionDataInterface):
         return filepath_or_object
 
+    if isinstance(filepath_or_object, os.PathLike):
+        filepath_or_object = os.fspath(filepath_or_object)
+
     backend_hint = detect_acquisition_backend(filepath_or_object)
     if backend_hint is None:
         backend_hint = detect_backend_from_interface(filepath_or_object)

{simind_python_connector-1.0.0 → simind_python_connector-2.0.0}/simind_python_connector/builders/acquisition_builder.py

@@ -97,6 +97,19 @@ class STIRSPECTAcquisitionDataBuilder:
         else:
             self.pixel_array = np.array(self.pixel_array, dtype=np.float32)
 
+        expected_shape = (
+            1,
+            matrix_size_1,
+            num_projections,
+            matrix_size_2,
+        )
+        if self.pixel_array.shape != expected_shape:
+            raise ValueError(
+                f"pixel array shape {self.pixel_array.shape} does not match "
+                f"header dimensions {expected_shape} "
+                "(tof, bin, view, axial)"
+            )
+
         def _write(base_path: Path, cleanup: bool) -> AcquisitionData:
             header_path = base_path.with_suffix(".hs")
             raw_file_path = base_path.with_suffix(".s")
@@ -112,9 +125,8 @@ class STIRSPECTAcquisitionDataBuilder:
 
             acqdata = self._load_acquisition(str(header_path))
 
-            flipped = np.flip(self.pixel_array, axis=-1)
             acqdata = acqdata.clone()
-            acqdata.fill(flipped)
+            acqdata.fill(self.pixel_array)
             acqdata.write(str(header_path))
 
             if cleanup:
@@ -194,27 +206,50 @@ class STIRSPECTAcquisitionDataBuilder:
             acqdata = self.build(output_path=output_path_base)
             return [acqdata]
 
+        if self.pixel_array is None:
+            raise ValueError(
+                "build_multi_energy requires pixel_array to be set "
+                "(use update_header_from_dicom or set it directly)"
+            )
+
+        num_windows = len(self.energy_windows)
+        total_projections = int(self.header.get("!number of projections", 1))
+        if self.pixel_array.ndim != 4 or (
+            self.pixel_array.shape[2] != total_projections
+        ):
+            raise ValueError(
+                f"pixel array shape {self.pixel_array.shape} does not match "
+                f"declared {total_projections} projections"
+            )
+        if total_projections % num_windows != 0:
+            raise ValueError(
+                f"Number of projections ({total_projections}) must be divisible "
+                f"by the number of energy windows ({num_windows})"
+            )
+        projections_per_window = total_projections // num_windows
+
         # number of projections needs dividing by number of energy windows
-        num_projections = int(self.header.get("!number of projections", 1))
-        num_projections //= len(self.energy_windows)
-        self.header["!number of projections"] = str(num_projections)
+        self.header["!number of projections"] = str(projections_per_window)
 
         # split pixel_array into energy windows along 3rd axis
-        pixel_array_list = np.array_split(
-            self.pixel_array, len(self.energy_windows), axis=2
-        )
-
-        acqdata_list = []
-        for idx, ew in enumerate(self.energy_windows):
-            # Update header for this energy window.
-            self.header["energy window lower level[1]"] = ew["lower"]
-            self.header["energy window upper level[1]"] = ew["upper"]
-            suffix = f"_ew{idx + 1}"
-            output_path = output_path_base + suffix
-            self.pixel_array = pixel_array_list[idx]
-            acqdata = self.build(output_path=output_path)
-            acqdata_list.append(acqdata)
-        return acqdata_list
+        original_pixel_array = self.pixel_array
+        try:
+            pixel_array_list = np.array_split(original_pixel_array, num_windows, axis=2)
+
+            acqdata_list = []
+            for idx, ew in enumerate(self.energy_windows):
+                # Update header for this energy window.
+                self.header["energy window lower level[1]"] = ew["lower"]
+                self.header["energy window upper level[1]"] = ew["upper"]
+                suffix = f"_ew{idx + 1}"
+                output_path = output_path_base + suffix
+                self.pixel_array = pixel_array_list[idx]
+                acqdata = self.build(output_path=output_path)
+                acqdata_list.append(acqdata)
+            return acqdata_list
+        finally:
+            self.pixel_array = original_pixel_array
+            self.header["!number of projections"] = str(total_projections)
 
     def update_header_from_dicom(self, dicom_filepath):
         """
@@ -303,6 +338,8 @@ class STIRSPECTAcquisitionDataBuilder:
             )
 
         # Rotation Information Sequence processing
+        num_frames = ds.get("NumberOfFrames", None)
+        time_per_projection = None
         try:
             if (0x0054, 0x0052) in ds:
                 rot_seq = ds[(0x0054, 0x0052)].value
@@ -322,16 +359,17 @@ class STIRSPECTAcquisitionDataBuilder:
                             rot_item[(0x0018, 0x1242)].value / 1000
                         )
 
-                    if num_frames is not None:
+                    if time_per_projection is not None and num_frames is not None:
                         self.header["number of time frames"] = str(1)
                         self.header["!image duration (sec)[1]"] = str(
                             int(
                                 np.round(
-                                    float(time_per_projection) * float(num_frames), 0
+                                    float(time_per_projection) * float(num_frames),
+                                    0,
                                 )
                             )
                         )
-                    else:
+                    elif time_per_projection is not None:
                         self.header["!time per projection (sec)[1]"] = (
                             time_per_projection
                         )
@@ -516,11 +554,21 @@ class STIRSPECTAcquisitionDataBuilder:
         except AttributeError:
             warnings.warn("StudyDescription not found in DICOM.")
         try:
-            self.pixel_array = ds.pixel_array
-            print(self.pixel_array.shape)
-            self.pixel_array = np.transpose(self.pixel_array, (2, 0, 1))
-            # rotate the image by 90 degrees cW in axis 1
-            self.pixel_array = np.rot90(self.pixel_array, 3, axes=(0, 2))
-            self.pixel_array = np.expand_dims(self.pixel_array, axis=0)
+            raw_pixel_array = ds.pixel_array
         except AttributeError:
             warnings.warn("Pixel data not found in DICOM.")
+            return
+
+        raw_pixel_array = np.asarray(raw_pixel_array)
+        if raw_pixel_array.ndim == 2:
+            # Single frame: promote to (frames=1, rows, columns) so the
+            # transpose below sees the same layout as multiframe data.
+            raw_pixel_array = raw_pixel_array[np.newaxis, :, :]
+        elif raw_pixel_array.ndim != 3:
+            raise ValueError(
+                f"pixel data must be 2D or 3D, got {raw_pixel_array.ndim}D"
+            )
+        self.pixel_array = np.transpose(raw_pixel_array, (2, 0, 1))
+        # rotate the image by 90 degrees cW in axis 1
+        self.pixel_array = np.rot90(self.pixel_array, 3, axes=(0, 2))
+        self.pixel_array = np.expand_dims(self.pixel_array, axis=0)