Fix solution analysis result data type (OpenwaterHealth#242)

Author: ebrahimebrahim

src/openlifu/plan/solution.py

@@ -212,7 +212,7 @@ def analyze(self, transducer: Transducer, options: SolutionAnalysisOptions = Sol
             solution_analysis.p0_Pa += [np.max(p0_Pa)]
         solution_analysis.TIC = np.mean(TIC)
         solution_analysis.power_W = np.mean(power_W)
-        solution_analysis.MI = solution_analysis.mainlobe_pnp_MPa/np.sqrt(self.pulse.frequency*1e-6)
+        solution_analysis.MI = (solution_analysis.mainlobe_pnp_MPa/np.sqrt(self.pulse.frequency*1e-6)).item()
         solution_analysis.global_ispta_mWcm2 = float((ita_mWcm2*z_mask).max())
         return solution_analysis
 

tests/test_solution.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from dataclasses import fields
 from datetime import datetime, timedelta
 from pathlib import Path
 
@@ -55,17 +56,17 @@ def example_solution() -> Solution:
             {
                 'p_min': xa.DataArray(
                     data=rng.random((1, 3, 2, 3)),
-                    dims=["focal_point_index", "x", "y", "z"],
+                    dims=["focal_point_index", "lat", "ele", "ax"],
                     attrs={'units': "Pa"}
                 ),
                 'p_max': xa.DataArray(
                     data=rng.random((1, 3, 2, 3)),
-                    dims=["focal_point_index", "x", "y", "z"],
+                    dims=["focal_point_index", "lat", "ele", "ax"],
                     attrs={'units': "Pa"}
                 ),
                 'intensity': xa.DataArray(
                     data=rng.random((1, 3, 2, 3)),
-                    dims=["focal_point_index", "x", "y", "z"],
+                    dims=["focal_point_index", "lat", "ele", "ax"],
                     attrs={'units': "W/cm^2"}
                 )
             },
@@ -136,6 +137,17 @@ def test_json_serialize_deserialize_solution_analysis(compact_representation: bo
     analysis_reconstructed = SolutionAnalysis.from_json(analysis_json)
     assert dataclasses_are_equal(analysis_reconstructed, analysis)
 
+def test_solution_analyze_data_types(example_solution:Solution, example_transducer:Transducer):
+    """Test that solution analysis field are all floats or lists of floats as expected"""
+    analysis = example_solution.analyze(example_transducer)
+    for f in fields(analysis):
+        value = getattr(analysis, f.name)
+        if not isinstance(value, float):
+            assert isinstance(value, list)
+            if len(value) > 0:
+                assert isinstance(value[0], float)
+
+
 def test_solution_created_date():
     """Test that created date is recent when a solution is created."""
     tolerance = timedelta(seconds=2)