diff --git a/as-ap-opticscorr/as_ap_opticscorr/chrom/main.py b/as-ap-opticscorr/as_ap_opticscorr/chrom/main.py index 685ab6574..5fd759ed0 100644 --- a/as-ap-opticscorr/as_ap_opticscorr/chrom/main.py +++ b/as-ap-opticscorr/as_ap_opticscorr/chrom/main.py @@ -298,8 +298,8 @@ def write(self, reason, value): else: val = 1 - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=2) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=2, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.setParam('SyncCorr-Sts', self._sync_corr) @@ -404,8 +404,8 @@ def _connection_callback_sfam_sl_rb(self, pvname, conn, **kws): # Change the first bit of correction status val = (1 if any(s == 0 for s in self._sfam_check_connection) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=0) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=0, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -439,8 +439,8 @@ def _callback_sfam_pwrstate_sts(self, pvname, value, **kws): # Change the second bit of correction status val = (1 if any(s == 0 for s in self._sfam_check_pwrstate_sts) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=1) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=1, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -457,8 +457,8 @@ def _callback_sfam_opmode_sts(self, pvname, value, **kws): opmode = self._sync_corr val = (1 if any(s != opmode for s in self._sfam_check_opmode_sts) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=2) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=2, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -475,8 +475,8 @@ def _callback_sfam_ctrlmode_mon(self, pvname, value, **kws): # Change the fourth bit of correction status val = (1 if any(s == 1 for s in self._sfam_check_ctrlmode_mon) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=3) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=3, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -497,8 +497,8 @@ def _callback_timing_state(self, pvname, value, **kws): # Change the fifth bit of correction status val = (1 if any(index == 0 for index in self._timing_check_config) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=4) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=4, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() diff --git a/as-ap-opticscorr/as_ap_opticscorr/tune/main.py b/as-ap-opticscorr/as_ap_opticscorr/tune/main.py index 7ce8e95e4..3b13b4b33 100644 --- a/as-ap-opticscorr/as_ap_opticscorr/tune/main.py +++ b/as-ap-opticscorr/as_ap_opticscorr/tune/main.py @@ -292,8 +292,8 @@ def write(self, reason, value): else: val = 1 - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=2) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=2, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.setParam('SyncCorr-Sts', self._sync_corr) @@ -448,8 +448,8 @@ def _connection_callback_qfam_kl_rb(self, pvname, conn, **kws): # Change the first bit of correction status val = (1 if any(q == 0 for q in self._qfam_check_connection) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=0) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=0, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -476,8 +476,8 @@ def _callback_qfam_pwrstate_sts(self, pvname, value, **kws): # Change the second bit of correction status val = (1 if any(q == 0 for q in self._qfam_check_pwrstate_sts) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=1) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=1, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -494,8 +494,8 @@ def _callback_qfam_opmode_sts(self, pvname, value, **kws): opmode = self._sync_corr val = (1 if any(s != opmode for s in self._qfam_check_opmode_sts) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=2) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=2, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -512,8 +512,8 @@ def _callback_qfam_ctrlmode_mon(self, pvname, value, **kws): # Change the fourth bit of correction status val = (1 if any(q == 1 for q in self._qfam_check_ctrlmode_mon) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=3) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=3, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -534,8 +534,8 @@ def _callback_timing_state(self, pvname, value, **kws): # Change the fifth bit of correction status val = (1 if any(index == 0 for index in self._timing_check_config) else 0) - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=5, value=val, bit=4) + self._status = _siriuspy.util.update_bit( + v=self._status, bit_pos=4, bit_val=val) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() diff --git a/as-ap-posang/as_ap_posang/main.py b/as-ap-posang/as_ap_posang/main.py index acbe3e2a4..8fe5e8120 100644 --- a/as-ap-posang/as_ap_posang/main.py +++ b/as-ap-posang/as_ap_posang/main.py @@ -370,12 +370,10 @@ def _connection_callback_corr_kick_pvs(self, pvname, conn, **kws): self._corr_check_connection[corr_index] = (1 if conn else 0) # Change the first bit of correction status - if any(q == 0 for q in self._corr_check_connection): - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=1, bit=0) - else: - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=0, bit=0) + self._status = _siriuspy.util.update_bit( + v=self._status, + bit_pos=0, + bit_val=any(q == 0 for q in self._corr_check_connection)) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -389,12 +387,10 @@ def _callback_corr_pwrstate_sts(self, pvname, value, **kws): self._corr_check_pwrstate_sts[corr_index] = value # Change the second bit of correction status - if any(q == 0 for q in self._corr_check_pwrstate_sts): - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=1, bit=1) - else: - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=0, bit=1) + self._status = _siriuspy.util.update_bit( + v=self._status, + bit_pos=1, + bit_val=any(q == 0 for q in self._corr_check_pwrstate_sts)) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -408,12 +404,10 @@ def _callback_corr_opmode_sts(self, pvname, value, **kws): self._corr_check_opmode_sts[corr_index] = value # Change the third bit of correction status - if any(s != 0 for s in self._corr_check_opmode_sts): - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=1, bit=2) - else: - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=0, bit=2) + self._status = _siriuspy.util.update_bit( + v=self._status, + bit_pos=2, + bit_val=any(s != 0 for s in self._corr_check_opmode_sts)) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs() @@ -428,12 +422,10 @@ def _callback_corr_ctrlmode_mon(self, pvname, value, **kws): self._corr_check_ctrlmode_mon[corr_index] = value # Change the fourth bit of correction status - if any(q == 1 for q in self._corr_check_ctrlmode_mon): - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=1, bit=3) - else: - self._status = _siriuspy.util.update_integer_bit( - integer=self._status, number_of_bits=4, value=0, bit=3) + self._status = _siriuspy.util.update_bit( + v=self._status, + bit_pos=3, + bit_val=any(q == 1 for q in self._corr_check_ctrlmode_mon)) self.driver.setParam('Status-Mon', self._status) self.driver.updatePVs()