diff --git a/scripts/dom_activity.py b/scripts/dom_activity.py index f9737b5e7b344dbdfd74ce7c8df42cd4ce39258c..ca2ddf72d2d8f50f6bce3362e0eb2242ae3d32cd 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 11d7d50b9f56c89d3a6a18e5c099451ff7ef9eff..37a371fa2a99c1b45d92c36525abbc6dbbaf7f78 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