Skip to content

Commit

Permalink
some bug and style corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordi Figueras committed Feb 27, 2017
1 parent 0eadfc8 commit 97dd7c0
Show file tree
Hide file tree
Showing 16 changed files with 1,018 additions and 837 deletions.
2 changes: 1 addition & 1 deletion config/processing/mals_emm_intercomp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ loadbasepath STRARR 2

loadname STRARR 2
mals_emm_dataquality
rad4alp_PLA
rad4alp_PLA_avg

# Base path for colocated gates data
colocgatespath STRING /data/pyrad_products/mals_emm_dataquality/colocated_gates/
Expand Down
19 changes: 6 additions & 13 deletions config/processing/paradiso_fvj_vol.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,17 @@ name STRING paradiso_vol_fvj
# Base path of the raw data.
# Note: Must have a trailing '/'
# ('<datapath>/<scanname>/<YYYY-MM-DD>/<YYYYMMDDHHMMSS00datatype>.<ext>')
datapath STRARR 1
/data/DX50/rawdata/
datapath STRING /data/DX50/rawdata/

# Base path for cosmo data
cosmopath STRARR 1
/data/cosmo/
cosmopath STRING /data/cosmo/

# Base path for dem data
dempath STRARR 1
/data/DEM/DX50_PAY/
dempath STRING /data/DEM/DX50_PARADISO/

# Loading of saved datasets
loadbasepath STRARR 1
/data/pyrad_examples/

loadname STRARR 1
paradiso_vol_fvj
loadbasepath STRING /data/pyrad_examples/
loadname STRING paradiso_vol_fvj

# ------------------------------------------------------------
# Auxiliary data pathes
Expand All @@ -42,8 +36,7 @@ disdropath STRING /data/scattering/dsd_ts/
saveimgbasepath STRING /data/pyrad_examples/
saveimg INT 1
# Supported formats: eps, jpeg, jpg, pdf, pgf, png, ps, raw, rgba, svg, svgz, tif, tiff
imgformat STRARR 1
png
imgformat STRING png

# --------------------------------------------------------
# configuration files pathes
Expand Down
2 changes: 1 addition & 1 deletion config/processing/paradiso_fvj_vol_intercomp.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Name of this configuration:
# Will be used in product generation save path
name STRING paradiso_vol_fvj
name STRING paradiso_vol_intercomp

# ---------------------------------------------------------
# Raw data pathes
Expand Down
103 changes: 53 additions & 50 deletions config/processing/paradiso_fvj_vol_intercomp_prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,33 @@

# List of datasets to generate.
# The detailed specification of each dataset is given below.
dataSetList STRARR 1
DX50_PLD_dBZ_avg_intercomp
dataSetList STRARR 2
dBZ_DX50
dBZ_PLD


# =====================================
# Raw data
# =====================================
#VIS STRUCT 3
# type STRING RAW
# datatype STRING RADAR001:DEM:VIS
# products STRUCT 3
# EL004_0 STRUCT 3
# type STRING PPI_IMAGE
# anglenr INT 0
# voltype STRING VIS
# EL006_0 STRUCT 3
# type STRING PPI_IMAGE
# anglenr INT 1
# voltype STRING VIS
# EL025_0 STRUCT 3
# type STRING PPI_IMAGE
# anglenr INT 2
# voltype STRING VIS
#
dBZ_DX50 STRUCT 3
type STRING RAW
datatype STRARR 1
RADAR001:RAINBOW:dBZ
products STRUCT 1
EL004_0 STRUCT 3
type STRING PPI_IMAGE
anglenr INT 0
voltype STRING dBZ

dBZ_PLD STRUCT 3
type STRING RAW
datatype STRARR 1
RADAR002:RAD4ALP:dBZ
products STRUCT 1
EL001_0 STRUCT 3
type STRING PPI_IMAGE
anglenr INT 2
voltype STRING dBZ

