From 4f9fba1819155ea269a40f6129703e7bf95ebdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 8 May 2025 11:29:13 -0400 Subject: [PATCH 1/6] [GEOPY-2049] rename "fem" ui.json to "fdem" for consistency consistent with tdem and fdem1d --- .../uijson/{fem_forward.ui.json => fdem_forward.ui.json} | 0 .../uijson/{fem_inversion.ui.json => fdem_inversion.ui.json} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename simpeg_drivers-assets/uijson/{fem_forward.ui.json => fdem_forward.ui.json} (100%) rename simpeg_drivers-assets/uijson/{fem_inversion.ui.json => fdem_inversion.ui.json} (100%) diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json similarity index 100% rename from simpeg_drivers-assets/uijson/fem_forward.ui.json rename to simpeg_drivers-assets/uijson/fdem_forward.ui.json diff --git a/simpeg_drivers-assets/uijson/fem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json similarity index 100% rename from simpeg_drivers-assets/uijson/fem_inversion.ui.json rename to simpeg_drivers-assets/uijson/fdem_inversion.ui.json From 1319941486c1aa59d4c3f629b492f14ffb674272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 8 May 2025 11:29:45 -0400 Subject: [PATCH 2/6] [GEOPY-2049] add 1D in title for fdem 1D --- simpeg_drivers-assets/uijson/fdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 027fda65..ae927574 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "Frequency-domain EM (FEM) Forward", + "title": "Frequency-domain EM 1D (FEM-1D) Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index bc271f69..601f5afa 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "Frequency-domain EM 1D (FEM) Inversion", + "title": "Frequency-domain EM 1D (FEM-1D) Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", From f99cc6e7f7bf7136f212cd8d176bcc88ea58379e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 8 May 2025 12:11:31 -0400 Subject: [PATCH 3/6] [GEOPY-2049] fix tests after file rename --- simpeg_drivers/electromagnetics/frequency_domain/options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers/electromagnetics/frequency_domain/options.py b/simpeg_drivers/electromagnetics/frequency_domain/options.py index d42ef380..1660f8e2 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/options.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/options.py @@ -76,7 +76,7 @@ class FDEMForwardOptions(BaseFDEMOptions, BaseForwardOptions): """ name: ClassVar[str] = "Frequency Domain Electromagnetics Forward" - default_ui_json: ClassVar[Path] = assets_path() / "uijson/fem_forward.ui.json" + default_ui_json: ClassVar[Path] = assets_path() / "uijson/fdem_forward.ui.json" inversion_type: str = "fdem" title: str = "Frequency-domain EM (FEM) Forward" @@ -96,7 +96,7 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions): """ name: ClassVar[str] = "Frequency Domain Electromagnetics Inversion" - default_ui_json: ClassVar[Path] = assets_path() / "uijson/fem_inversion.ui.json" + default_ui_json: ClassVar[Path] = assets_path() / "uijson/fdem_inversion.ui.json" inversion_type: str = "fdem" title: str = "Frequency-domain EM (FEM) Inversion" From 0b55626acae7d94a2e667640dca8c5e70279520e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 8 May 2025 12:33:44 -0400 Subject: [PATCH 4/6] [GEOPY-2049] adjust titles for 1D --- simpeg_drivers-assets/uijson/fdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index ae927574..ecb17470 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "Frequency-domain EM 1D (FEM-1D) Forward", + "title": "Frequency-domain EM (FEM) 1D Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 601f5afa..6fa187a4 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "Frequency-domain EM 1D (FEM-1D) Inversion", + "title": "Frequency-domain EM (FEM) 1D Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index 13c77384..cc9c721e 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "Time-domain EM-1D (TEM-1D) Forward", + "title": "Time-domain EM (TEM) 1D Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index dc105537..52562dd3 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "Time-domain EM-1D (TEM-1D) Inversion", + "title": "Time-domain EM (TEM) 1D Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", From 8aee4091975f38c14a9eae55b1bd2f25d01ae704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 8 May 2025 14:28:48 -0400 Subject: [PATCH 5/6] [GEOPY-2049] fix value for x,y channels in tdem 1D --- simpeg_drivers-assets/uijson/tdem1d_forward.ui.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index cc9c721e..79b03899 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -33,8 +33,8 @@ "tooltip": "Set the units of the data", "value": "dB/dt (T/s)" }, - "x_channel_bool": false, - "y_channel_bool": false, + "x_channel_bool": "", + "y_channel_bool": "", "z_channel_bool": { "group": "Survey", "main": true, From 3f0f120d49496980a9fee737deb84d0be378fc10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= Date: Thu, 8 May 2025 14:34:49 -0400 Subject: [PATCH 6/6] [GEOPY-2049] remove "SimPEG" prefix from ui.json titles --- .../uijson/joint_cross_gradient_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tile_estimator.ui.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index eee71c51..588f294d 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "SimPEG Joint Cross Gradient Inversion", + "title": "Joint Cross Gradient Inversion", "icon": "function", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 288c015b..05971524 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "SimPEG Joint Surveys Inversion", + "title": "Joint Surveys Inversion", "icon": "model", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", diff --git a/simpeg_drivers-assets/uijson/tile_estimator.ui.json b/simpeg_drivers-assets/uijson/tile_estimator.ui.json index 8957be59..41c37955 100644 --- a/simpeg_drivers-assets/uijson/tile_estimator.ui.json +++ b/simpeg_drivers-assets/uijson/tile_estimator.ui.json @@ -1,6 +1,6 @@ { "version": "0.3.0-alpha.4", - "title": "SimPEG Tile Estimation", + "title": "Tile Estimation", "icon": "", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers",