Skip to content

Commit 2602adc

Browse files
committed
Ben's comments
1 parent 1e48070 commit 2602adc

6 files changed

Lines changed: 32 additions & 31 deletions

File tree

simpeg_drivers-assets/uijson/fdem_forward.ui.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131
"label": "Receivers orientation",
3232
"tooltip": [
33-
"Receivers orientation provided as 'Dip direction & dip' data group. If not provided, it assumes: <dl>",
33+
"Receivers orientation provided as 'Dip direction & dip' or '3D vector' data group. If not provided, it assumes: <dl>",
3434
"<dt>In-line component</dt><dd>Positive towards North (Y).</dd>",
3535
"<dt>Cross-line component</dt><dd>Positive towards East (X).</dd>",
3636
"<dt>Vertical component</dt><dd>Positive up (Z).</dd>",

simpeg_drivers-assets/uijson/fdem_inversion.ui.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
],
3131
"label": "Receivers orientation",
3232
"tooltip": [
33-
"Receivers orientation provided as 'Dip direction & dip' data group. If not provided, it assumes: <dl>",
33+
"Receivers orientation provided as 'Dip direction & dip' or '3D vector' data group. If not provided, it assumes: <dl>",
3434
"<dt>In-line component</dt><dd>Positive towards North (Y).</dd>",
3535
"<dt>Cross-line component</dt><dd>Positive towards East (X).</dd>",
3636
"<dt>Vertical component</dt><dd>Positive up (Z).</dd>",

simpeg_drivers-assets/uijson/tdem_forward.ui.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
],
3232
"label": "Receivers orientation",
3333
"tooltip": [
34-
"Receivers orientation provided as 'Dip direction & dip' data group. If not provided, it assumes: <dl>",
34+
"Receivers orientation provided as 'Dip direction & dip' or '3D vector' data group. If not provided, it assumes: <dl>",
3535
"<dt>In-line component</dt><dd>Positive towards North (Y).</dd>",
3636
"<dt>Cross-line component</dt><dd>Positive towards East (X).</dd>",
3737
"<dt>Vertical component</dt><dd>Positive up (Z).</dd>",

simpeg_drivers-assets/uijson/tdem_inversion.ui.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
],
3232
"label": "Receivers orientation",
3333
"tooltip": [
34-
"Receivers orientation provided as 'Dip direction & dip' data group. If not provided, it assumes: <dl>",
34+
"Receivers orientation provided as 'Dip direction & dip' or '3D vector' data group. If not provided, it assumes: <dl>",
3535
"<dt>In-line component</dt><dd>Positive towards North (Y).</dd>",
3636
"<dt>Cross-line component</dt><dd>Positive towards East (X).</dd>",
3737
"<dt>Vertical component</dt><dd>Positive up (Z).</dd>",

simpeg_drivers/electromagnetics/frequency_domain/options.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ class FDEMForwardOptions(BaseForwardOptions, BaseFDEMOptions):
8888
:param receivers_orientation: Orientation of the receivers provided as a group.
8989
:param z_real_channel_bool: Vertical (real) component of impedance channel boolean.
9090
:param z_imag_channel_bool: Vertical (imaginary) component of impedance channel boolean.
91-
:param x_real_channel_bool: In-line (real) component of impedance channel boolean.
92-
:param x_imag_channel_bool: In-line (imaginary) component of impedance channel boolean.
93-
:param y_real_channel_bool: Cross-line (real) component of impedance channel boolean.
94-
:param y_imag_channel_bool: Cross-line (imaginary) component of impedance channel
91+
:param y_real_channel_bool: In-line (real) component of impedance channel boolean.
92+
:param y_imag_channel_bool: In-line (imaginary) component of impedance channel boolean.
93+
:param x_real_channel_bool: Cross-line (real) component of impedance channel boolean.
94+
:param x_imag_channel_bool: Cross-line (imaginary) component of impedance channel
9595
:param models: Specify whether the models are provided in resistivity or conductivity.
9696
"""
9797

@@ -109,10 +109,10 @@ class FDEMForwardOptions(BaseForwardOptions, BaseFDEMOptions):
109109
receivers_orientation: PropertyGroup | None = None
110110
z_real_channel_bool: bool = False
111111
z_imag_channel_bool: bool = False
112-
x_real_channel_bool: bool = False
113-
x_imag_channel_bool: bool = False
114112
y_real_channel_bool: bool = False
115113
y_imag_channel_bool: bool = False
114+
x_real_channel_bool: bool = False
115+
x_imag_channel_bool: bool = False
116116
models: ConductivityModelOptions
117117

118118

@@ -124,14 +124,14 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions):
124124
:param z_real_uncertainty: Vertical (real) impedance uncertainty channel.
125125
:param z_imag_channel: Vertical (imaginary) impedance channel.
126126
:param z_imag_uncertainty: Vertical (imaginary) impedance uncertainty channel.
127-
:param x_real_channel: In-line (real) impedance channel.
128-
:param x_real_uncertainty: In-line (real) impedance uncertainty channel.
129-
:param x_imag_channel: In-line (imaginary) impedance channel.
130-
:param x_imag_uncertainty: In-line (imaginary) impedance uncertainty channel
131-
:param y_real_channel: Cross-line (real) impedance channel.
132-
:param y_real_uncertainty: Cross-line (real) impedance uncertainty channel.
133-
:param y_imag_channel: Cross-line (imaginary) impedance channel.
134-
:param y_imag_uncertainty: Cross-line (imaginary) impedance uncertainty channel
127+
:param y_real_channel: In-line (real) impedance channel.
128+
:param y_real_uncertainty: In-line (real) impedance uncertainty channel.
129+
:param y_imag_channel: In-line (imaginary) impedance channel.
130+
:param y_imag_uncertainty: In-line (imaginary) impedance uncertainty channel
131+
:param x_real_channel: Cross-line (real) impedance channel.
132+
:param x_real_uncertainty: Cross-line (real) impedance uncertainty channel.
133+
:param x_imag_channel: Cross-line (imaginary) impedance channel.
134+
:param x_imag_uncertainty: Cross-line (imaginary) impedance uncertainty channel
135135
:param models: Specify whether the models are provided in resistivity or conductivity.
136136
"""
137137

@@ -151,14 +151,14 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions):
151151
z_real_uncertainty: PropertyGroup | None = None
152152
z_imag_channel: PropertyGroup | None = None
153153
z_imag_uncertainty: PropertyGroup | None = None
154-
x_real_channel: PropertyGroup | None = None
155-
x_real_uncertainty: PropertyGroup | None = None
156-
x_imag_channel: PropertyGroup | None = None
157-
x_imag_uncertainty: PropertyGroup | None = None
158154
y_real_channel: PropertyGroup | None = None
159155
y_real_uncertainty: PropertyGroup | None = None
160156
y_imag_channel: PropertyGroup | None = None
161157
y_imag_uncertainty: PropertyGroup | None = None
158+
x_real_channel: PropertyGroup | None = None
159+
x_real_uncertainty: PropertyGroup | None = None
160+
x_imag_channel: PropertyGroup | None = None
161+
x_imag_uncertainty: PropertyGroup | None = None
162162

