Skip to content

Commit bbe8968

Browse files
committed
fix ERT bugs
1 parent 7a8317b commit bbe8968

18 files changed

Lines changed: 1353 additions & 83 deletions

PyHydroGeophysX/data_processing/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,18 @@
146146
"PyHydroGeophysX.data_processing.em1d",
147147
"is_temcompany_source",
148148
),
149+
"is_ttem_source": (
150+
"PyHydroGeophysX.data_processing.ttem",
151+
"is_ttem_source",
152+
),
149153
"load_temcompany_sounding": (
150154
"PyHydroGeophysX.data_processing.em1d",
151155
"load_temcompany_sounding",
152156
),
157+
"load_ttem_sounding": (
158+
"PyHydroGeophysX.data_processing.ttem",
159+
"load_ttem_sounding",
160+
),
153161
"load_sounding": ("PyHydroGeophysX.data_processing.em1d", "load_sounding"),
154162
"load_line_geometry": (
155163
"PyHydroGeophysX.data_processing.em1d",

PyHydroGeophysX/data_processing/em1d.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import numpy as np
1212

1313
from PyHydroGeophysX.data_processing import table_io
14+
from PyHydroGeophysX.data_processing.ttem import is_ttem_source, load_ttem_sounding
1415

1516
TEMCOMPANY_MOMENTS = ("LM+HM", "HM", "LM")
1617

@@ -738,6 +739,8 @@ def load_temcompany_sounding(
738739
def load_sounding(
739740
path: str, method: str, sounding: int = 0, *, moment: str = "HM",
740741
use_flags: bool = True, max_relative_std: Optional[float] = None,
742+
ttem_loop_area: Optional[float] = None, ttem_gex_path: Optional[str] = None,
743+
ttem_tfi_path: Optional[str] = None,
741744
) -> Dict[str, Any]:
742745
"""Load one sounding from a sounding file.
743746
@@ -754,6 +757,14 @@ def load_sounding(
754757
``use_flags`` applies only to TEMcompany project databases; see
755758
:func:`load_temcompany_sounding`.
756759
"""
760+
if is_ttem_source(path):
761+
if method != "TDEM":
762+
raise ValueError("TEMcompany tTEM raw data are time-domain EM data; select TDEM.")
763+
return load_ttem_sounding(path, sounding=sounding, moment=moment,
764+
max_relative_std=max_relative_std,
765+
loop_area=ttem_loop_area,
766+
gex_path=ttem_gex_path,
767+
tfi_path=ttem_tfi_path)
757768
if is_temcompany_source(path):
758769
if method != "TDEM":
759770
raise ValueError("TEMcompany/TEM2Go exports are time-domain EM data; select TDEM.")
@@ -830,7 +841,9 @@ def pick(names):
830841
__all__ = [
831842
"TEMCOMPANY_MOMENTS",
832843
"is_temcompany_source",
844+
"is_ttem_source",
833845
"load_temcompany_sounding",
846+
"load_ttem_sounding",
834847
"load_sounding",
835848
"load_line_geometry",
836849
]

0 commit comments

Comments
 (0)