diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index ce1689f84c6475d0460e431b56f2a8fb82302651..0105a77e916288a2820715f49d84ace28202efaf 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -360,7 +360,10 @@ def analyze(ice_dct, no_ice_dct): print(dt_str[2:]) -def analyze_all(ice_dct, no_ice_dct, neg_ice_dct): +def process_1(ice_dct, no_ice_dct, neg_ice_dct): + new_ice_dct = {} + new_no_ice_dct = {} + new_neg_ice_dct = {} last_file = None ice_files = [] @@ -454,14 +457,10 @@ def analyze_all(ice_dct, no_ice_dct, neg_ice_dct): ice_times_4 = np.array(ice_files_4) ice_keys_4 = np.array(ice_times_4) print('4: ', ice_times_4.shape) - #np.random.shuffle(ice_times_4) - #ice_times_4 = ice_times_4[0:5000] ice_times_3 = np.array(ice_files_3) ice_keys_3 = np.array(ice_keys_3) print('3: ', ice_times_3.shape) - #np.random.shuffle(ice_times_3) - #ice_times_3 = ice_times_3[0:4000] ice_times_2 = np.array(ice_times_2) ice_keys_2 = np.array(ice_keys_2) @@ -469,13 +468,10 @@ def analyze_all(ice_dct, no_ice_dct, neg_ice_dct): np.random.shuffle(ice_times_2) np.random.shuffle(ice_keys_2) ice_keys_2 = ice_keys_2[0:30000] - #ice_times_2 = ice_times_2[0:30000] ice_times_1 = np.array(ice_files_1) ice_keys_1 = np.array(ice_keys_1) print('1: ', ice_times_1.shape) - #np.random.shuffle(ice_times_1) - #ice_times_1 = ice_times_1[0:5000] ice_times = np.concatenate([ice_times_5_6, ice_times_1, ice_times_2, ice_times_3, ice_times_4]) ice_keys = np.concatenate([ice_keys_5_6, ice_keys_1, ice_keys_2, ice_keys_3, ice_keys_4]) @@ -484,6 +480,10 @@ def analyze_all(ice_dct, no_ice_dct, neg_ice_dct): print(ice_times.shape, uniq_sorted.shape) print(ice_keys.shape, uniq_sorted_keys.shape) + uniq_sorted_keys = uniq_sorted_keys.tolist() + for key in uniq_sorted_keys: + new_ice_dct[key] = ice_dct[key] + no_ice_times = np.array(no_ice_times) neg_ice_times = np.array(neg_ice_times) print('no ice: ', no_ice_times.shape) @@ -494,43 +494,10 @@ def analyze_all(ice_dct, no_ice_dct, neg_ice_dct): uniq_sorted_no_ice = np.unique(no_ice_keys) print(no_ice_keys.shape, uniq_sorted_no_ice.shape) - # itrsct_vals, comm1, comm2 = np.intersect1d(ice_times_1, ice_times_4, return_indices=True) - # print(itrsct_vals.shape) - # itrsct_vals, comm1, comm2 = np.intersect1d(ice_times_1, ice_times_3, return_indices=True) - # print(itrsct_vals.shape) - # itrsct_vals, comm1, comm2 = np.intersect1d(ice_times_1, ice_times_2, return_indices=True) - # print(itrsct_vals.shape) - # itrsct_vals, comm1, comm2 = np.intersect1d(ice_times_1, no_ice_times, return_indices=True) - # print(itrsct_vals.shape) - # itrsct_vals, comm1, comm2 = np.intersect1d(ice_times_1, neg_ice_times, return_indices=True) - # print(itrsct_vals.shape) - - # ice_indexes = np.arange(len(ice_times)) - # - # ucomm2 = np.setxor1d(comm2, ice_indexes) - # np.random.shuffle(ucomm2) - # ucomm2 = ucomm2[0:8000] - # - # files_comm = [] - # for i in comm2: - # files_comm.append(ice_files[i]) - # - # files_extra = [] - # times_extra = [] - # for i in ucomm2: - # files_extra.append(ice_files[i]) - # times_extra.append(ice_times[i]) - # - # files = files_comm + files_extra - # times = itrsct_vals.tolist() + times_extra - # times = np.array(times) - # - # sidxs = np.argsort(times) - # for i in sidxs: - # filename = os.path.split(files[i])[1] - # so = re.search('_s\\d{11}', filename) - # dt_str = so.group() - # print(dt_str[2:]) + uniq_sorted_no_ice = uniq_sorted_no_ice.tolist() + for key in uniq_sorted_no_ice: + new_no_ice_dct[key] = no_ice_dct[key] + def run_qc(filename, filename_l1b):