From f595f4b5ce8617db2d55508061d7d47799a1cfd5 Mon Sep 17 00:00:00 2001
From: Giulio Gaio <giulio.gaio@elettra.eu>
Date: Fri, 21 Jan 2022 22:36:01 +0100
Subject: [PATCH] Fixed circular buffer shift direction
---
src/CalcStats.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/CalcStats.py b/src/CalcStats.py
index 60635dc..f8a3d66 100755
--- a/src/CalcStats.py
+++ b/src/CalcStats.py
@@ -514,19 +514,19 @@ class DeviceObj:
# History for Corr, CorrFiltAbs, CorrLow, CorrHigh
# corr
- attribute = self.prefix()+'s{:03d}_t{:03d}_Corr'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'s{:03d}_t{:03d}_Corr_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.corr[target.index]; selfseq_dev.write_attribute(attribute,val)
# corrfiltabs
- attribute = self.prefix()+'s{:03d}_t{:03d}_CorrFiltAbs'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'s{:03d}_t{:03d}_CorrFiltAbs_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.lp_filter_corr[target.index]; selfseq_dev.write_attribute(attribute,val)
# corrlow
- attribute = self.prefix()+'s{:03d}_t{:03d}_CorrLow'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'s{:03d}_t{:03d}_CorrLow_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.corr_low[target.index]; selfseq_dev.write_attribute(attribute,val)
# corrhigh
- attribute = self.prefix()+'s{:03d}_t{:03d}_CorrHigh'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'s{:03d}_t{:03d}_CorrHigh_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.corr_high[target.index]; selfseq_dev.write_attribute(attribute,val)
elif self.tag == TARGET_TAG:
@@ -546,19 +546,19 @@ class DeviceObj:
# History for Corr, CorrFiltAbs, CorrLow, CorrHigh
# corr
- attribute = self.prefix()+'t{:03d}_t{:03d}_Corr'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'t{:03d}_t{:03d}_Corr_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.corr[target.index]; selfseq_dev.write_attribute(attribute,val)
# corrfiltabs
- attribute = self.prefix()+'t{:03d}_t{:03d}_CorrFiltAbs'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'t{:03d}_t{:03d}_CorrFiltAbs_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.lp_filter_corr[target.index]; selfseq_dev.write_attribute(attribute,val)
# corrlow
- attribute = self.prefix()+'t{:03d}_t{:03d}_CorrLow'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'t{:03d}_t{:03d}_CorrLow_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.corr_low[target.index]; selfseq_dev.write_attribute(attribute,val)
# corrhigh
- attribute = self.prefix()+'t{:03d}_t{:03d}_CorrHigh'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
+ attribute = self.prefix()+'t{:03d}_t{:03d}_CorrHigh_History'.format(self.index+1); val = selfseq_dev.read_attribute(attribute); val = val.value
val = np.roll(val, -1);val[-1] = self.corr_high[target.index]; selfseq_dev.write_attribute(attribute,val)
--
GitLab