Skip to content

GEOPY-1914: Make the transmistter id name agnostic #122

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

Merged
domfournier merged 2 commits into from
Dec 13, 2024
Merged

GEOPY-1914: Make the transmistter id name agnostic #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3537b65
Assign tx_id to receiver copy
domfournier Dec 13, 2024
ad526ad
Explcit assignement of tx_id on transmitters. Augment test
domfournier Dec 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
17 changes: 15 additions & 2 deletions simpeg_drivers/components/factories/entity_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ def _build(self, inversion_data: InversionData):
cells = self.params.data_object.transmitters.cells

if getattr(self.params.data_object, "tx_id_property", None) is not None:
self.params.data_object.tx_id_property.copy(parent=entity)
tx_id = self.params.data_object.tx_id_property.copy(parent=entity)
entity.tx_id_property = tx_id

if isinstance(
self.params.data_object.transmitters,
Expand All @@ -119,13 +120,25 @@ def _build(self, inversion_data: InversionData):
self.params.data_object.transmitters
)

entity.transmitters = self.params.data_object.transmitters.copy(
transmitters = self.params.data_object.transmitters.copy(
copy_complement=False,
vertices=vertices,
cells=cells,
parent=self.params.out_group,
copy_children=False,
)

if (
getattr(self.params.data_object.transmitters, "tx_id_property", None)
is not None
):
tx_id = self.params.data_object.transmitters.tx_id_property.copy(
parent=transmitters
)
transmitters.tx_id_property = tx_id

entity.transmitters = transmitters

tx_freq = self.params.data_object.transmitters.get_data("Tx frequency")
if tx_freq:
tx_freq[0].copy(parent=entity.transmitters)
Expand Down
2 changes: 2 additions & 0 deletions tests/run_tests/driver_ground_tem_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def test_ground_tem_fwr_run(
fwr_driver = TimeDomainElectromagneticsDriver(params)

survey.transmitters.remove_cells([15])
survey.tx_id_property.name = "tx_id"
assert fwr_driver.inversion_data.survey.source_list[0].n_segments == 16

if pytest:
Expand Down Expand Up @@ -232,6 +233,7 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True):
output = get_inversion_output(
driver.params.geoh5.h5file, driver.params.out_group.uid
)
assert driver.inversion_data.entity.tx_id_property.name == "tx_id"
output["data"] = orig_dBzdt
if pytest:
check_target(output, target_run, tolerance=0.5)
Expand Down
Loading