diff --git a/modules/deeplearning/icing_cnn.py b/modules/deeplearning/icing_cnn.py index 98493282260142563ddfa7e7cb00b6ad0f73123d..0418dd8d441d28e20762be10b0f049aefd29c3a6 100644 --- a/modules/deeplearning/icing_cnn.py +++ b/modules/deeplearning/icing_cnn.py @@ -8,7 +8,6 @@ import numpy as np import pickle import h5py -USE_FLIGHT_ALTITUDE = False LOG_DEVICE_PLACEMENT = False @@ -117,7 +116,7 @@ def build_residual_block(input, drop_rate, num_neurons, activation, block_name, class IcingIntensityNN: - def __init__(self, day_night='DAY', l1b_andor_l2='both', gpu_device=0, datapath=None): + def __init__(self, day_night='DAY', l1b_andor_l2='both', use_flight_altitude=False, gpu_device=0, datapath=None): if day_night == 'DAY': self.train_params_l1b = train_params_l1b_day @@ -233,6 +232,8 @@ class IcingIntensityNN: self.DISK_CACHE = False + self.USE_FLIGHT_ALTITUDE = use_flight_altitude + if datapath is not None: self.DISK_CACHE = False f = open(datapath, 'rb') @@ -928,7 +929,7 @@ class IcingIntensityNN: # flat = tf.keras.layers.concatenate([flat, flat_1d, flat_anc]) # flat = tf.keras.layers.concatenate([flat, flat_1d]) # self.build_dnn(flat) - if USE_FLIGHT_ALTITUDE: + if self.USE_FLIGHT_ALTITUDE: flat = tf.keras.layers.concatenate([flat, self.inputs[1]]) self.build_dnn(flat) self.model = tf.keras.Model(self.inputs, self.logits)