# ==========================================================================================
# colocated gates
Expand Down Expand Up @@ -109,37 +112,37 @@ dataSetList STRARR 1
# DX50_PLD_DATA STRUCT 2
# type STRING WRITE_INTERCOMP
# voltype STRING dBZc

DX50_PLD_dBZ_avg_intercomp STRUCT 12
type STRING INTERCOMP_TIME_AVG
datatype STRARR 6
RADAR001:CFRADIAL:dBZc,dBZ_avg,SAVEVOL
RADAR001:CFRADIAL:PhiDPc,PhiDP_avg,SAVEVOL
RADAR001:CFRADIAL:time_avg_flag,flag_avg,SAVEVOL
RADAR002:CFRADIAL:dBZc,dBZ_avg,SAVEVOL
RADAR002:CFRADIAL:PhiDPc,PhiDP_avg,SAVEVOL
RADAR002:CFRADIAL:time_avg_flag,flag_avg,SAVEVOL
coloc_data_dir STRING DX50_PLD_DATA # must be the same as product WRITE_INTERCOMP
coloc_radars_name STRING DX50_PLD
ele_tol FLOAT 0.5
azi_tol FLOAT 0.5
rng_tol FLOAT 100.
clt_max INT 0
phi_excess_max INT 100
non_rain_max INT 100
phi_avg_max FLOAT 600.
products STRUCT 3
DX50_PLD_PLOT STRUCT 3
type STRING PLOT_SCATTER_INTERCOMP
voltype STRING dBZc
step FLOAT 0.5
DX50_PLD_DATA STRUCT 2
type STRING WRITE_INTERCOMP_TIME_AVG
voltype STRING dBZc
DX50_PLD_INTERCOMP_TS STRUCT 3
type STRING PLOT_AND_WRITE_INTERCOMP_TS
step FLOAT 0.5
voltype STRING dBZc
#
#DX50_PLD_dBZ_avg_intercomp STRUCT 12
# type STRING INTERCOMP_TIME_AVG
# datatype STRARR 6
# RADAR001:CFRADIAL:dBZc,dBZ_avg,SAVEVOL
# RADAR001:CFRADIAL:PhiDPc,PhiDP_avg,SAVEVOL
# RADAR001:CFRADIAL:time_avg_flag,flag_avg,SAVEVOL
# RADAR002:CFRADIAL:dBZc,dBZ_avg,SAVEVOL
# RADAR002:CFRADIAL:PhiDPc,PhiDP_avg,SAVEVOL
# RADAR002:CFRADIAL:time_avg_flag,flag_avg,SAVEVOL
# coloc_data_dir STRING DX50_PLD_DATA # must be the same as product WRITE_INTERCOMP
# coloc_radars_name STRING DX50_PLD
# ele_tol FLOAT 0.5
# azi_tol FLOAT 0.5
# rng_tol FLOAT 100.
# clt_max INT 0
# phi_excess_max INT 100
# non_rain_max INT 100
# phi_avg_max FLOAT 600.
# products STRUCT 3
# DX50_PLD_PLOT STRUCT 3
# type STRING PLOT_SCATTER_INTERCOMP
# voltype STRING dBZc
# step FLOAT 0.5
# DX50_PLD_DATA STRUCT 2
# type STRING WRITE_INTERCOMP_TIME_AVG
# voltype STRING dBZc
# DX50_PLD_INTERCOMP_TS STRUCT 3
# type STRING PLOT_AND_WRITE_INTERCOMP_TS
# step FLOAT 0.5
# voltype STRING dBZc



Expand Down
3 changes: 1 addition & 2 deletions config/processing/paradiso_fvj_vol_loc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ NumRadars INT 1
TimeTol FLOAT 3600.

# Radar Name
RadarName STRARR 1
DX50
RadarName STRING DX50

# Names of the radar scans in the specified sector
# NOTE: Must have a trailing '/'
Expand Down
Loading

0 comments on commit 97dd7c0

Please sign in to comment.