Skip to content

Commit 64b7338

Browse files
author
Jordi Figueras
committed
changes in process_traj: pre-selection of colocated regions is performed by function intersection before function colocated_gates
1 parent 38e7c94 commit 64b7338

File tree

4 files changed

+91
-67
lines changed

4 files changed

+91
-67
lines changed

‎config/processing/mals_pay_PHD_ASR_traj.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Name of this configuration:
22
# Will be used in product generation save path
3-
name STRING mals_pay_PHD_ASR_traj_lea
3+
name STRING mals_pay_PHD_ASR_traj
44

55
# ---------------------------------------------------------
66
# Raw data pathes

‎config/processing/mals_pay_PHD_ASR_traj_prod.txt

Lines changed: 79 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
# List of datasets to generate.
66
# The detailed specification of each dataset is given below.
7-
dataSetList STRARR 2
8-
l0:reflectivity_traj
9-
l0:reflectivity_traj_lb
7+
dataSetList STRARR 4
8+
reflectivity_traj_lb
9+
rainrate_traj_lb
10+
windshear_traj_lb
11+
temperature_traj_lb
1012

1113

1214

@@ -95,16 +97,16 @@ dataSetList STRARR 2
9597
# TS_TEXT STRUCT 1
9698
# type STRING TRAJ_TEXT
9799
#
98-
reflectivity_traj STRUCT 4
99-
type STRING TRAJ_ATPLANE
100-
datatype STRING CFRADIAL:dBZc,Att_ZPhi,SAVEVOL_dBZc
101-
data_is_log INT 1
102-
products STRUCT 1
103-
AT_PLANE STRUCT 3
104-
type STRING PLOT_AND_WRITE
105-
ymin FLOAT 0.0
106-
ymax FLOAT 50.0
107-
100+
#reflectivity_traj STRUCT 4
101+
# type STRING TRAJ_ATPLANE
102+
# datatype STRING CFRADIAL:dBZc,Att_ZPhi,SAVEVOL_dBZc
103+
# data_is_log INT 1
104+
# products STRUCT 1
105+
# AT_PLANE STRUCT 3
106+
# type STRING PLOT_AND_WRITE
107+
# ymin FLOAT 0.0
108+
# ymax FLOAT 50.0
109+
#
108110
reflectivity_traj_lb STRUCT 14
109111
type STRING TRAJ_ANTENNA_PATTERN
110112
datatype STRING CFRADIAL:dBZc,Att_ZPhi,SAVEVOL_dBZc
@@ -134,59 +136,76 @@ reflectivity_traj_lb STRUCT 14
134136
# ymin FLOAT 0.0
135137
# ymax FLOAT 4.0
136138
#
137-
#rainrate_traj_lb STRUCT 9
138-
# type STRING TRAJ_ANTENNA_PATTERN
139-
# datatype STRING PROC:RR
140-
# dssavename STRING rainrate_traj
141-
# antennaType STRING LOWBEAM
142-
# use_nans INT 0
143-
# nan_value FLOAT 0.0
144-
# pattern_thres FLOAT 1.5
145-
# RANGE_ALL INT 0
146-
# products STRUCT 1
147-
# LOWBEAM_ANTENNA STRUCT 3
148-
# type STRING PLOT_AND_WRITE
149-
# ymin FLOAT 0.0
150-
# ymax FLOAT 4.0
151-
#
139+
rainrate_traj_lb STRUCT 14
140+
type STRING TRAJ_ANTENNA_PATTERN
141+
datatype STRING CFRADIAL:RR,RR_hydro,SAVEVOL_RR_hydro
142+
dssavename STRING rainrate_traj
143+
antennaType STRING LOWBEAM
144+
use_nans INT 0
145+
nan_value FLOAT 0.0
146+
pattern_thres FLOAT 1.5
147+
range_all INT 0
148+
max_altitude FLOAT 11000.0 # [m]
149+
rhi_resolution FLOAT 0.4 # [deg]
150+
latlon_tol FLOAT 0.03 # [deg]
151+
alt_tol FLOAT 1000 # [m]
152+
data_is_log INT 0
153+
products STRUCT 1
154+
LOWBEAM_ANTENNA STRUCT 3
155+
type STRING PLOT_AND_WRITE
156+
ymin FLOAT 0.0
157+
ymax FLOAT 4.0
158+
152159
#windshear_traj STRUCT 3
153160
# type STRING TRAJ_ATPLANE
154161
# datatype STRING PROC:windshear_v
155162
# products STRUCT 1
156163
# AT_PLANE STRUCT 1
157164
# type STRING PLOT_AND_WRITE
158165
#
159-
#windshear_traj_lb STRUCT 8
160-
# type STRING TRAJ_ANTENNA_PATTERN
161-
# datatype STRING PROC:windshear_v
162-
# dssavename STRING windshear_traj
163-
# antennaType STRING LOWBEAM
164-
# use_nans INT 0
165-
# nan_value FLOAT 0.0
166-
# pattern_thres FLOAT 1.5
167-
# products STRUCT 1
168-
# LOWBEAM_ANTENNA STRUCT 3
169-
# type STRING PLOT_AND_WRITE
166+
windshear_traj_lb STRUCT 14
167+
type STRING TRAJ_ANTENNA_PATTERN
168+
datatype STRING CFRADIAL:windshear_v,windshear_v,SAVEVOL_windshear_v
169+
dssavename STRING windshear_traj
170+
antennaType STRING LOWBEAM
171+
use_nans INT 0
172+
nan_value FLOAT 0.0
173+
pattern_thres FLOAT 1.5
174+
range_all INT 0
175+
max_altitude FLOAT 11000.0 # [m]
176+
rhi_resolution FLOAT 0.4 # [deg]
177+
latlon_tol FLOAT 0.03 # [deg]
178+
alt_tol FLOAT 1000 # [m]
179+
data_is_log INT 0
180+
products STRUCT 1
181+
LOWBEAM_ANTENNA STRUCT 3
182+
type STRING PLOT_AND_WRITE
183+
ymin FLOAT -20.0
184+
ymax FLOAT 20.0
185+
186+
# temperature_traj STRUCT 3
187+
# type STRING TRAJ_ATPLANE
188+
# datatype STRING RAD4ALPCOSMO:TEMP
189+
# products STRUCT 1
190+
# AT_PLANE STRUCT 1
191+
# type STRING PLOT_AND_WRITE
192+
193+
temperature_traj_lb STRUCT 14
194+
type STRING TRAJ_ANTENNA_PATTERN
195+
datatype STRING RAD4ALPCOSMO:TEMP
196+
dssavename STRING temperature_traj
197+
antennaType STRING LOWBEAM
198+
use_nans INT 0
199+
nan_value FLOAT 0.0
200+
pattern_thres FLOAT 1.5
201+
range_all INT 0
202+
max_altitude FLOAT 11000.0 # [m]
203+
rhi_resolution FLOAT 0.4 # [deg]
204+
latlon_tol FLOAT 0.03 # [deg]
205+
alt_tol FLOAT 1000 # [m]
206+
data_is_log INT 0
207+
products STRUCT 1
208+
LOWBEAM_ANTENNA STRUCT 1
209+
type STRING PLOT_AND_WRITE
170210
# ymin FLOAT -20.0
171211
# ymax FLOAT 20.0
172-
#
173-
#temperature_traj STRUCT 3
174-
# type STRING TRAJ_ATPLANE
175-
# datatype STRING RAD4ALPCOSMO:TEMP
176-
# products STRUCT 1
177-
# AT_PLANE STRUCT 1
178-
# type STRING PLOT_AND_WRITE
179-
#
180-
#temperature_traj_lb STRUCT 8
181-
# type STRING TRAJ_ANTENNA_PATTERN
182-
# datatype STRING RAD4ALPCOSMO:TEMP
183-
# dssavename STRING temperature_traj
184-
# antennaType STRING LOWBEAM
185-
# use_nans INT 0
186-
# nan_value FLOAT 0.0
187-
# pattern_thres FLOAT 1.5
188-
# products STRUCT 1
189-
# LOWBEAM_ANTENNA STRUCT 1
190-
# type STRING PLOT_AND_WRITE
191-
## ymin FLOAT -20.0
192-
## ymax FLOAT 20.0

‎src/pyart

‎src/pyrad_proc/pyrad/proc/process_traj.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from pyart.config import get_metadata
2121
from pyart.core import Radar
22-
from pyart.util import colocated_gates
22+
from pyart.util import colocated_gates, intersection
2323

2424
from ..io.io_aux import get_datatype_fields, get_fieldname_pyart
2525
from ..io.io_aux import get_field_unit, get_field_name
@@ -678,14 +678,19 @@ def process_traj_antenna_pattern(procstatus, dscfg, radar_list=None,
678678
r_sweep_number, None, None, None, None,
679679
r_azimuth, r_elevation)
680680

681+
# flag regions with colocated usable data in r_radar
681682
r_ind_invalid = r_radar.gate_altitude['data'] > max_altitude
682683
r_radar.fields['colocated_gates']['data'][r_ind_invalid] = 0
683684

684685
if ('colocated_gates' not in radar_sel.fields):
685-
rad_field = get_metadata('colocated_gates')
686-
rad_field['data'] = np.ma.ones((radar_sel.nrays,
687-
radar_sel.ngates), dtype=int)
688-
radar_sel.add_field('colocated_gates', rad_field)
686+
# flag regions with colocated usable data in radar_sel
687+
gate_coloc_radar_sel = intersection(
688+
radar_sel, r_radar, h_tol=alt_tol, latlon_tol=latlon_tol
689+
vol_d_tol=None, vismin=None, hmin=None, hmax=max_altitude,
690+
rmin=None, rmax=None, elmin=None, elmax=None, azmin=None,
691+
azmax=None, visib_field=None,
692+
intersec_field='colocated_gates')
693+
radar_sel.add_field('colocated_gates', gate_coloc_radar_sel)
689694

690695
(colgates, r_radar_colg) = colocated_gates(r_radar, radar_sel,
691696
h_tol=alt_tol,

0 commit comments

Comments
 (0)