add the possibility to define a default counterController for a bliss...

add the possibility to define a default counterController for a bliss controller added in default chain

bliss/controllers/bliss_controller.py

@@ -369,6 +369,10 @@ class BlissController(CounterContainer):
         """ return the low level hardware controller interface """
         raise NotImplementedError
 
+    def _get_default_chain_counter_controller(self):
+        """ return the counter controller that shoud be used with the DefaultAcquisitionChain (i.e for standard step by step scans) """
+        raise NotImplementedError
+
     def _get_subitem_default_class_name(self, cfg, parent_key):
         # Called when the class key cannot be found in the item_config.
         # Then a default class must be returned. The choice of the item_class is usually made from the parent_key value.

bliss/scanning/toolbox.py

@@ -16,6 +16,7 @@ from bliss.common.measurementgroup import (
 )
 from bliss.common.counter import CalcCounter, Counter
 from bliss.controllers.counter import CounterController, CalcCounterController
+from bliss.controllers.bliss_controller import BlissController
 from bliss.scanning.chain import AcquisitionChain
 from bliss.scanning.acquisition.timer import SoftwareTimerMaster
 
@@ -294,8 +295,10 @@ class DefaultAcquisitionChain:
                 controller = device._counter_controller
             elif isinstance(device, CounterController):
                 controller = device
+            elif isinstance(device, BlissController):
+                controller = device._get_default_chain_counter_controller()
             else:
-                msg = "default_chain config: device object must be a CounterController or a Counter,"
+                msg = "default_chain config: device object must be a CounterController, a Counter or a BlissController"
                 msg += f" instead received '{device.name}' of type {type(device)} !"
                 raise ValueError(msg)
 

tests/test_configuration/sessions/test.yml

@@ -6,12 +6,6 @@
   config-objects:
   - m2
 
-- class: Session
-  name: empty
-  setup-file: ./test_setup.py
-  icat-mapping: icat
-  config-objects: []
-
 - class: Session
   name: test_session
   setup-file: ./test_setup.py