From 6bd4e983c83b09e3a01fa0fefbd268d9df9e420b Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 11 Feb 2020 10:22:29 -0300 Subject: [PATCH 1/3] SOFB.BUG: Fix PV database definitions in csdevice. --- siriuspy/siriuspy/csdevice/orbitcorr.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/siriuspy/siriuspy/csdevice/orbitcorr.py b/siriuspy/siriuspy/csdevice/orbitcorr.py index ac44552ae..88a09f937 100644 --- a/siriuspy/siriuspy/csdevice/orbitcorr.py +++ b/siriuspy/siriuspy/csdevice/orbitcorr.py @@ -532,10 +532,10 @@ def get_respmat_database(self, prefix=''): 'unit': 'Maximum number of SV to use'}, 'DeltaKickCH-Mon': { 'type': 'float', 'count': self.NR_CH, 'value': self.NR_CH*[0], - 'unit': 'Last CH kicks calculated.'}, + 'unit': 'urad.'}, 'DeltaKickCV-Mon': { 'type': 'float', 'count': self.NR_CV, 'value': self.NR_CV*[0], - 'unit': 'Last CV kicks calculated.'}, + 'unit': 'urad.'}, } return self._add_prefix(db, prefix) @@ -700,7 +700,7 @@ def get_sofb_database(self, prefix=''): def get_corrs_database(self, prefix=''): """Return OpticsCorr-Chrom Soft IOC database.""" db_ring = {'KickRF-Mon': { - 'type': 'float', 'value': 1, 'unit': 'Hz', 'prec': 3}} + 'type': 'float', 'value': 1, 'unit': 'Hz', 'prec': 2}} db = super().get_corrs_database(prefix=prefix) db.update(self._add_prefix(db_ring, prefix)) return db @@ -715,8 +715,7 @@ def get_respmat_database(self, prefix=''): 'type': 'enum', 'enums': self.EnblRF._fields, 'value': 0, 'unit': 'If RF is used in correction'}, 'DeltaKickRF-Mon': { - 'type': 'float', 'value': 0, - 'unit': 'Last RF kick calculated.'}, + 'type': 'float', 'value': 0, 'prec': 2, 'unit': 'Hz'}, } db = super().get_respmat_database(prefix=prefix) db.update(self._add_prefix(db_ring, prefix)) From ea5f6aa88c2f110df53ea341b67439ba4beecccb Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 11 Feb 2020 10:25:40 -0300 Subject: [PATCH 2/3] VER: Update VERSION file. --- siriuspy/siriuspy/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siriuspy/siriuspy/VERSION b/siriuspy/siriuspy/VERSION index feaae22ba..b50dd27dd 100644 --- a/siriuspy/siriuspy/VERSION +++ b/siriuspy/siriuspy/VERSION @@ -1 +1 @@ -1.13.0 +1.13.1 From 0937d921c554b8fe328c9a5bdb08cbb7f5afb57a Mon Sep 17 00:00:00 2001 From: Fernando Date: Tue, 11 Feb 2020 10:32:19 -0300 Subject: [PATCH 3/3] SOFB.BUG: Fix unit in DeltaKick PVs. --- siriuspy/siriuspy/csdevice/orbitcorr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/siriuspy/siriuspy/csdevice/orbitcorr.py b/siriuspy/siriuspy/csdevice/orbitcorr.py index 88a09f937..7a4feaafa 100644 --- a/siriuspy/siriuspy/csdevice/orbitcorr.py +++ b/siriuspy/siriuspy/csdevice/orbitcorr.py @@ -532,10 +532,10 @@ def get_respmat_database(self, prefix=''): 'unit': 'Maximum number of SV to use'}, 'DeltaKickCH-Mon': { 'type': 'float', 'count': self.NR_CH, 'value': self.NR_CH*[0], - 'unit': 'urad.'}, + 'unit': 'urad'}, 'DeltaKickCV-Mon': { 'type': 'float', 'count': self.NR_CV, 'value': self.NR_CV*[0], - 'unit': 'urad.'}, + 'unit': 'urad'}, } return self._add_prefix(db, prefix)