diff --git a/modules/deeplearning/icing_fcn.py b/modules/deeplearning/icing_fcn.py index 37746e4409e1646b1c29aba0a2e725c599a8f5cc..dd36c9479dcc5a5df029a41cb2e8b35e58e9a36a 100644 --- a/modules/deeplearning/icing_fcn.py +++ b/modules/deeplearning/icing_fcn.py @@ -132,26 +132,26 @@ class IcingIntensityFCN: def __init__(self, day_night='DAY', l1b_or_l2='both', satellite='GOES16', use_flight_altitude=False, datapath=None): - # if day_night == 'DAY': - # self.train_params_l1b = train_params_l1b_day - # self.train_params_l2 = train_params_l2_day - # if l1b_or_l2 == 'both': - # self.train_params = train_params_l1b_day + train_params_l2_day - # elif l1b_or_l2 == 'l1b': - # self.train_params = train_params_l1b_day - # elif l1b_or_l2 == 'l2': - # self.train_params = train_params_l2_day - # else: - # self.train_params_l1b = train_params_l1b_night - # self.train_params_l2 = train_params_l2_night - # if l1b_or_l2 == 'both': - # self.train_params = train_params_l1b_night + train_params_l2_night - # elif l1b_or_l2 == 'l1b': - # self.train_params = train_params_l1b_night - # elif l1b_or_l2 == 'l2': - # self.train_params = train_params_l2_night - - self.train_params, self.train_params_l1b, self.train_params_l2 = get_training_parameters(day_night=day_night, l1b_andor_l2=l1b_or_l2, satellite=satellite) + if day_night == 'DAY': + self.train_params_l1b = train_params_l1b_day + self.train_params_l2 = train_params_l2_day + if l1b_or_l2 == 'both': + self.train_params = train_params_l1b_day + train_params_l2_day + elif l1b_or_l2 == 'l1b': + self.train_params = train_params_l1b_day + elif l1b_or_l2 == 'l2': + self.train_params = train_params_l2_day + else: + self.train_params_l1b = train_params_l1b_night + self.train_params_l2 = train_params_l2_night + if l1b_or_l2 == 'both': + self.train_params = train_params_l1b_night + train_params_l2_night + elif l1b_or_l2 == 'l1b': + self.train_params = train_params_l1b_night + elif l1b_or_l2 == 'l2': + self.train_params = train_params_l2_night + + # self.train_params, self.train_params_l1b, self.train_params_l2 = get_training_parameters(day_night=day_night, l1b_andor_l2=l1b_or_l2, satellite=satellite) self.train_data = None self.train_label = None