diff --git a/sohstationviewer/model/reftek/reftek_data/core.py b/sohstationviewer/model/reftek/reftek_data/core.py index 548f4e0f47dec7040e27938fb6f4539dac29a452..a5c75e9a6636f6186f61ff570bbad030c835400b 100644 --- a/sohstationviewer/model/reftek/reftek_data/core.py +++ b/sohstationviewer/model/reftek/reftek_data/core.py @@ -216,29 +216,6 @@ class Reftek130(obspy_rt130_core.Reftek130): # payload, so add it to stats as well.. tr.stats.reftek130['channel_number'] = channel_number tr.stats.starttime = UTCDateTime(ns=starttime) - """ - if component codes were explicitly provided, use them - together with the stream label - if component_codes is not None: - tr.stats.channel = (eh.stream_name.strip() + - component_codes[channel_number]) - # otherwise check if channel code is set for the given - # channel (seems to be not the case usually) - elif eh.channel_code[channel_number] is not None: - tr.stats.channel = eh.channel_code[channel_number] - # otherwise fall back to using the stream label together - # with the number of the channel in the file (starting with - # 0, as Z-1-2 is common use for data streams not oriented - # against North) - else: - msg = ("No channel code specified in the data file " - "and no component codes specified. Using " - "stream label and number of channel in file as " - "channel codes.") - warnings.warn(msg) - tr.stats.channel = ( - eh.stream_name.strip() + str(channel_number)) - """ DS = self._data['data_stream_number'][0] + 1 if DS != 9: tr.stats.channel = "DS%s-%s" % (DS, channel_number + 1) diff --git a/sohstationviewer/model/reftek/reftek_data/packet.py b/sohstationviewer/model/reftek/reftek_data/packet.py index a4b5cd84e0905f63c5c62cc1d30eee74bc3bcbee..be79c3eb93ade8850c3a0a30aa11a5b8c7ae61fe 100644 --- a/sohstationviewer/model/reftek/reftek_data/packet.py +++ b/sohstationviewer/model/reftek/reftek_data/packet.py @@ -130,33 +130,8 @@ class EHPacket(obspy_rt130_packet.EHPacket): Formatting of strings is based on earlier version of rt2ms. """ info = [] - # packet_tagline1 = ("\n\n{:s} exp {:02d} bytes {:04d} {:s} ID: {:s} " - # "seq {:04d}".format(self.type.decode(), - # self.experiment_number, - # self.byte_count, - # Packet.time_tag(self.time), - # self.unit_id.decode(), - # self.packet_sequence)) - # info.append(packet_tagline1) - # if self.type.decode('ASCII') == 'EH': - # nbr_DT_samples = 0 - # info.append("\nEvent Header") - # else: - # info.append("\nEvent Trailer") - # info.append("\n event = " + str(self.event_number)) - # info.append("\n stream = " + str(self.data_stream_number + 1)) - # info.append("\n format = " + self.data_format.decode('ASCII')) - # info.append("\n stream name = " + self.stream_name) - # info.append("\n sample rate = " + str(self.sampling_rate)) - # info.append("\n trigger type = " + self.trigger_type) trigger_time = SOHPacket.time_tag(UTCDateTime(ns=self.trigger_time)) - # info.append("\n trigger time = " + trigger_time) first_sample_time = SOHPacket.time_tag(UTCDateTime(ns=self.first_sample_time)) # noqa: E501 - # info.append("\n first sample = " + first_sample_time) - # if self.last_sample_time: - # info.append("\n last sample = " + Packet.time_tag(UTCDateTime(ns=self.last_sample_time))) # noqa: E501 - # info.append("\n bit weights = " + " ".join([val for val in self.channel_adjusted_nominal_bit_weights if val])) # noqa: E501 - # info.append("\n true weights = " + " ".join([val for val in self.channel_true_bit_weights if val])) # noqa: E501 packet_tagline2 = ("\nDAS: {:s} EV: {:04d} DS: {:d} FST = {:s} TT = " "{:s} NS: {:d} SPS: {:.1f} ETO: 0" .format(self.unit_id.decode(), diff --git a/sohstationviewer/model/reftek/reftek_data/soh_packet.py b/sohstationviewer/model/reftek/reftek_data/soh_packet.py index 7740e2ad57962392a9a77de3034b35050ffd8ffb..c3a83f6be54778001b1180c017cb6530b76e8d52 100644 --- a/sohstationviewer/model/reftek/reftek_data/soh_packet.py +++ b/sohstationviewer/model/reftek/reftek_data/soh_packet.py @@ -313,12 +313,6 @@ class SOHPacket(obspy_rt130_packet.Packet): @property def packet_tagline(self): return "\n" - # return "\n\n{:s} exp {:02d} bytes {:04d} {:s} ID: {:s} seq {:04d}".format(self.type.decode(), # noqa: E501 - # self.experiment_number, # noqa: E501 - # self.byte_count, # noqa: E501 - # self.time_tag(self.time), # noqa: E501 - # self.unit_id.decode(), # noqa: E501 - # self.packet_sequence) # noqa: E501 class SHPacket(SOHPacket): @@ -391,10 +385,6 @@ class SCPacket(SOHPacket): def __str__(self): info = [] - # info.append(self.packet_tagline) - # packet_soh_string = ("\nStation Channel Definition {:s} ST: {:s}" - # .format(self.time_tag(self.time, implement_time=self.implement_time), # noqa: E501 - # self.unit_id.decode())) packet_soh_string = ("\nStation Channel Definition {:s} ST: {:s}" .format(self.time_tag(self.time), self.unit_id.decode()))