From 378081a90222768cdf3c27335811c0a5e357aff1 Mon Sep 17 00:00:00 2001
From: kienle <kienle@passcal.nmt.edu>
Date: Wed, 9 Aug 2023 16:57:21 -0600
Subject: [PATCH] Add back code from master
---
.../model/reftek/from_rt2ms/packet.py | 37 ++++++++++++++++++-
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/sohstationviewer/model/reftek/from_rt2ms/packet.py b/sohstationviewer/model/reftek/from_rt2ms/packet.py
index 313bf788c..fcd2abe24 100644
--- a/sohstationviewer/model/reftek/from_rt2ms/packet.py
+++ b/sohstationviewer/model/reftek/from_rt2ms/packet.py
@@ -13,7 +13,10 @@ Maeva Pourpoint IRIS/PASSCAL
import obspy.io.reftek.packet as obspy_rt130_packet
from obspy import UTCDateTime
-from obspy.io.reftek.util import (_decode_ascii, _parse_long_time)
+from obspy.io.reftek.util import (
+ _decode_ascii, _parse_long_time, _16_tuple_ascii, _16_tuple_float,
+ _16_tuple_int,
+)
from sohstationviewer.model.reftek.from_rt2ms.soh_packet import SOHPacket
@@ -36,7 +39,37 @@ EH_PAYLOAD = {
"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),
}
-obspy_rt130_packet.EH_PAYLOAD = EH_PAYLOAD
+
+obspy_rt130_packet.EH_PAYLOAD = {
+ "trigger_time_message": (0, 33, _decode_ascii),
+ "time_source": (33, 1, _decode_ascii),
+ "time_quality": (34, 1, _decode_ascii),
+ "station_name_extension": (35, 1, _decode_ascii),
+ "station_name": (36, 4, _decode_ascii),
+ "stream_name": (40, 16, _decode_ascii),
+ "_reserved_2": (56, 8, _decode_ascii),
+ "sampling_rate": (64, 4, float),
+ "trigger_type": (68, 4, _decode_ascii),
+ "trigger_time": (72, 16, _parse_long_time),
+ "first_sample_time": (88, 16, _parse_long_time),
+ "detrigger_time": (104, 16, _parse_long_time),
+ "last_sample_time": (120, 16, _parse_long_time),
+ "channel_adjusted_nominal_bit_weights": (136, 128, _16_tuple_ascii),
+ "channel_true_bit_weights": (264, 128, _16_tuple_ascii),
+ "channel_gain_code": (392, 16, _16_tuple_ascii),
+ "channel_ad_resolution_code": (408, 16, _16_tuple_ascii),
+ "channel_fsa_code": (424, 16, _16_tuple_ascii),
+ "channel_code": (440, 64, _16_tuple_ascii),
+ "channel_sensor_fsa_code": (504, 16, _16_tuple_ascii),
+ "channel_sensor_vpu": (520, 96, _16_tuple_float),
+ "channel_sensor_units_code": (616, 16, _16_tuple_ascii),
+ "station_channel_number": (632, 48, _16_tuple_int),
+ "_reserved_3": (680, 156, _decode_ascii),
+ "total_installed_channels": (836, 2, int),
+ "station_comment": (838, 40, _decode_ascii),
+ "digital_filter_list": (878, 16, _decode_ascii),
+ "position": (894, 26, _decode_ascii),
+ "reftek_120": (920, 80, None)}
class EHPacket(obspy_rt130_packet.EHPacket):
--
GitLab