From bd866b186dcfe583bc49d92e0a6ef207e5d101fe Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 22 Jul 2025 14:39:18 -0700 Subject: [PATCH 1/3] Change tooltip and options in uijson --- .../uijson/tdem1d_forward.ui.json | 14 ++++++++++---- .../uijson/tdem1d_inversion.ui.json | 16 +++++++++++----- .../uijson/tdem_forward.ui.json | 14 ++++++++++---- .../uijson/tdem_inversion.ui.json | 16 +++++++++++----- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index 268f84e3..77179a05 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -22,14 +22,20 @@ }, "data_units": { "choiceList": [ - "dB/dt (T/s)", - "B (T)", - "H (A/m)" + "Airborne dB/dt (V/Am^4)", + "Airborne B (T/Am^2)", + "Ground dB/dt (V/Am^2)", + "Ground B (T/A)" ], "group": "Survey", "main": true, "label": "Data type", - "tooltip": "Set the units of the data", + "tooltip": [ + "Set the units of the data.
", + "Expects normalization by the source.
", + "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", + "
Ground data
Data must be normalized by the current and number of turns.
" + ], "value": "dB/dt (T/s)" }, "z_channel_bool": { diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 2784d7d1..c0396c62 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -22,14 +22,20 @@ }, "data_units": { "choiceList": [ - "dB/dt (T/s)", - "B (T)", - "H (A/m)" + "Airborne dB/dt (V/Am^4)", + "Airborne B (T/Am^2)", + "Ground dB/dt (V/Am^2)", + "Ground B (T/A)" ], - "group": "Data", + "group": "Survey", "main": true, "label": "Data type", - "tooltip": "Set the units of the data", + "tooltip": [ + "Set the units of the data.
", + "Expects normalization by the source.
", + "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", + "
Ground data
Data must be normalized by the current and number of turns.
" + ], "value": "dB/dt (T/s)" }, "z_channel": { diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index 0625bec0..e35f483a 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -22,14 +22,20 @@ }, "data_units": { "choiceList": [ - "dB/dt (T/s)", - "B (T)", - "H (A/m)" + "Airborne dB/dt (V/Am^4)", + "Airborne B (T/Am^2)", + "Ground dB/dt (V/Am^2)", + "Ground B (T/A)" ], "group": "Survey", "main": true, "label": "Data type", - "tooltip": "Set the units of the data", + "tooltip": [ + "Set the units of the data.
", + "Expects normalization by the source.
", + "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", + "
Ground data
Data must be normalized by the current and number of turns.
" + ], "value": "dB/dt (T/s)" }, "z_channel_bool": { diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 7d0b53b6..5f896f32 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -22,14 +22,20 @@ }, "data_units": { "choiceList": [ - "dB/dt (T/s)", - "B (T)", - "H (A/m)" + "Airborne dB/dt (V/Am^4)", + "Airborne B (T/Am^2)", + "Ground dB/dt (V/Am^2)", + "Ground B (T/A)" ], - "group": "Data", + "group": "Survey", "main": true, "label": "Data type", - "tooltip": "Set the units of the data", + "tooltip": [ + "Set the units of the data.
", + "Expects normalization by the source.
", + "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", + "
Ground data
Data must be normalized by the current and number of turns.
" + ], "value": "dB/dt (T/s)" }, "z_channel": { From 3e55749094b964d0e35be32e5b308f703e28a6b6 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 22 Jul 2025 14:40:22 -0700 Subject: [PATCH 2/3] Adjust code for changes --- simpeg_drivers/components/data.py | 2 +- simpeg_drivers/components/factories/receiver_factory.py | 4 ++-- simpeg_drivers/electromagnetics/time_domain/options.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index 836c17e9..e28d2a7b 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -302,7 +302,7 @@ def get_normalizations(self): ) elif ( "tdem" in self.params.inversion_type - and self.params.data_units == "dB/dt (T/s)" + and "dB/dt" in self.params.data_units ): if comp in ["x", "y", "z"]: normalizations[chan][comp] = -1 diff --git a/simpeg_drivers/components/factories/receiver_factory.py b/simpeg_drivers/components/factories/receiver_factory.py index 9a052329..1649ad25 100644 --- a/simpeg_drivers/components/factories/receiver_factory.py +++ b/simpeg_drivers/components/factories/receiver_factory.py @@ -71,9 +71,9 @@ def concrete_object(self): elif "tdem" in self.factory_type: from simpeg.electromagnetics.time_domain import receivers - if self.params.data_units == "dB/dt (T/s)": + if "dB/dt" in self.params.data_units: return receivers.PointMagneticFluxTimeDerivative - elif self.params.data_units == "B (T)": + elif "B (T" in self.params.data_units: return receivers.PointMagneticFluxDensity else: return receivers.PointMagneticField diff --git a/simpeg_drivers/electromagnetics/time_domain/options.py b/simpeg_drivers/electromagnetics/time_domain/options.py index 2010e1e9..9ff341b6 100644 --- a/simpeg_drivers/electromagnetics/time_domain/options.py +++ b/simpeg_drivers/electromagnetics/time_domain/options.py @@ -41,10 +41,10 @@ class BaseTDEMOptions(EMDataMixin): :param data_object: The data object containing the TDEM data. :param physical_property: The physical property being modeled (e.g., conductivity). - :param data_units: The units of the TDEM data (e.g., "dB/dt (T/s)"). + :param data_units: The units of the TDEM data (e.g., "Airborne dB/dt (V/Am^4)"). """ - data_units: str = "dB/dt (T/s)" + data_units: str = "Airborne dB/dt (V/Am^4)" @property def unit_conversion(self): From 7daaccb94708852474b2f3a440eac1e1ef2675b3 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 22 Jul 2025 15:06:50 -0700 Subject: [PATCH 3/3] New edits to tooltip from scott --- simpeg_drivers-assets/uijson/tdem1d_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json | 6 +++--- simpeg_drivers-assets/uijson/tdem_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/tdem_inversion.ui.json | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index 77179a05..6ea47fa4 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -32,9 +32,9 @@ "label": "Data type", "tooltip": [ "Set the units of the data.
", - "Expects normalization by the source.
", - "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", - "
Ground data
Data must be normalized by the current and number of turns.
" + "Data are expected to be normalized by the source strength, dependent on the type:
", + "
Dipole
Current * area * number of turns (NIA).
", + "
Wire
Current * number of turns (NI).
" ], "value": "dB/dt (T/s)" }, diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index c0396c62..76e6853a 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -32,9 +32,9 @@ "label": "Data type", "tooltip": [ "Set the units of the data.
", - "Expects normalization by the source.
", - "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", - "
Ground data
Data must be normalized by the current and number of turns.
" + "Data are expected to be normalized by the source strength, dependent on the type:
", + "
Dipole
Current * area * number of turns (NIA).
", + "
Wire
Current * number of turns (NI).
" ], "value": "dB/dt (T/s)" }, diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index e35f483a..2680658e 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -32,9 +32,9 @@ "label": "Data type", "tooltip": [ "Set the units of the data.
", - "Expects normalization by the source.
", - "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", - "
Ground data
Data must be normalized by the current and number of turns.
" + "Data are expected to be normalized by the source strength, dependent on the type:
", + "
Dipole
Current * area * number of turns (NIA).
", + "
Wire
Current * number of turns (NI).
" ], "value": "dB/dt (T/s)" }, diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 5f896f32..b7a524b1 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -32,9 +32,9 @@ "label": "Data type", "tooltip": [ "Set the units of the data.
", - "Expects normalization by the source.
", - "
Airborne data
Data must be normalized by the transmitter moment (Am^2).
", - "
Ground data
Data must be normalized by the current and number of turns.
" + "Data are expected to be normalized by the source strength, dependent on the type:
", + "
Dipole
Current * area * number of turns (NIA).
", + "
Wire
Current * number of turns (NI).
" ], "value": "dB/dt (T/s)" },