From 7a6fc5b100fdd018c18d5e6531cb91e6e6263da7 Mon Sep 17 00:00:00 2001 From: Daniel Wolfensberger Date: Thu, 7 Nov 2024 19:12:05 +0100 Subject: [PATCH] FIX: replaced HISO references by ISO0_HEIGHT --- rainforest/ml/rf.py | 2 +- rainforest/ml/rf_train.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rainforest/ml/rf.py b/rainforest/ml/rf.py index 7f3cdc1..4fa28e2 100755 --- a/rainforest/ml/rf.py +++ b/rainforest/ml/rf.py @@ -387,7 +387,7 @@ def fit_models(self, config_file, features_dic, tstart = None, tend = None, ############################################################################### gaugetab_train = gaugetab[~invalid].copy() - + import pdb; pdb.set_trace() logging.info('Performing vertical aggregation of input features for model {:s}'.format(model)) features_VERT_AGG = vert_aggregation(radartab[features_dic[model]], vweights, grp_vertical, diff --git a/rainforest/ml/rf_train.py b/rainforest/ml/rf_train.py index 2877ed6..42e8627 100755 --- a/rainforest/ml/rf_train.py +++ b/rainforest/ml/rf_train.py @@ -63,9 +63,9 @@ def main(): '"dualpol_default" = \'{"RF_dualpol": ["RADAR", "zh_VISIB_mean", "zv_VISIB_mean","KDP_mean","RHOHV_mean","SW_mean", "T", "HEIGHT","VISIB_mean"]}\'' + '"vpol_default" = \'{"RF_vpol": ["RADAR", "zv_VISIB_mean","SW_mean", "T", "HEIGHT","VISIB_mean"]}\'' + '"hpol_default" = \'{"RF_hpol": ["RADAR", "zh_VISIB_mean","SW_mean", "T", "HEIGHT","VISIB_mean"]}\'' + - '"RFO_default" = \'{"RFO_dualpol": ["RADAR", "zh_VISIB_mean", "zv_VISIB_mean","KDP_mean","RHOHV_mean","SW_mean", "HISO", "HEIGHT","VISIB_mean"]}\'' + - '"RFO_default_vpol" = \'{"RFO_vpol": ["RADAR", "zv_VISIB_mean","SW_mean", "HISO", "HEIGHT","VISIB_mean"]}\'' + - '"RFO_default_hpol" = \'{"RFO_hpol": ["RADAR", "zh_VISIB_mean","SW_mean", "HISO", "HEIGHT","VISIB_mean"]}\'' + + '"RFO_default" = \'{"RFO_dualpol": ["RADAR", "zh_VISIB_mean", "zv_VISIB_mean","KDP_mean","RHOHV_mean","SW_mean", "ISO0_HEIGHT", "HEIGHT","VISIB_mean"]}\'' + + '"RFO_default_vpol" = \'{"RFO_vpol": ["RADAR", "zv_VISIB_mean","SW_mean", "ISO0_HEIGHT", "HEIGHT","VISIB_mean"]}\'' + + '"RFO_default_hpol" = \'{"RFO_hpol": ["RADAR", "zh_VISIB_mean","SW_mean", "ISO0_HEIGHT", "HEIGHT","VISIB_mean"]}\'' + 'You can combine them for example "vpol_default, hpol_default, dualpol_default, will compute all three"', metavar="MODELS") @@ -122,13 +122,13 @@ def main(): elif opt == 'RFO_default': dic_models['RFO'] = ["RADAR", "zh_VISIB_mean", "zv_VISIB_mean","KDP_mean", - "RHOHV_mean","SW_mean","HISO", + "RHOHV_mean","SW_mean","ISO0_HEIGHT", "HEIGHT","VISIB_mean"] elif opt == 'RFO_default_hpol': - dic_models['RFO_hpol'] = ["RADAR", "zh_VISIB_mean","SW_mean","HISO", + dic_models['RFO_hpol'] = ["RADAR", "zh_VISIB_mean","SW_mean","ISO0_HEIGHT", "HEIGHT","VISIB_mean"] elif opt == 'RFO_default_vpol': - dic_models['RFO_hpol'] = ["RADAR", "zv_VISIB_mean","SW_mean","HISO", + dic_models['RFO_hpol'] = ["RADAR", "zv_VISIB_mean","SW_mean","ISO0_HEIGHT", "HEIGHT","VISIB_mean"] else: