Merge branch 'fix-plotlegend-blinking' into 'master'

Fix blinking regulation plot legend

Closes #2743

See merge request !3684

CHANGELOG.md

@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
           too much memory is used
     - `scan_info["requests"]` is not anymore read (replaced by `channels`)
     - Update to silx 0.15
+- Demo
+    - Added regulation mock to the demo session
 
 ### Changed
 
@@ -38,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Flint
     - Fixed slow rendering occurred on live curves and scatters with fast scans
     - The video image is now also used for Lima EXTRERNAL_TRIGGER and EXTERNAL_GATE
+    - Fixed blinking of the regulation plot legend
 
 ### Removed
 

bliss/common/regulation.py

@@ -2075,8 +2075,6 @@ class RegPlot:
             try:
                 self.fig.submit("setAutoReplot", False)
 
-                self.fig.clear_data()
-
                 self.fig.add_data(self.loop.history_data["time"], field="time")
                 self.fig.add_data(self.loop.history_data["input"], field="Input")
                 self.fig.add_data(self.loop.history_data["output"], field="Output")
@@ -2109,7 +2107,7 @@ class RegPlot:
 
                 self.fig.submit("setAutoReplot", True)
 
-            except (gevent.timeout.Timeout, Exception) as e:
-                pass
+            except (gevent.timeout.Timeout, Exception):
+                log_debug(self, "Error while plotting the data", exc_info=True)
 
             gevent.sleep(self.sleep_time)

demo/demo_configuration/regulation.yml

+-
+    class: Mockup
+    module: temperature.mockup
+    plugin: regulation
+    inputs:
+        -
+            name: thermo_sample_new
+            channel: A
+            unit: deg
+            cooling_rate: 1.0
+            tango_server: temp1
+        -
+            name: sensor_new
+            channel: B
+            cooling_rate: 2.0
+            tango_server: temp1
+
+    outputs:
+        -
+            name: heater_new
+            channel: A 
+            unit: Volt
+            low_limit:  0.0
+            high_limit: 100.0
+            ramprate: 0.0
+            heating_rate: 10.0
+            tango_server: temp1
+
+    ctrl_loops:
+        -
+            name: regulation
+            input: $thermo_sample_new
+            output: $heater_new
+            P: 0.5
+            I: 0.2
+            D: 0.0
+            low_limit: 0.0
+            high_limit: 1.0
+            frequency: 10.0
+            deadband: 0.05
+            deadband_time: 1.5
+            ramprate: 1.0
+            wait_mode: deadband
+            tango_server: temp1

demo/demo_configuration/sessions/demo_session.yml

@@ -25,6 +25,7 @@
     - transfocator
     - wcid00a
     - white_beam_attn
+    - regulation
 - class: MeasurementGroup
   name: MG1
   counters:

demo/start_demo_servers.py

@@ -97,12 +97,12 @@ def start_beacon(db_path):
 
     args = [
         "--port=%d" % ports.beacon_port,
-        "--redis_port=%d" % ports.redis_port,
-        "--redis_socket=" + redis_uds,
+        "--redis-port=%d" % ports.redis_port,
+        "--redis-socket=" + redis_uds,
         "--redis-data-port=%d" % ports.redis_data_port,
         "--redis-data-socket=" + redis_data_uds,
         "--db_path=" + db_path,
-        "--tango_port=%d" % ports.tango_port,
+        "--tango-port=%d" % ports.tango_port,
         # "--log-level=INFO",
         # "--tango_debug_level=1",
     ]