From 572e378e9112f38820347fb597f9eecd3f4df90a Mon Sep 17 00:00:00 2001 From: Seth R Johnson Date: Mon, 1 Jun 2026 08:36:03 -0400 Subject: [PATCH 1/2] Just load size diagnostics as a dict, not a strict output --- celerpy/model/output.py | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/celerpy/model/output.py b/celerpy/model/output.py index 70a59d8..3d8e899 100644 --- a/celerpy/model/output.py +++ b/celerpy/model/output.py @@ -82,41 +82,6 @@ class BihMetadata(_Model): structure: Optional[list[dict]] = None -# orange/OrangeParamsOutput.hh -class UniverseIndexerSizes(_Model): - """Universe indexer sizes.""" - - surfaces: NonNegativeInt - volumes: NonNegativeInt - - -# orange/OrangeParamsOutput.hh -class OrangeSizes(_Model): - """Size properties of an ORANGE geometry.""" - - connectivity_records: NonNegativeInt - daughters: NonNegativeInt - fast_real3s: NonNegativeInt - local_surface_ids: NonNegativeInt - local_volume_ids: NonNegativeInt - logic_ints: NonNegativeInt - obz_records: NonNegativeInt - real_ids: NonNegativeInt - reals: NonNegativeInt - rect_arrays: NonNegativeInt - simple_units: NonNegativeInt - surface_types: NonNegativeInt - transforms: NonNegativeInt - univ_indices: NonNegativeInt - univ_types: NonNegativeInt - volume_ids: NonNegativeInt - volume_instance_ids: NonNegativeInt - volume_records: NonNegativeInt - - bih: BihSizes - universe_indexer: UniverseIndexerSizes - - # orange/OrangeParamsOutput.hh class OrangeParamsOutput(_Model): """ORANGE geometry data structure sizes and scalars.""" @@ -124,7 +89,7 @@ class OrangeParamsOutput(_Model): _category: Literal["internal"] _label: Literal["orange"] scalars: OrangeScalars - sizes: OrangeSizes + sizes: dict bih_metadata: BihMetadata tracking_logic: LogicNotation From 5d7da3895d4a55ee9bcb8f091c111d368e6e4509 Mon Sep 17 00:00:00 2001 From: Seth R Johnson Date: Mon, 1 Jun 2026 12:20:04 -0400 Subject: [PATCH 2/2] Strict json dict typing --- celerpy/model/output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/celerpy/model/output.py b/celerpy/model/output.py index 3d8e899..1ec781f 100644 --- a/celerpy/model/output.py +++ b/celerpy/model/output.py @@ -89,7 +89,7 @@ class OrangeParamsOutput(_Model): _category: Literal["internal"] _label: Literal["orange"] scalars: OrangeScalars - sizes: dict + sizes: dict[str, object] bih_metadata: BihMetadata tracking_logic: LogicNotation