Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ignored acoustical_simulation_3d #251

Merged
merged 6 commits into from
Aug 13, 2024
Merged

Fix ignored acoustical_simulation_3d #251

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d7bbc7
fixed ignored acoustical_simulation_3d
faberno Oct 1, 2023
f1dcff0
Merge branch 'develop' into 223-FixAcousticSimulation3D
kdreher Jun 17, 2024
e8ad060
Merge branch 'develop' into 223-FixAcousticSimulation3D
kdreher Jul 29, 2024
6eff225
fixed 3D ignore bug
kdreher Aug 13, 2024
8ce0977
fix 3d Tag not being in settings
kdreher Aug 13, 2024
d261ab3
Merge branch 'develop' into 223-FixAcousticSimulation3D
kdreher Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...core/simulation_modules/acoustic_forward_module/acoustic_forward_module_k_wave_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import gc
import os
import subprocess
from typing import List
from typing import List

import numpy as np
import scipy.io as sio
Expand Down Expand Up @@ -99,16 +99,15 @@ def forward_model(self, detection_geometry: DetectionGeometryBase) -> np.ndarray

detectors_are_aligned_along_x_axis = field_of_view_extent[2] == 0 and field_of_view_extent[3] == 0
detectors_are_aligned_along_y_axis = field_of_view_extent[0] == 0 and field_of_view_extent[1] == 0
if detectors_are_aligned_along_x_axis or detectors_are_aligned_along_y_axis:
axes = (0, 1)
if not self.component_settings[Tags.ACOUSTIC_SIMULATION_3D] and \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd change this to the same pattern as lines 158-159 to avoid a key error.

(detectors_are_aligned_along_x_axis or detectors_are_aligned_along_y_axis):
if detectors_are_aligned_along_y_axis:
transducer_plane = int(round((detector_positions_mm[0, 0] / self.global_settings[Tags.SPACING_MM]))) - 1
image_slice = np.s_[transducer_plane, :, :]
else:
transducer_plane = int(round((detector_positions_mm[0, 1] / self.global_settings[Tags.SPACING_MM]))) - 1
image_slice = np.s_[:, transducer_plane, :]
else:
axes = (0, 2)
image_slice = np.s_[:]

data_dict[Tags.DATA_FIELD_SPEED_OF_SOUND] = data_dict[Tags.DATA_FIELD_SPEED_OF_SOUND][image_slice].T
Expand Down Expand Up @@ -156,7 +155,8 @@ def k_wave_acoustic_forward_model(self, detection_geometry: DetectionGeometryBas
field_of_view = pa_device.get_field_of_view_mm()
detector_positions_mm = pa_device.get_detector_element_positions_accounting_for_device_position_mm()

if not self.component_settings.get(Tags.ACOUSTIC_SIMULATION_3D):
if not (Tags.ACOUSTIC_SIMULATION_3D in self.component_settings
and self.component_settings[Tags.ACOUSTIC_SIMULATION_3D]):
detectors_are_aligned_along_x_axis = np.abs(field_of_view[2] - field_of_view[3]) < 1e-5
detectors_are_aligned_along_y_axis = np.abs(field_of_view[0] - field_of_view[1]) < 1e-5
if detectors_are_aligned_along_x_axis or detectors_are_aligned_along_y_axis:
Expand Down
Loading