Merge pull request #1024 from lnls-sirius/update-injctrl

Improve InjCtrl IOC
lnls-sirius · Sep 15, 2023 · c7468bc · c7468bc
2 parents fe6ef6a + 616d693
commit c7468bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/siriuspy/siriuspy/devices/injsys.py b/siriuspy/siriuspy/devices/injsys.py
@@ -931,6 +931,12 @@ def cmd_switch_to_accum(self):
             if not self._do_delta_posang(-self.delta_posang):
                 return False
 
+        # configure DpK trigger
+        if not self.is_trigdpk_onaxis:
+            delay = self.trigdpk.delay_raw + self.dpkckr_dlyref
+            if not self._config_dpk_trigger(delayraw=delay):
+                return False
+
         # set pulsed magnet pwrstate and pulse
         proced = (
             (self.pudpk.cmd_turn_off_pulse, 'turn DpK pulse off.'),

diff --git a/siriuspy/siriuspy/injctrl/bias_feedback.py b/siriuspy/siriuspy/injctrl/bias_feedback.py
@@ -250,23 +250,26 @@ def set_gp_noise_std_fit(self, value):
             self.gpmodel.likelihood.variance.unfix()
         else:
             self.gpmodel.likelihood.variance.fix()
-        self.run_callbacks('GPModNoiseStdFit-Sts')
+        self.run_callbacks('GPModNoiseStdFit-Sts', value)
+        return True
 
     def set_gp_kern_std_fit(self, value):
         """."""
         if bool(value):
             self.gpmodel.kern.variance.unfix()
         else:
             self.gpmodel.kern.variance.fix()
-        self.run_callbacks('GPModKernStdFit-Sts')
+        self.run_callbacks('GPModKernStdFit-Sts', value)
+        return True
 
     def set_gp_kern_leng_fit(self, value):
         """."""
         if bool(value):
             self.gpmodel.kern.lengthscale.unfix()
         else:
             self.gpmodel.kern.lengthscale.fix()
-        self.run_callbacks('GPModKernLenSclFit-Sts')
+        self.run_callbacks('GPModKernLenSclFit-Sts', value)
+        return True
 
     # ############ Auxiliary Methods ############
     def _callback_to_thread(self, **kwgs):