From a0586091cc928adede07c6e86dfd947202aeab8b Mon Sep 17 00:00:00 2001
From: Tamas Gal <tgal@km3net.de>
Date: Mon, 26 Mar 2018 23:24:03 +0200
Subject: [PATCH] Use daqparser
---
scripts/dom_activity.py | 21 +++++++--------------
scripts/dom_rates.py | 18 ++++++++----------
2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/scripts/dom_activity.py b/scripts/dom_activity.py
index f9737b5..ca2ddf7 100755
--- a/scripts/dom_activity.py
+++ b/scripts/dom_activity.py
@@ -56,22 +56,15 @@ class DOMActivityPlotter(kp.Module):
if self.index % 30:
return blob
- tag = str(blob['CHPrefix'].tag)
+ if 'RawSummaryslice' in blob:
+ summaryslice = blob['RawSummaryslice']
+ timestamp = summaryslice.header.time_stamp
- if tag != 'IO_SUM':
- return blob
-
- data = blob['CHData']
- data_io = BytesIO(data)
- preamble = kp.io.daq.DAQPreamble(file_obj=data_io) # noqa
- summaryslice = kp.io.daq.DAQSummaryslice(file_obj=data_io)
- timestamp = summaryslice.header.time_stamp
-
- for dom_id, _ in summaryslice.summary_frames.items():
- du, dom, _ = self.detector.doms[dom_id]
- self.last_activity[(du, dom)] = timestamp
+ for dom_id, _ in summaryslice.summary_frames.items():
+ du, dom, _ = self.detector.doms[dom_id]
+ self.last_activity[(du, dom)] = timestamp
- self.cuckoo.msg()
+ self.cuckoo.msg()
return blob
diff --git a/scripts/dom_rates.py b/scripts/dom_rates.py
index 11d7d50..37a371f 100755
--- a/scripts/dom_rates.py
+++ b/scripts/dom_rates.py
@@ -57,16 +57,14 @@ class MonitorRates(kp.Module):
if self.index % 30:
return blob
- data = blob['CHData']
- data_io = BytesIO(data)
- preamble = kp.io.daq.DAQPreamble(file_obj=data_io) # noqa
- summaryslice = kp.io.daq.DAQSummaryslice(file_obj=data_io)
- self.rates = {} # TODO: review this hack
- for dom_id, rates in summaryslice.summary_frames.items():
- du, dom, _ = self.detector.doms[dom_id]
- self.rates[(du, dom)] = np.sum(rates) / 1000
-
- self.cuckoo.msg()
+ if 'RawSummaryslice' in blob:
+ summaryslice = blob['RawSummaryslice']
+ self.rates = {} # TODO: review this hack
+ for dom_id, rates in summaryslice.summary_frames.items():
+ du, dom, _ = self.detector.doms[dom_id]
+ self.rates[(du, dom)] = np.sum(rates) / 1000
+
+ self.cuckoo.msg()
return blob
--
GitLab