From c278fbd3f4b1b039f1925221f8407a388d6c7a04 Mon Sep 17 00:00:00 2001
From: ldam <ldam@passcal.nmt.edu>
Date: Thu, 18 May 2023 15:14:28 -0600
Subject: [PATCH] remove DSP Clock Diff that is fixed in MR129
---
sohstationviewer/database/extract_data.py | 2 +-
sohstationviewer/model/reftek/log_info.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sohstationviewer/database/extract_data.py b/sohstationviewer/database/extract_data.py
index 7e45a458a..8a738d15d 100755
--- a/sohstationviewer/database/extract_data.py
+++ b/sohstationviewer/database/extract_data.py
@@ -26,7 +26,7 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
chan = 'MassPos?'
if org_chan_id.startswith('Event DS'):
chan = 'Event DS?'
- if org_chan_id.startswith('DS') and 'DSP' not in org_chan_id:
+ if org_chan_id.startswith('DS'):
chan = 'DS?'
if org_chan_id.startswith('Disk Usage'):
chan = 'Disk Usage?'
diff --git a/sohstationviewer/model/reftek/log_info.py b/sohstationviewer/model/reftek/log_info.py
index c6f50e73e..c242f822a 100644
--- a/sohstationviewer/model/reftek/log_info.py
+++ b/sohstationviewer/model/reftek/log_info.py
@@ -203,10 +203,10 @@ class LogInfo():
return False
return epoch, disk, val
- def read_dsp_clock_diff(self, line: str
+ def read_dps_clock_diff(self, line: str
) -> Union[bool, Tuple[float, float]]:
"""
- Read DSP clock difference
+ Read DPS clock difference
:param line: str - a line of evt message
:return epoch: float - time when info is recorded
:return total: float - total difference time in milliseconds
@@ -415,11 +415,11 @@ class LogInfo():
if epoch:
self.add_chan_info('Jerks/DSP Sets', epoch, 0, idx)
- elif "DSP CLOCK DIFFERENCE" in line:
- ret = self.read_dsp_clock_diff(line)
+ elif "DPS clock diff" in line:
+ ret = self.read_dps_clock_diff()
if ret:
epoch, total = ret
- self.add_chan_info('DSP Clock Diff', epoch, total, idx)
+ self.add_chan_info('DPS Clock Diff', epoch, total, idx)
elif "ACQUISITION STARTED" in line:
epoch = self.simple_read(line)[1]
--
GitLab