Skip to content

GEOPY-2773: Airborne FEM coaxial do not rotate transmitter, and ppm normalization needs to be ajusted #392

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 20 commits into from
May 1, 2026
Merged

GEOPY-2773: Airborne FEM coaxial do not rotate transmitter, and ppm normalization needs to be ajusted #392

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
915473a
Change normalization
domfournier Apr 20, 2026
52638a8
Merge branch 'GEOPY-1029C' into GEOPY-2773
domfournier Apr 23, 2026
9641cb4
Better indexing of frequencies in test
domfournier Apr 23, 2026
6c17a4f
Change uijson keys for fdem components
domfournier Apr 23, 2026
c47f124
Merge branch 'release/GA_4.8' into GEOPY-2773
domfournier Apr 28, 2026
10ec059
Revert components of FEM to imag and real. Deal with coplanar versus …
domfournier Apr 28, 2026
dff119c
Fix indexing and adjust test
domfournier Apr 28, 2026
0160f45
Change logic for coaxial
domfournier Apr 28, 2026
685261a
Adjust normalization, adjust rotation test
domfournier Apr 28, 2026
d9eb4ab
Update fem 1d
domfournier Apr 28, 2026
34fb8af
Update docstrings
domfournier Apr 28, 2026
dc2c9e0
Change coaxial to y component
domfournier Apr 29, 2026
c7dd2d9
Docstrings
domfournier Apr 29, 2026
21aac22
Re-lock
domfournier May 1, 2026
10c4316
Re-lock after simpeg merge
domfournier May 1, 2026
9fd882d
Test re-lock
domfournier May 1, 2026
3b08f5f
Re-lock again
domfournier May 1, 2026
2856620
Try locking early
domfournier May 1, 2026
6c94be9
Re-lock on fix simpeg branch
domfournier May 1, 2026
284b017
Final relock
domfournier May 1, 2026
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
4 changes: 2 additions & 2 deletions simpeg_drivers-assets/uijson/fdem1d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
],
"value": ""
},
"z_imag_channel_bool": {
"vertical_imag_channel_bool": {
"group": "Survey",
"main": true,
"label": "Vertical (imaginary)",
"tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided",
"value": true
},
"z_real_channel_bool": {
"vertical_real_channel_bool": {
"group": "Survey",
"main": true,
"label": "Vertical (real)",
Expand Down
12 changes: 6 additions & 6 deletions simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"value": ""
},
"z_imag_channel": {
"vertical_imag_channel": {
"association": [
"Cell",
"Vertex"
Expand All @@ -32,7 +32,7 @@
"enabled": true,
"value": ""
},
"z_imag_uncertainty": {
"vertical_imag_uncertainty": {
"association": [
"Cell",
"Vertex"
Expand All @@ -43,12 +43,12 @@
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "z_imag_channel",
"dependency": "vertical_imag_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
},
"z_real_channel": {
"vertical_real_channel": {
"association": [
"Cell",
"Vertex"
Expand All @@ -64,7 +64,7 @@
"enabled": true,
"value": ""
},
"z_real_uncertainty": {
"vertical_real_uncertainty": {
"association": [
"Cell",
"Vertex"
Expand All @@ -75,7 +75,7 @@
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "z_real_channel",
"dependency": "vertical_real_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
Expand Down
50 changes: 16 additions & 34 deletions simpeg_drivers-assets/uijson/fdem_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,46 +38,28 @@
"parent": "data_object",
"value": ""
},
"z_imag_channel_bool": {
"imag_channel_bool": {
"group": "Survey",
"main": true,
"label": "Vertical (imaginary)",
"tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided",
"value": true
},
"z_real_channel_bool": {
"group": "Survey",
"main": true,
"label": "Vertical (real)",
"tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided",
"value": true
},
"y_imag_channel_bool": {
"group": "Survey",
"main": true,
"label": "In-line (imaginary)",
"tooltip": "In-line (u) imaginary component of the magnetic data.\nPositive towards North if no receiver orientation provided",
"value": true
},
"y_real_channel_bool": {
"group": "Survey",
"main": true,
"label": "In-line (real)",
"tooltip": "In-line (u) real component of the magnetic data.\nPositive towards North if no receiver orientation provided",
"value": true
},
"x_imag_channel_bool": {
"group": "Survey",
"main": true,
"label": "Cross-line (imaginary)",
"tooltip": "Cross-line (v) imaginary component of the magnetic data.\nPositive towards East if no receiver orientation provided",
"label": "Imaginary",
"tooltip": [
"Imaginary component of the magnetic data. If no receiver orientation provided:<dl>",
"<dt>Co-planar data are positive up along the z-axis .</dd>",
"<dt>Co-axial data are positive along North.</dd>",
"</dl>"
],
"value": true
},
"x_real_channel_bool": {
"real_channel_bool": {
"group": "Survey",
"main": true,
"label": "Cross-line (real)",
"tooltip": "Cross-line (v) real component of the magnetic data.\nPositive towards East if no receiver orientation provided",
"label": "Real",
"tooltip": [
"Real component of the magnetic data. If no receiver orientation provided:<dl>",
"<dt>Co-planar data are positive up along the z-axis .</dd>",
"<dt>Co-axial data are positive along North.</dd>",
"</dl>"
],
Comment thread
domfournier marked this conversation as resolved.
"value": true
},
"mesh": {
Expand Down
156 changes: 19 additions & 137 deletions simpeg_drivers-assets/uijson/fdem_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"parent": "data_object",
"value": ""
},
"z_imag_channel": {
"imag_channel": {
"association": [
"Cell",
"Vertex"
Expand All @@ -47,110 +47,19 @@
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Vertical (imaginary)",
"tooltip": "Vertical (w) imaginary component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided",
"parent": "data_object",
"optional": true,
"enabled": true,
"value": ""
},
"z_imag_uncertainty": {
"association": [
"Cell",
"Vertex"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "z_imag_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
},
"z_real_channel": {
"association": [
"Cell",
"Vertex"
"label": "Imaginary",
"tooltip": [
"Imaginary component of the magnetic data. If no receiver orientation provided:<dl>",
"<dt>Co-planar data are positive up along the z-axis .</dd>",
"<dt>Co-axial data are positive along North.</dd>",
"</dl>"
Comment thread
domfournier marked this conversation as resolved.
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Vertical (real)",
"tooltip": "Vertical (w) real component of the magnetic data.\nPositive up along the z-axis if no receiver orientation provided",
"parent": "data_object",
"optional": true,
"enabled": true,
"value": ""
},
"z_real_uncertainty": {
"association": [
"Cell",
"Vertex"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "z_real_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
},
"y_imag_channel": {
"association": [
"Cell",
"Vertex"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "In-line (imaginary)",
"tooltip": "In-line (u) imaginary component of the magnetic data.\nPositive towards North if no receiver orientation provided",
"parent": "data_object",
"optional": true,
"enabled": false,
"value": ""
},
"y_imag_uncertainty": {
"association": [
"Cell",
"Vertex"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "y_imag_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
},
"y_real_channel": {
"association": [
"Cell",
"Vertex"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "In-line (real)",
"tooltip": "In-line (u) real component of the magnetic data.\nPositive towards North if no receiver orientation provided",
"parent": "data_object",
"optional": true,
"enabled": false,
"value": ""
},
"y_real_uncertainty": {
"imag_uncertainty": {
"association": [
"Cell",
"Vertex"
Expand All @@ -161,28 +70,12 @@
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "y_real_channel",
"dependency": "imag_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
},
"x_imag_channel": {
"association": [
"Cell",
"Vertex"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Cross-line (imaginary)",
"tooltip": "Cross-line (v) imaginary component of the magnetic data.\nPositive towards East if no receiver orientation provided",
"parent": "data_object",
"optional": true,
"enabled": false,
"value": ""
},
"x_imag_uncertainty": {
"real_channel": {
"association": [
"Cell",
"Vertex"
Expand All @@ -191,30 +84,19 @@
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "x_imag_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
},
"x_real_channel": {
"association": [
"Cell",
"Vertex"
"label": "Real",
"tooltip": [
"Real component of the magnetic data. If no receiver orientation provided:<dl>",
"<dt>Co-planar data are positive up along the z-axis .</dd>",
"<dt>Co-axial data are positive along North.</dd>",
"</dl>"
],
"dataType": "Float",
"group": "Data",
"dataGroupType": "Multi-element",
"main": true,
"label": "Cross-line (real)",
"tooltip": "Cross-line (v) real component of the magnetic data.\nPositive towards East if no receiver orientation provided",
"parent": "data_object",
"optional": true,
"enabled": false,
"enabled": true,
"value": ""
},
"x_real_uncertainty": {
"real_uncertainty": {
"association": [
"Cell",
"Vertex"
Expand All @@ -225,7 +107,7 @@
"main": true,
"label": "Uncertainty",
"parent": "data_object",
"dependency": "x_real_channel",
"dependency": "real_channel",
"dependencyType": "enabled",
"enabled": false,
"value": ""
Expand Down
9 changes: 7 additions & 2 deletions simpeg_drivers/components/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,14 @@ def get_normalizations(self):
offsets = {
k: v * np.ones(len(self.locations)) for k, v in offsets.items()
}
normalizations[chan][comp] = (
mu0 * (-1 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6
normalizations[chan][comp] = -1 * (
mu0 * (2 / offsets[chan] ** 3 / (4 * np.pi)) / 1e6
)

# Normalization for coplanar
if not self.params.coaxial[chan]:
normalizations[chan][comp] *= 0.5

elif (
"tdem" in self.params.inversion_type
and "dB/dt" in self.params.data_units
Expand Down
19 changes: 13 additions & 6 deletions simpeg_drivers/components/factories/receiver_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@


ORIENTATION_MAP = {
"coplanar": "z",
"coaxial": "x",
"vertical": "z",
"inline": "y",
"crossline": "x",
Expand Down Expand Up @@ -164,12 +166,17 @@ def assemble_keyword_arguments(
else:
kwargs["storeProjections"] = True

if self.factory_type in ["fdem", "fdem 1d", "magnetotellurics", "tipper"]:
comp = component.split("_")[0]
kwargs["orientation"] = (
ORIENTATION_MAP[comp] if "fdem" in self.factory_type else comp[1:]
)
kwargs["component"] = component.split("_")[1]
# Channels such as txz_real or zxy_imag
if self.factory_type in ["magnetotellurics", "tipper"]:
ori, comp = component.split("_")
kwargs["orientation"] = ori[1:]
kwargs["component"] = comp

# Channels such as real
if self.factory_type in ["fdem", "fdem 1d"]:
comp, ori = component.split("_")
kwargs["orientation"] = ORIENTATION_MAP[ori]
kwargs["component"] = comp

Comment thread
domfournier marked this conversation as resolved.
if self.factory_type in ["tipper"]:
kwargs["orientation"] = kwargs["orientation"][::-1]
Expand Down
4 changes: 4 additions & 0 deletions simpeg_drivers/components/factories/source_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@ def assemble_keyword_arguments( # pylint: disable=arguments-differ

if "fdem" in self.factory_type:
kwargs["location"] = locations
kwargs["orientation"] = receivers[
0
].orientation # For airborne FEM, coaxial or coplanar

if "tdem" in self.factory_type:
kwargs["location"] = locations
kwargs["waveform"] = waveform
Expand Down
Loading
Loading