diff --git a/tools/RAiDER/aria/prepFromGUNW.py b/tools/RAiDER/aria/prepFromGUNW.py index a6a6a5a6..7b2cb372 100644 --- a/tools/RAiDER/aria/prepFromGUNW.py +++ b/tools/RAiDER/aria/prepFromGUNW.py @@ -9,6 +9,7 @@ import sys from pathlib import Path +from RAiDER.aria.types import CalcDelaysArgs import numpy as np import pandas as pd import rasterio @@ -21,7 +22,7 @@ from RAiDER.models.hrrr import AK_GEO, HRRR_CONUS_COVERAGE_POLYGON, check_hrrr_dataset_availability from RAiDER.s1_azimuth_timing import get_times_for_azimuth_interpolation from RAiDER.s1_orbits import get_orbits_from_slc_ids_hyp3lib -from RAiDER.types import BB, CalcDelaysArgs, LookDir +from RAiDER.types import BB, LookDir from RAiDER.utilFcns import write_yaml diff --git a/tools/RAiDER/cli/raider.py b/tools/RAiDER/cli/raider.py index 778b1d2a..c3941a3c 100644 --- a/tools/RAiDER/cli/raider.py +++ b/tools/RAiDER/cli/raider.py @@ -9,8 +9,6 @@ from textwrap import dedent from typing import Any, Optional, cast -from RAiDER.aria.types import CalcDelaysArgsUnparsed -from RAiDER.gnss.types import RAiDERCombineArgs import numpy as np import xarray as xr import yaml @@ -18,6 +16,8 @@ import RAiDER.aria.calcGUNW import RAiDER.aria.prepFromGUNW from RAiDER import aws +from RAiDER.aria.types import CalcDelaysArgsUnparsed +from RAiDER.cli.parser import add_cpus, add_out, add_verbose from RAiDER.cli.types import ( AOIGroup, AOIGroupUnparsed, @@ -30,8 +30,8 @@ RuntimeGroup, TimeGroup, ) -from RAiDER.cli.parser import add_cpus, add_out, add_verbose from RAiDER.cli.validators import DateListAction, date_type +from RAiDER.gnss.types import RAiDERCombineArgs from RAiDER.logger import logger, logging from RAiDER.losreader import Raytracing from RAiDER.models.allowed import ALLOWED_MODELS diff --git a/tools/RAiDER/delay.py b/tools/RAiDER/delay.py index 24a9538b..ff7f3436 100755 --- a/tools/RAiDER/delay.py +++ b/tools/RAiDER/delay.py @@ -17,8 +17,6 @@ import os from typing import Optional, Union -from RAiDER.types import CRSLike -from RAiDER.utilFcns import parse_crs import numpy as np import pyproj import xarray as xr diff --git a/tools/RAiDER/llreader.py b/tools/RAiDER/llreader.py index ca765f10..bd6220dc 100644 --- a/tools/RAiDER/llreader.py +++ b/tools/RAiDER/llreader.py @@ -7,10 +7,8 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ import os from pathlib import Path -from typing import Any, Optional, Union +from typing import Optional, Union -from RAiDER.constants import _CUBE_SPACING_IN_M -from RAiDER.types import BB, RIO import numpy as np import pyproj import xarray as xr @@ -24,6 +22,7 @@ from pyproj import CRS from RAiDER.logger import logger +from RAiDER.types import BB, RIO from RAiDER.utilFcns import rio_open, rio_stats