Skip to content
Snippets Groups Projects
Commit dadd9c4a authored by Lan Dam's avatar Lan Dam
Browse files

change the sign for select all data streams for RT130 from 10 to '*' to not be...

change the sign for select all data streams for RT130 from 10 to '*' to not be consistent with select all waveform channels wildcard in non RT130 data
parent 63123801
No related branches found
No related tags found
1 merge request!62handling selecting waveform - TPS - RAW
Pipeline #2104 passed with stage
in 3 minutes and 47 seconds
......@@ -4,7 +4,7 @@ RT130 object to hold and process RefTek data
import os
from pathlib import Path
from typing import Tuple, List
from typing import Tuple, List, Union
import numpy as np
......@@ -33,7 +33,7 @@ class RT130(DataTypeModel):
self.EH = {}
super().__init__(*args, **kwarg)
self.keys = set()
self.req_data_streams: List[int] = self.req_wf_chans
self.req_data_streams: List[Union[int, str]] = self.req_wf_chans
self.mass_pos_stream = {}
self.found_data_streams = []
......@@ -52,10 +52,8 @@ class RT130(DataTypeModel):
if len(self.req_wf_chans) != 0:
self.read_wf_files(self.selected_key)
if self.req_data_streams != ['*']:
not_found_data_streams = [
ds
for ds in self.req_data_streams
if ds not in self.found_data_streams + [10]]
not_found_data_streams = [ds for ds in self.req_data_streams
if ds not in self.found_data_streams]
if not_found_data_streams != []:
msg = (f"No data found for data streams: "
f"{', '.join(map(str, not_found_data_streams))}")
......@@ -203,7 +201,7 @@ class RT130(DataTypeModel):
be processed later
"""
data_stream = rt130._data['data_stream_number'][0] + 1
if (self.req_data_streams != [10] and
if (self.req_data_streams != ['*'] and
data_stream not in self.req_data_streams + [9]):
return
self.found_data_streams.append(data_stream)
......
......@@ -303,7 +303,7 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
if self.tps_check_box.isChecked() or self.raw_check_box.isChecked():
if self.all_wf_chans_check_box.isChecked():
req_mseed_wildcards = ['*']
req_dss = [10] # all data stream
req_dss = ['*'] # all data stream
else:
req_dss = []
req_mseed_wildcards = []
......@@ -316,7 +316,7 @@ class MainWindow(QtWidgets.QMainWindow, UIMainWindow):
if self.data_type == 'RT130':
req_wf_chans = req_dss
if req_dss != [10] and req_mseed_wildcards != []:
if req_dss != ['*'] and req_mseed_wildcards != []:
msg = 'MSeed Wildcards will be ignored for RT130.'
self.processing_log.append((msg, LogType.WARNING))
else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment