Add review suggestions (#230)

Adds suggestions made in [a review of SlicerOpenLIFU
PR#250](#250 (review))

Author: arhowe00

notebooks/test_solution_analysis.py

@@ -13,6 +13,8 @@
 # ---
 from __future__ import annotations
 
+import numpy as np
+
 from openlifu.bf import Pulse, Sequence, apod_methods, focal_patterns
 from openlifu.geo import Point
 from openlifu.plan import Protocol
@@ -27,7 +29,7 @@
 focal_pattern = focal_patterns.SinglePoint(target_pressure=1.2e6)
 focal_pattern = focal_patterns.Wheel(center=False, spoke_radius=5, num_spokes=3, target_pressure=1.2e6)
 apod_method = apod_methods.MaxAngle(30)
-sim_setup = SimSetup(x_extent=[-30,30], y_extent=[-30,30], z_extent=[-4,70])
+sim_setup = SimSetup(x_extent=(-30,30), y_extent=(-30,30), z_extent=(-4,70))
 protocol = Protocol(
     id='test_protocol',
     name='Test Protocol',
@@ -37,7 +39,7 @@
     apod_method=apod_method,
     sim_setup=sim_setup)
 
-target = Point(position=(0,0,50), units="mm", radius=2)
+target = Point(position=np.array([0, 0, 50]), units="mm", radius=2)
 trans = Transducer.gen_matrix_array(nx=8, ny=8, pitch=4, kerf=0.5, id="m3", name="openlifu", impulse_response=1e6/10)
 # -
 
@@ -48,12 +50,14 @@
     scale=True)
 
 pc = {"MI":ParameterConstraint('<', 1.8, 1.85), "TIC":ParameterConstraint('<', 2.0), 'global_isppa_Wcm2':ParameterConstraint('within', error_value=(49, 190))}
-scaled_analysis.to_table(constraints=pc).set_index('Param')[['Value', 'Units', 'Status']]
+if scaled_analysis is not None:
+    scaled_analysis.to_table(constraints=pc).set_index('Param')[['Value', 'Units', 'Status']]
 
 protocol = Protocol.from_file('../tests/resources/example_db/protocols/example_protocol/example_protocol.json')
 solution, sim_res, analysis = protocol.calc_solution(
     target=target,
     transducer=trans,
     simulate=True,
     scale=True)
-analysis.to_table().set_index('Param')[['Value', 'Units', 'Status']]
+if analysis is not None:
+    analysis.to_table().set_index('Param')[['Value', 'Units', 'Status']]

src/openlifu/plan/solution.py

@@ -99,7 +99,7 @@ def num_foci(self) -> int:
     def analyze(self,
                 transducer: Transducer,
                 options: SolutionAnalysisOptions = SolutionAnalysisOptions(),
-                param_constraints: Dict[str,ParameterConstraint]|None = None) -> SolutionAnalysis:
+                param_constraints: Dict[str,ParameterConstraint] | None = None) -> SolutionAnalysis:
         """Analyzes the treatment solution.
 
         Args:

src/openlifu/plan/solution_analysis.py

@@ -101,6 +101,8 @@ def to_table(self, constraints:Dict[str,ParameterConstraint]|None=None, focus_in
             if p not in PARAM_FORMATS:
                 raise ValueError(f"Unknown parameter constraint for '{p}'. Must be one of: {list(PARAM_FORMATS.keys())}")
         for param, fmt in PARAM_FORMATS.items():
+            value_by_focus = None
+            agg_value = None
             if fmt[0] is None:
                 value_by_focus = None
                 agg_value = self.__dict__[param]