Added in the daq_new the option to add bs channels and camera channels

This commit is contained in:
2020-06-18 17:05:23 +02:00
parent 7df6c50504
commit a5ec6c71b4
2 changed files with 31 additions and 1 deletions
+4 -1
View File
@@ -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()
+27
View File
@@ -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,