From 5ac9ed445677dc0b3beff08acdeea981cb4404f9 Mon Sep 17 00:00:00 2001 From: Alexander Steppke Date: Mon, 25 Sep 2023 17:21:12 +0200 Subject: [PATCH] added detector configuration --- channels/bs_channels.py | 22 ++++++++++++++++++++++ cristallina.py | 7 ++++++- log/cristallina.log | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/channels/bs_channels.py b/channels/bs_channels.py index f2b7628..3ed29fb 100644 --- a/channels/bs_channels.py +++ b/channels/bs_channels.py @@ -5,11 +5,32 @@ ########################################################################################################## # BS channels +from slic.core.acquisition.detcfg import DetectorConfig + # TODO: JF settings regarding raw conversion, compression, etc. detectors = [ "JF16T03V01", ] + +# ALLOWED_PARAMS = dict( +# adc_to_energy = bool, +# compression = bool, +# crystfel_lists_laser = bool, +# disabled_modules = Sequence, +# double_pixels_action = ["mask", "interp", "keep"], +# downsample = tuple, +# factor = Number, +# geometry = bool, +# remove_raw_files = bool, +# roi = dict, #TODO: check on contents of the dict? +# save_dap_results = bool +# ) + +detectors_with_config = DetectorConfig(detectors) +detectors_with_config["JF16T03V01"]['save_dap_results'] = True + + camera_channels = [ # "SARES30-CAMS156-PCO1:FPICTURE", # PCO edge camera for the wavefront analysis (from Alvra) # "SARES30-CAMS156-SMX-OAV:FPICTURE", # SwissMX OAV camera picture @@ -25,6 +46,7 @@ channels_gas_monitor = [ "SARFE10-PBIG050-EVR0:CALCI", # good for correlations with total beam intensity "SARFE10-PBPG050:HAMP-INTENSITY-CAL", ] + # RF phases and amplitudes channels_RF = [ "SINSB01-RLLE-DSP:PHASE-VS", diff --git a/cristallina.py b/cristallina.py index a79485e..23e4532 100644 --- a/cristallina.py +++ b/cristallina.py @@ -60,7 +60,12 @@ from slic.core.acquisition.fakeacquisition import FakeAcquisition from slic.devices.timing.events import CTASequencer -from channels.bs_channels import detectors, bs_channels, camera_channels +from channels.bs_channels import ( + detectors, + detectors_with_config, + bs_channels, + camera_channels, +) from channels.pv_channels import pvs from spreadsheet import overview diff --git a/log/cristallina.log b/log/cristallina.log index a49a461..4af2553 100644 --- a/log/cristallina.log +++ b/log/cristallina.log @@ -2,3 +2,36 @@ 2023-09-13 at 17:48:00 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. 2023-09-13 at 17:48:00 | INFO | Running at cristallina with pgroup p19150. 2023-09-13 at 17:48:00 | INFO | Loading finished. +2023-09-13 at 17:59:12 | INFO | Connected to stand server +2023-09-13 at 17:59:13 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-13 at 17:59:13 | INFO | Running at cristallina with pgroup p19150. +2023-09-13 at 17:59:13 | INFO | Loading finished. +2023-09-13 at 23:23:54 | INFO | Connected to stand server +2023-09-13 at 23:23:54 | WARNING | No transmission value reported from {attenuator.ID} +2023-09-13 at 23:23:55 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-13 at 23:23:56 | INFO | Running at cristallina with pgroup p19150. +2023-09-13 at 23:23:56 | INFO | Loading finished. +2023-09-23 at 18:20:47 | WARNING | Cannot connect to stand server on saresc-vcons-02.psi.ch. Caught HTTPConnectionPool(host='saresc-vcons-02.psi.ch', port=9090): Max retries exceeded with url: / (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection refused')). +2023-09-23 at 18:20:47 | WARNING | No transmission value reported from {attenuator.ID} +2023-09-23 at 18:20:48 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-23 at 18:20:51 | INFO | Running at cristallina with pgroup p19150. +2023-09-23 at 18:20:51 | INFO | Loading finished. +2023-09-23 at 18:33:46 | WARNING | Cannot connect to stand server on saresc-vcons-02.psi.ch. Caught HTTPConnectionPool(host='saresc-vcons-02.psi.ch', port=9090): Max retries exceeded with url: / (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection refused')). +2023-09-23 at 18:33:47 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-23 at 18:33:47 | INFO | Running at cristallina with pgroup p19150. +2023-09-23 at 18:33:47 | INFO | Loading finished. +2023-09-25 at 12:57:37 | WARNING | Cannot connect to stand server on saresc-vcons-02.psi.ch. Caught HTTPConnectionPool(host='saresc-vcons-02.psi.ch', port=9090): Max retries exceeded with url: / (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection refused')). +2023-09-25 at 12:57:37 | WARNING | No transmission value reported from {attenuator.ID} +2023-09-25 at 12:57:38 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-25 at 12:57:38 | INFO | Running at cristallina with pgroup p19150. +2023-09-25 at 12:57:38 | INFO | Loading finished. +2023-09-25 at 13:25:29 | WARNING | Cannot connect to stand server on saresc-vcons-02.psi.ch. Caught HTTPConnectionPool(host='saresc-vcons-02.psi.ch', port=9090): Max retries exceeded with url: / (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection refused')). +2023-09-25 at 13:25:29 | WARNING | No transmission value reported from {attenuator.ID} +2023-09-25 at 13:25:31 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-25 at 13:25:31 | INFO | Running at cristallina with pgroup p19150. +2023-09-25 at 13:25:31 | INFO | Loading finished. +2023-09-25 at 17:16:41 | WARNING | Cannot connect to stand server on saresc-vcons-02.psi.ch. Caught HTTPConnectionPool(host='saresc-vcons-02.psi.ch', port=9090): Max retries exceeded with url: / (Caused by NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection refused')). +2023-09-25 at 17:16:41 | WARNING | No transmission value reported from {attenuator.ID} +2023-09-25 at 17:16:43 | INFO | Using undulator (Aramis) offset to PSSS energy of 0 eV. +2023-09-25 at 17:16:43 | INFO | Running at cristallina with pgroup p19150. +2023-09-25 at 17:16:43 | INFO | Loading finished.