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

Merge branch 'DPS_not_display' into 'master'

Fix DSP Clock Diff channel not display

See merge request !129
parents dc32cc1f 79a170f3
No related branches found
No related tags found
1 merge request!129Fix DSP Clock Diff channel not display
Pipeline #2591 passed with stage
in 2 minutes and 37 seconds
...@@ -26,7 +26,7 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str, ...@@ -26,7 +26,7 @@ def get_chan_plot_info(org_chan_id: str, chan_info: Dict, data_type: str,
chan = 'MassPos?' chan = 'MassPos?'
if org_chan_id.startswith('Event DS'): if org_chan_id.startswith('Event DS'):
chan = 'Event DS?' chan = 'Event DS?'
if org_chan_id.startswith('DS'): if org_chan_id.startswith('DS') and 'DSP' not in org_chan_id:
chan = 'DS?' chan = 'DS?'
if org_chan_id.startswith('Disk Usage'): if org_chan_id.startswith('Disk Usage'):
chan = 'Disk Usage?' chan = 'Disk Usage?'
......
...@@ -203,10 +203,10 @@ class LogInfo(): ...@@ -203,10 +203,10 @@ class LogInfo():
return False return False
return epoch, disk, val return epoch, disk, val
def read_dps_clock_diff(self, line: str def read_dsp_clock_diff(self, line: str
) -> Union[bool, Tuple[float, float]]: ) -> Union[bool, Tuple[float, float]]:
""" """
Read DPS clock difference Read DSP clock difference
:param line: str - a line of evt message :param line: str - a line of evt message
:return epoch: float - time when info is recorded :return epoch: float - time when info is recorded
:return total: float - total difference time in milliseconds :return total: float - total difference time in milliseconds
...@@ -415,11 +415,11 @@ class LogInfo(): ...@@ -415,11 +415,11 @@ class LogInfo():
if epoch: if epoch:
self.add_chan_info('Jerks/DSP Sets', epoch, 0, idx) self.add_chan_info('Jerks/DSP Sets', epoch, 0, idx)
elif "DPS clock diff" in line: elif "DSP CLOCK DIFFERENCE" in line:
ret = self.read_dps_clock_diff() ret = self.read_dsp_clock_diff(line)
if ret: if ret:
epoch, total = ret epoch, total = ret
self.add_chan_info('DPS Clock Diff', epoch, total, idx) self.add_chan_info('DSP Clock Diff', epoch, total, idx)
elif "ACQUISITION STARTED" in line: elif "ACQUISITION STARTED" in line:
epoch = self.simple_read(line)[1] epoch = self.simple_read(line)[1]
......
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