From a5ec6c71b465d2bbd7f5699b9484097f377fbaf7 Mon Sep 17 00:00:00 2001
From: Roman Mankowsky <roman.mankowsky@psi.ch>
Date: Thu, 18 Jun 2020 17:05:23 +0200
Subject: [PATCH] Added in the daq_new the option to add bs channels and camera
 channels

---
 eco/acquisition/daq_client.py |  5 ++++-
 eco/bernina/config.py         | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/eco/acquisition/daq_client.py b/eco/acquisition/daq_client.py
index 199c932..3568c41 100644
--- a/eco/acquisition/daq_client.py
+++ b/eco/acquisition/daq_client.py
@@ -18,6 +18,7 @@ class Daq:
         channels_JF=None,
         channels_BS=None,
         channels_BSCAM=None,
+        channels_CA=None,
         name=None,
     ):
         self.channels = {}
@@ -51,6 +52,8 @@ class Daq:
                 directory_relative=Path(file_name).parents[0],
                 wait=True,
                 channels_JF=self.channels["channels_JF"].get_current_value(),
+                channels_BS=self.channels["channels_BS"].get_current_value(),
+                channels_BSCAM=self.channels["channels_BSCAM"].get_current_value(),
             )
             acquisition.acquisition_kwargs.update({"file_names": file_names})
             for key, val in acquisition.acquisition_kwargs.items():
@@ -135,7 +138,7 @@ class Daq:
                 files_extensions.append(ch)
         if channels_BSCAM:
             parameters["camera_list"] = channels_BSCAM
-            files_extensions.append("BSREAD.CAMERAS")
+            files_extensions.append("CAMERAS")
         if directory_relative:
             parameters["directory_name"] = directory_relative.as_posix()
 
diff --git a/eco/bernina/config.py b/eco/bernina/config.py
index 8bdb403..e42d406 100755
--- a/eco/bernina/config.py
+++ b/eco/bernina/config.py
@@ -540,6 +540,30 @@ components = [
         "kwargs": {},
         "lazy": True,
     },
+    {
+        "args": ["/photonics/home/gac-bernina/eco/configuration/channels_BS"],
+        "name": "channels_BS",
+        "desc": "jf detector channels",
+        "type": "eco.devices_general.adjustable:AdjustableFS",
+        "kwargs": {},
+        "lazy": True,
+    },
+    {
+        "args": ["/photonics/home/gac-bernina/eco/configuration/channels_BSCAM"],
+        "name": "channels_BSCAM",
+        "desc": "jf detector channels",
+        "type": "eco.devices_general.adjustable:AdjustableFS",
+        "kwargs": {},
+        "lazy": True,
+    },
+    {
+        "args": ["/photonics/home/gac-bernina/eco/configuration/channels_CA"],
+        "name": "channels_CA",
+        "desc": "jf detector channels",
+        "type": "eco.devices_general.adjustable:AdjustableFS",
+        "kwargs": {},
+        "lazy": True,
+    },
     {
         "args": [],
         "name": "default_channel_list",
@@ -701,6 +725,9 @@ components = [
             "instrument": "bernina",
             "pgroup": config["pgroup"],
             "channels_JF": Component("channels_JF"),
+            "channels_BS": Component("channels_BS"),
+            "channels_BSCAM": Component("channels_BSCAM"),
+            "channels_CA": Component("channels_CA"),
             "pulse_id_adj": "SARES20-CVME-01-EVR0:RX-PULSEID",
             "event_master": Component("event_master"),
             "detectors_event_code": 50,