From b4347a43b585b3677ffa0b5e31dccd867c7586f4 Mon Sep 17 00:00:00 2001
From: kienle <kienle@passcal.nmt.edu>
Date: Sun, 23 Jul 2023 21:47:40 -0600
Subject: [PATCH] Fix SOH plot for RT130 data
---
sohstationviewer/model/reftek/from_rt2ms/core.py | 11 ++++++++---
.../model/reftek/rt130_experiment/eh_et_packet.py | 2 +-
.../model/reftek/rt130_experiment/reftek.py | 4 ----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/sohstationviewer/model/reftek/from_rt2ms/core.py b/sohstationviewer/model/reftek/from_rt2ms/core.py
index 0a19f3349..899026a77 100644
--- a/sohstationviewer/model/reftek/from_rt2ms/core.py
+++ b/sohstationviewer/model/reftek/from_rt2ms/core.py
@@ -18,15 +18,22 @@ import numpy as np
from obspy import Trace, Stream, UTCDateTime
from obspy.core.util.obspy_types import ObsPyException
-from obspy.io.reftek.util import _decode_ascii
+from obspy.io.reftek.util import _decode_ascii, _parse_long_time
from sohstationviewer.model.reftek.from_rt2ms import packet
+from sohstationviewer.model.reftek.from_rt2ms.soh_packet import Packet
+eh_et_payload_last_field_start = 88
+eh_et_payload_last_field_size = 16
+
+eh_et_payload_end = eh_et_payload_last_field_start + eh_et_payload_last_field_size
EH_PAYLOAD = {
"station_name_extension": (35, 1, _decode_ascii),
"station_name": (36, 4, _decode_ascii),
"sampling_rate": (64, 4, float),
+ "trigger_time": (72, 16, _parse_long_time),
+ "first_sample_time": (eh_et_payload_last_field_start, eh_et_payload_last_field_size, _parse_long_time),
}
@@ -151,8 +158,6 @@ class Reftek130(obspy_rt130_core.Reftek130):
# channel number is not included in the EH/ET packet
# payload, so add it to stats as well..
tr.stats.reftek130['channel_number'] = channel_number
- if headonly:
- tr.stats.npts = npts
tr.stats.starttime = UTCDateTime(ns=starttime)
"""
if component codes were explicitly provided, use them
diff --git a/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py b/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py
index 150ca33dc..1d03b32f9 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/eh_et_packet.py
@@ -2,10 +2,10 @@ import dataclasses
from sohstationviewer.model.mseed.read_mseed_experiment.mseed_helper import \
Unpacker
+from sohstationviewer.model.reftek.from_rt2ms.core import eh_et_payload_end
from sohstationviewer.model.reftek.rt130_experiment.reftek_helper import \
PacketHeader
-eh_et_payload_end = 92
def read_eh_et_packet(packet: bytes, unpacker: Unpacker):
event_number = int(packet[16:18].hex())
diff --git a/sohstationviewer/model/reftek/rt130_experiment/reftek.py b/sohstationviewer/model/reftek/rt130_experiment/reftek.py
index 201c6f72a..a7b353457 100644
--- a/sohstationviewer/model/reftek/rt130_experiment/reftek.py
+++ b/sohstationviewer/model/reftek/rt130_experiment/reftek.py
@@ -6,10 +6,6 @@ import numpy
import numpy as np
from obspy import UTCDateTime
from obspy.io.reftek.packet import PACKET_FINAL_DTYPE
-from obspy.io.reftek.util import (
- bcd, bcd_hex,
- bcd_julian_day_string_to_nanoseconds_of_year, bcd_16bit_int, bcd_8bit_hex,
-)
from sohstationviewer.model.mseed.read_mseed_experiment.mseed_helper import \
Unpacker
--
GitLab