Skip to content

Commit 86d2ad7

Browse files
wolfidanwolfidan
committed
ENH: update of doc
1 parent 73d7e2f commit 86d2ad7

File tree

6 files changed

+28
-23
lines changed

6 files changed

+28
-23
lines changed

‎=40.8.0‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/pyrad_proc/pyrad/flow/flow_aux.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
_MPROFILE_AVAILABLE = False
5757

5858
from pyrad import proc
59-
6059
from ..io.config import read_config, DEFAULT_CONFIG
6160
from ..io.read_data_radar import get_data
6261
from ..io.write_data import write_to_s3
@@ -1218,12 +1217,17 @@ def _create_cfg_dict(cfgfile):
12181217
"mosotti_factor",
12191218
"refcorr",
12201219
"AzimTol",
1221-
"MasterScanTimeTol",
12221220
]
12231221
for param in fltarr_list:
12241222
if param in cfg and isinstance(cfg[param], float):
12251223
cfg[param] = [cfg[param]]
12261224

1225+
# Convert the following ints to int arrays
1226+
intarr_list = ["MasterScanTimeTol", "ScanPeriod"]
1227+
for param in intarr_list:
1228+
if param in cfg and isinstance(cfg[param], int):
1229+
cfg[param] = [cfg[param]]
1230+
12271231
# check whether specified paths are relative or absolute
12281232
# if relative add configpath to the path
12291233
filenames = [

‎src/pyrad_proc/pyrad/io/io_aux.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1996,7 +1996,7 @@ def get_scan_files_to_merge(
19961996
):
19971997
filename = [filename_aux]
19981998
break
1999-
else:
1999+
elif master_scan_time_tol == -1:
20002000
if (
20012001
voltime - datetime.timedelta(minutes=scan_period)
20022002
< fdatetime

‎src/pyrad_proc/pyrad/io/read_data_dem.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ def read_dem(fname, field_name="terrain_altitude", fill_value=None, projparams=N
192192
if projparams is None:
193193
warn(
194194
"WARNING: No proj could be read from file and no projparams were provided, "
195-
+ "assuming the projection is CH1903."
195+
+ "assuming the projection is CH1903.",
196+
use_debug=False,
196197
)
197198
projparams = _get_lv1903_proj4()
198199

‎src/pyrad_proc/pyrad/io/read_data_radar.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ def get_data(voltime, datatypesdescr, cfg):
821821
cfg["psrpath"][ind_rad],
822822
cfg["ScanList"][ind_rad],
823823
voltime,
824-
cfg["ScanPeriod"],
824+
cfg["ScanPeriod"][ind_rad],
825825
datatype_psr,
826826
cfg,
827827
radarnr=radarnr,
@@ -1925,7 +1925,7 @@ def merge_scans_odim(
19251925
cfg,
19261926
path_convention=cfg["path_convention"][ind_rad],
19271927
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
1928-
scan_period=cfg["ScanPeriod"],
1928+
scan_period=cfg["ScanPeriod"][ind_rad],
19291929
)
19301930
else:
19311931
fname_list, scan_list_aux = get_scan_files_to_merge(
@@ -1937,7 +1937,7 @@ def merge_scans_odim(
19371937
dataset_list,
19381938
path_convention=cfg["path_convention"][ind_rad],
19391939
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
1940-
scan_period=cfg["ScanPeriod"],
1940+
scan_period=cfg["ScanPeriod"][ind_rad],
19411941
)
19421942

19431943
if not fname_list:
@@ -2325,7 +2325,7 @@ def merge_scans_odimbirds(
23252325
cfg,
23262326
path_convention=cfg["path_convention"][ind_rad],
23272327
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2328-
scan_period=cfg["ScanPeriod"],
2328+
scan_period=cfg["ScanPeriod"][ind_rad],
23292329
)
23302330
else:
23312331
fname_list, scan_list_aux = get_scan_files_to_merge(
@@ -2337,7 +2337,7 @@ def merge_scans_odimbirds(
23372337
dataset_list,
23382338
path_convention=cfg["path_convention"][ind_rad],
23392339
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2340-
scan_period=cfg["ScanPeriod"],
2340+
scan_period=cfg["ScanPeriod"][ind_rad],
23412341
)
23422342

23432343
if not fname_list:
@@ -2463,7 +2463,7 @@ def merge_scans_gamic(
24632463
cfg,
24642464
path_convention=cfg["path_convention"][ind_rad],
24652465
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2466-
scan_period=cfg["ScanPeriod"],
2466+
scan_period=cfg["ScanPeriod"][ind_rad],
24672467
)
24682468
else:
24692469
fname_list, _ = get_scan_files_to_merge(
@@ -2475,7 +2475,7 @@ def merge_scans_gamic(
24752475
dataset_list,
24762476
path_convention=cfg["path_convention"][ind_rad],
24772477
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2478-
scan_period=cfg["ScanPeriod"],
2478+
scan_period=cfg["ScanPeriod"][ind_rad],
24792479
)
24802480

24812481
if not fname_list:
@@ -2609,14 +2609,15 @@ def merge_scans_mfcfradial(
26092609
if (
26102610
voltime
26112611
<= fdatetime
2612-
< voltime + datetime.timedelta(minutes=cfg["ScanPeriod"])
2612+
< voltime
2613+
+ datetime.timedelta(minutes=cfg["ScanPeriod"][ind_rad])
26132614
):
26142615
filename = [filename_aux]
26152616
print(os.path.basename(filename[0]))
26162617
break
26172618
else:
26182619
if (
2619-
voltime - datetime.timedelta(minutes=cfg["ScanPeriod"])
2620+
voltime - datetime.timedelta(minutes=cfg["ScanPeriod"][ind_rad])
26202621
< fdatetime
26212622
<= voltime
26222623
):
@@ -2771,7 +2772,7 @@ def merge_scans_nexrad2(
27712772
cfg,
27722773
path_convention=cfg["path_convention"][ind_rad],
27732774
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2774-
scan_period=cfg["ScanPeriod"],
2775+
scan_period=cfg["ScanPeriod"][ind_rad],
27752776
)
27762777
else:
27772778
fname_list, _ = get_scan_files_to_merge(
@@ -2783,7 +2784,7 @@ def merge_scans_nexrad2(
27832784
dataset_list,
27842785
path_convention=cfg["path_convention"][ind_rad],
27852786
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2786-
scan_period=cfg["ScanPeriod"],
2787+
scan_period=cfg["ScanPeriod"][ind_rad],
27872788
)
27882789

27892790
if not fname_list:
@@ -2913,7 +2914,7 @@ def merge_scans_cfradial(
29132914
cfg,
29142915
path_convention=cfg["path_convention"][ind_rad],
29152916
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2916-
scan_period=cfg["ScanPeriod"],
2917+
scan_period=cfg["ScanPeriod"][ind_rad],
29172918
)
29182919
else:
29192920
fname_list, _ = get_scan_files_to_merge(
@@ -2925,7 +2926,7 @@ def merge_scans_cfradial(
29252926
dataset_list,
29262927
path_convention=cfg["path_convention"][ind_rad],
29272928
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
2928-
scan_period=cfg["ScanPeriod"],
2929+
scan_period=cfg["ScanPeriod"][ind_rad],
29292930
)
29302931

29312932
if not fname_list:
@@ -3061,7 +3062,7 @@ def merge_scans_cfradial2(
30613062
cfg,
30623063
path_convention=cfg["path_convention"][ind_rad],
30633064
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
3064-
scan_period=cfg["ScanPeriod"],
3065+
scan_period=cfg["ScanPeriod"][ind_rad],
30653066
)
30663067
else:
30673068
fname_list, _ = get_scan_files_to_merge(
@@ -3073,7 +3074,7 @@ def merge_scans_cfradial2(
30733074
dataset_list,
30743075
path_convention=cfg["path_convention"][ind_rad],
30753076
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
3076-
scan_period=cfg["ScanPeriod"],
3077+
scan_period=cfg["ScanPeriod"][ind_rad],
30773078
)
30783079

30793080
if not fname_list:
@@ -3325,7 +3326,7 @@ def merge_scans_cf1(
33253326
cfg,
33263327
path_convention=cfg["path_convention"][ind_rad],
33273328
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
3328-
scan_period=cfg["ScanPeriod"],
3329+
scan_period=cfg["ScanPeriod"][ind_rad],
33293330
)
33303331
else:
33313332
fname_list, _ = get_scan_files_to_merge(
@@ -3337,7 +3338,7 @@ def merge_scans_cf1(
33373338
dataset_list,
33383339
path_convention=cfg["path_convention"][ind_rad],
33393340
master_scan_time_tol=cfg["MasterScanTimeTol"][ind_rad],
3340-
scan_period=cfg["ScanPeriod"],
3341+
scan_period=cfg["ScanPeriod"][ind_rad],
33413342
)
33423343

33433344
if not fname_list:

‎src/pyrad_proc/pyrad/util/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
from .radar_utils import compute_average_vad # noqa
8989

9090
from .stat_utils import quantiles_weighted, ratio_bootstrapping # noqa
91+
9192
from .debug_utils import warn, enable_debug_on_error # noqa
9293

9394
from .data_retrieval_utils import retrieve_hzt_prod # noqa

0 commit comments

Comments
 (0)