diff --git a/.gitignore b/.gitignore index 5828f9ac91e41e4edbfd51b87f445cfe000144a0..13b2132b104dcb7151b7df745f743bd02087ef05 100644 --- a/.gitignore +++ b/.gitignore @@ -88,4 +88,8 @@ ENV/ .DS_Store # VS Code -.vscode/ \ No newline at end of file +.vscode/ + +# Temp files +*.txt +*.msg \ No newline at end of file diff --git a/obspy_replace/core.py b/obspy_replace/core.py index 56cec0f2ce21ca141ee0ebaa8b7077049d373335..c8c73a698647d1f94b14c60a168fe5eff343c560 100644 --- a/obspy_replace/core.py +++ b/obspy_replace/core.py @@ -191,7 +191,7 @@ class Reftek130(obspy_rt130_core.Reftek130): tr.stats.starttime = UTCDateTime(ns=starttime) # if component codes were explicitly provided, use them # together with the stream label - print(f"\nCOMPONENT CODE: {component_codes}") + # print(f"\nCOMPONENT CODE: {component_codes}") if component_codes is not None: tr.stats.channel = (eh.stream_name.strip() + component_codes[counter]) @@ -205,7 +205,7 @@ class Reftek130(obspy_rt130_core.Reftek130): # 0, as Z-1-2 is common use for data streams not oriented # against North) else: - print(f"\nELSE COMPONENT CODE: {component_codes}") + # print(f"\nELSE COMPONENT CODE: {component_codes}") msg = ("No channel code specified in the data file " "and no component codes specified. Using " "stream label and number of channel in file as " @@ -213,7 +213,7 @@ class Reftek130(obspy_rt130_core.Reftek130): warnings.warn(msg) tr.stats.channel = ( eh.stream_name.strip() + str(channel_number)) - print(f"\nChannel code: {tr.stats.channel}") + # print(f"\nChannel code: {tr.stats.channel}") # check if endtime of trace is consistent t_last = packets_[-1]['time'] npts_last = packets_[-1]['number_of_samples'] diff --git a/rt2ms_py3/parameter_file.py b/rt2ms_py3/parameter_file.py index 9abfd28a4bf0d85456ed148fe3389757f6fa7c7d..0f9e6d6aced44fdc99b752bfffc019f91fd67b6d 100644 --- a/rt2ms_py3/parameter_file.py +++ b/rt2ms_py3/parameter_file.py @@ -157,8 +157,8 @@ class Parameters(): """ # Handling the Auchiliary channels separately p = self.__update_parfile_with_auxiliary_channels(cf_dirs) - # print(f"\n\np_sets: {p}") - # print(f"\n len(p_sets): {len(p)}") + print(f"\n\np_sets: {p}") + print(f"\n len(p_sets): {len(p)}") order_param = {key: ind for ind, key in enumerate(self.fields_expected)} for index, value in enumerate(p): @@ -326,8 +326,8 @@ class Parameters(): filtered_params = {key: val for (key, val) in filtered_params.items() if implement_time in key} - # print("********************************************") - # print(f"\nfiltered_params 02: {filtered_params}") + print("********************************************") + print(f"\nfiltered_params 02: {filtered_params}") params_time = implement_time break else: @@ -341,7 +341,12 @@ class Parameters(): networks.append(filtered_val['netcode']) stations.append(filtered_val['station']) locations.append(filtered_val['location']) - refchan_band_inst[filtered_val['refchan']] = filtered_val['channel'][:-1] + print(f"\n\nINSIDE: filtered_val: {filtered_val}") + if filtered_val['channel'].startswith('AUX'): + refchan_band_inst[filtered_val['refchan']] = 'AUX' + else: + refchan_band_inst[filtered_val['refchan']] = filtered_val['channel'][:-1] + print(f"\n\nINSIDE: refchan_band_inst: {refchan_band_inst}") refchan_direction.append((filtered_val['refchan'], filtered_val['channel'][-1])) networks = list(set(networks)) @@ -517,6 +522,8 @@ class Parameters(): if channel_name.startswith("AUX"): channel_number = int(channel_name.replace('AUX', '')) + 1 return str("AUX" + str(channel_number)) + print(f'\n\nINSIDE: channel_number: {channel_number}') + # Channel name does not start with AUX, so we need to fix it return channel_name diff --git a/rt2ms_py3/rt130_files.py b/rt2ms_py3/rt130_files.py index bda7c6eeb98b29b90d40c9f506679c8c6ed7fe51..5b212dcffd0079c0569bc3baba7b65aec7ff6ff7 100644 --- a/rt2ms_py3/rt130_files.py +++ b/rt2ms_py3/rt130_files.py @@ -265,19 +265,26 @@ class Rt130CfDir(): sort_permuted_package_sequence=SORT_PERMUTED_PACKAGE_SEQUENCE) for ind_tr, tr in enumerate(st_dt_file): # print(f"The data file is: {st_dt_file}") - # print(f"ind_tr: {ind_tr} -> tr: {tr}") - # print(f"ref channel band: {refchan_band_inst.values()}") - # print(f"check channel: {tr.stats.channel[:-1]}") - # print(f"\n\ncheck stats: {tr.stats}\n\n") + print(f"1 - ind_tr: {ind_tr} -> tr: {tr.stats}") + print(f"2 - ref channel band: {refchan_band_inst.values()}") + print(f"3 - check channel: {tr.stats.channel[:-1]}") + print(f"\n\n4 - check stats: {tr.stats}\n\n") if tr.stats.station != station: # print(f"\n\n\nstation: {station} - > {tr.stats.station}") tr.stats.station = station + # if tr.stats.channel.startswith('AUX'): + # refchan = str(tr.stats.reftek130.channel_number + 1) + # print(f"ref channel: {refchan_band_inst} - > {refchan}") + # print(f"tr channel: {tr.stats.channel}") + # print(f'tr.stats.channel: {tr.stats.channel[-1]}') + # tr.stats.channel = refchan_band_inst[refchan] + refchan + # print(f"channel: {tr.stats.channel}") + # elif not tr.stats.channel.startswith('AUX') and tr.stats.channel[:-1] not in refchan_band_inst.values(): + # refchan = str(tr.stats.reftek130.channel_number + 1) + # tr.stats.channel = refchan_band_inst[refchan] + tr.stats.channel[-1] if tr.stats.channel[:-1] not in refchan_band_inst.values(): refchan = str(tr.stats.reftek130.channel_number + 1) - # print(f"ref channel: {refchan_band_inst} - > {refchan}") - # print(f"tr channel: {tr.stats.channel} - > {tr.stats.channel[-1]}") tr.stats.channel = refchan_band_inst[refchan] + tr.stats.channel[-1] - # print(f"channel: {tr.stats.channel}") - # print(tr.stats.channel) + print(f"5 - {tr.stats.channel}") st_events += st_dt_file st_nextday = daylong_mseed(st_events, output_dir)