163163
models: ConductivityModelOptions
164164

simpeg_drivers/electromagnetics/time_domain/options.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ class TDEMForwardOptions(BaseTDEMOptions, BaseForwardOptions):
7676
"""
7777
Time Domain Electromagnetic forward options.
7878
79-
:param z_channel_bool: Z-component data channel boolean.
80-
:param x_channel_bool: X-component data channel boolean.
81-
:param y_channel_bool: Y-component data channel boolean.
79+
:param z_channel_bool: Vertical data channel boolean.
80+
:param y_channel_bool: In-line data channel boolean.
81+
:param x_channel_bool: Cross-line data channel boolean.
8282
"""
8383

8484
name: ClassVar[str] = "Time Domain Electromagnetics Forward"
@@ -105,10 +105,10 @@ class TDEMInversionOptions(BaseTDEMOptions, BaseInversionOptions):
105105
106106
:param z_channel: Z-component data channel.
107107
:param z_uncertainty: Z-component data channel uncertainty.
108-
:param x_channel: X-component data channel.
109-
:param x_uncertainty: X-component data channel uncertainty.
110-
:param y_channel: Y-component data channel.
111-
:param y_uncertainty: Y-component data channel uncertainty.
108+
:param y_channel: In-line data channel.
109+
:param y_uncertainty: In-line data channel uncertainty.
110+
:param x_channel: Cross-line data channel.
111+
:param x_uncertainty: Cross-line data channel uncertainty.
112112
"""
113113

114114
name: ClassVar[str] = "Time Domain Electromagnetics Inversion"
@@ -125,8 +125,9 @@ class TDEMInversionOptions(BaseTDEMOptions, BaseInversionOptions):
125125
receivers_orientation: PropertyGroup | None = None
126126
z_channel: PropertyGroup | None = None
127127
z_uncertainty: PropertyGroup | None = None
128-
x_channel: PropertyGroup | None = None
129-
x_uncertainty: PropertyGroup | None = None
130128
y_channel: PropertyGroup | None = None
131129
y_uncertainty: PropertyGroup | None = None
130+
x_channel: PropertyGroup | None = None
131+
x_uncertainty: PropertyGroup | None = None
132+
132133
models: ConductivityModelOptions

0 commit comments

Comments
 (0)