diff --git a/csaxs_bec/device_configs/bl_detectors.yaml b/csaxs_bec/device_configs/bl_detectors.yaml new file mode 100644 index 0000000..934d6a6 --- /dev/null +++ b/csaxs_bec/device_configs/bl_detectors.yaml @@ -0,0 +1,24 @@ +eiger_1_5: + description: Eiger 1.5M in-vacuum detector + deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M + deviceConfig: + detector_distance: 100 + beam_center: [0, 0] + onFailure: raise + enabled: true + readoutPriority: async + softwareTrigger: False + +ids_cam: + description: IDS camera for live image acquisition + deviceClass: csaxs_bec.devices.ids_cameras.IDSCamera + deviceConfig: + camera_id: 201 + bits_per_pixel: 24 + m_n_colormode: 1 + live_mode: True + onFailure: raise + enabled: true + readoutPriority: async + softwareTrigger: True + diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml new file mode 100644 index 0000000..c79025e --- /dev/null +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -0,0 +1,506 @@ +########################################################################## +###################### Delay generators ################################## +########################################################################## +ddg1: + description: Main delay Generator for triggering + deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DDG1 + enabled: true + deviceConfig: + prefix: 'X12SA-CPCL-DDG1:' + onFailure: raise + readOnly: false + readoutPriority: baseline + softwareTrigger: true + +ddg2: + description: Detector delay Generator for trigger burst + deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DDG2 + enabled: true + deviceConfig: + prefix: 'X12SA-CPCL-DDG2:' + onFailure: raise + readOnly: false + readoutPriority: baseline + softwareTrigger: false + +########################################################################## +###################### Multichannel Scaler################################ +########################################################################## + +mcs: + description: Mcs scalar card for transmission readout + deviceClass: csaxs_bec.devices.epics.mcs_card.mcs_card_csaxs.MCSCardCSAXS + deviceConfig: + prefix: 'X12SA-MCS:' + onFailure: raise + enabled: true + readoutPriority: monitored + softwareTrigger: false + +########################################################################## +######################## SMARACT STAGES ################################## +########################################################################## + +################## XBOX 2 ##################### +xbpm3x: + description: X-ray beam position x monitor 1 in Xbox2 + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: A + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -22.5 + +xbpm3y: + description: X-ray beam position y monitor 1 in Xbox2 + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: B + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -2 + +sl3trxi: + description: Xbox2 slit 3 inner blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: C + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -5.5 + +sl3trxo: + description: Xbox2 slit 3 outer blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: D + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 6 + +sl3trxb: + description: Xbox2 slit 3 bottom blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: E + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -5.8 + +sl3trxt: + description: Xbox2 slit 3 top blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: F + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 5.5 + +fast_shutter_n1_x: + description: Xbox2 New fast shutter 1 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: H + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -7 + in: 0 + +fast_shutter_o1_x: + description: Xbox2 Old fast shutter 1 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: G + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -15.8 + +fast_shutter_o2_x: + description: Xbox2 Old fast shutter 2 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: F + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -15.5 + +filter_array_1_x: + description: Xbox2 Filter Array 1 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: B + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 25 + +filter_array_2_x: + description: Xbox2 Filter Array 2 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: C + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 25.5 + +filter_array_3_x: + description: Xbox2 Filter Array 3 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: D + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 25.8 + +filter_array_4_x: + description: Xbox2 Filter Array 4 x movment + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: E + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 25 + +sl4trxi: + description: Xbox2 slit 4 inner blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: G + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -5.5 + +sl4trxo: + description: Xbox2 slit 4 outer blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: H + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 6 + +sl4trxb: + description: Xbox2 slit 4 bottom blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: I + host: x12sa-eb-smaract-mcs-04.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -5.8 + +sl4trxt: + description: Xbox2 slit 4 top blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: A + host: x12sa-eb-smaract-mcs-01.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: 1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 5.5 + +################## XBOX 3 ##################### + +sl5trxi: + description: Xbox3 slit 5 inner blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: C + host: x12sa-eb-smaract-mcs-02.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -6 + +sl5trxo: + description: Xbox3 slit 5 outer blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: D + host: x12sa-eb-smaract-mcs-02.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 5.5 + +sl5trxb: + description: Xbox3 slit 5 bottom blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: E + host: x12sa-eb-smaract-mcs-02.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -5.5 + +sl5trxt: + description: Xbox2 slit 5 top blade movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: F + host: x12sa-eb-smaract-mcs-02.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 6 + +xbimtrx: + description: Xbox3 beam intensity monitor x movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: A + host: x12sa-eb-smaract-mcs-02.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: -14.7 + +xbimtry: + description: Xbox3 beam intensity monitor y movement + deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor + deviceConfig: + axis_Id: B + host: x12sa-eb-smaract-mcs-02.psi.ch + limits: + - -200 + - 200 + port: 5000 + sign: -1 + # precision: 3 + # tolerance: 0.005 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: baseline + userParameter: + init_position: 0 diff --git a/csaxs_bec/device_configs/frontend.yaml b/csaxs_bec/device_configs/bl_frontend.yaml similarity index 100% rename from csaxs_bec/device_configs/frontend.yaml rename to csaxs_bec/device_configs/bl_frontend.yaml diff --git a/csaxs_bec/device_configs/optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml similarity index 94% rename from csaxs_bec/device_configs/optics_hutch.yaml rename to csaxs_bec/device_configs/bl_optics_hutch.yaml index 2683a8d..8577ea8 100644 --- a/csaxs_bec/device_configs/optics_hutch.yaml +++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml @@ -68,6 +68,11 @@ ccmx: - cSAXS - optics + +########################################################################## +######################## SMARACT STAGES ################################## +########################################################################## + xbpm2x: description: X-ray beam position monitor 1 in OPbox deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor diff --git a/csaxs_bec/device_configs/npoint_template.yaml b/csaxs_bec/device_configs/device_templates.yaml similarity index 100% rename from csaxs_bec/device_configs/npoint_template.yaml rename to csaxs_bec/device_configs/device_templates.yaml diff --git a/csaxs_bec/device_configs/endstation.yaml b/csaxs_bec/device_configs/endstation.yaml deleted file mode 100644 index 962bd71..0000000 --- a/csaxs_bec/device_configs/endstation.yaml +++ /dev/null @@ -1,55 +0,0 @@ -ddg1: - description: Main delay Generator for triggering - deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DDG1 - enabled: true - deviceConfig: - prefix: 'X12SA-CPCL-DDG1:' - onFailure: raise - readOnly: false - readoutPriority: baseline - softwareTrigger: true - -ddg2: - description: Detector delay Generator for trigger burst - deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DDG2 - enabled: true - deviceConfig: - prefix: 'X12SA-CPCL-DDG2:' - onFailure: raise - readOnly: false - readoutPriority: baseline - softwareTrigger: false - -mcs: - description: Mcs scalar card for transmission readout - deviceClass: csaxs_bec.devices.epics.mcs_card.mcs_card_csaxs.MCSCardCSAXS - deviceConfig: - prefix: 'X12SA-MCS:' - onFailure: raise - enabled: true - readoutPriority: monitored - softwareTrigger: false - -ids_cam: - description: IDS camera for live image acquisition - deviceClass: csaxs_bec.devices.ids_cameras.IDSCamera - deviceConfig: - camera_id: 201 - bits_per_pixel: 24 - m_n_colormode: 1 - live_mode: True - onFailure: raise - enabled: true - readoutPriority: async - softwareTrigger: True - -eiger_1_5: - description: Eiger 1.5M in-vacuum detector - deviceClass: csaxs_bec.devices.jungfraujoch.eiger_1_5m.Eiger1_5M - deviceConfig: - detector_distance: 100 - beam_center: [0, 0] - onFailure: raise - enabled: true - readoutPriority: async - softwareTrigger: False diff --git a/csaxs_bec/device_configs/first_light.yaml b/csaxs_bec/device_configs/first_light.yaml deleted file mode 100644 index e882957..0000000 --- a/csaxs_bec/device_configs/first_light.yaml +++ /dev/null @@ -1,8 +0,0 @@ -optics: - - !include ./optics_hutch.yaml - -frontend: - - !include ./frontend.yaml - -endstation: - - !include ./endstation.yaml \ No newline at end of file diff --git a/csaxs_bec/device_configs/bec_device_config_sastt.yaml b/csaxs_bec/device_configs/legacy/bec_device_config_sastt.yaml similarity index 100% rename from csaxs_bec/device_configs/bec_device_config_sastt.yaml rename to csaxs_bec/device_configs/legacy/bec_device_config_sastt.yaml diff --git a/csaxs_bec/device_configs/e21125_lamni_config.yaml b/csaxs_bec/device_configs/legacy/e21125_lamni_config.yaml similarity index 100% rename from csaxs_bec/device_configs/e21125_lamni_config.yaml rename to csaxs_bec/device_configs/legacy/e21125_lamni_config.yaml diff --git a/csaxs_bec/device_configs/x12sa_database.yml b/csaxs_bec/device_configs/legacy/x12sa_database.yml similarity index 100% rename from csaxs_bec/device_configs/x12sa_database.yml rename to csaxs_bec/device_configs/legacy/x12sa_database.yml diff --git a/csaxs_bec/device_configs/main.yaml b/csaxs_bec/device_configs/main.yaml new file mode 100644 index 0000000..5d77f5e --- /dev/null +++ b/csaxs_bec/device_configs/main.yaml @@ -0,0 +1,29 @@ +# This is the main configuration file that is +# commented or uncommented according to the type of experiment + +optics: + - !include ./bl_optics_hutch.yaml + +frontend: + - !include ./bl_frontend.yaml + +endstation: + - !include ./bl_endstation.yaml + +detectors: + - !include ./bl_detectors.yaml + +#sastt: +# - !include ./sastt.yaml + +#flomni: +# - !include ./ptycho_flomni.yaml + +#omny: +# - !include ./ptycho_omny.yaml + +#lamni: +# - !include ./ptycho_lamni.yaml + +#user setup: +# - !include ./user_setup.yaml \ No newline at end of file diff --git a/csaxs_bec/device_configs/flomni_config.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml similarity index 100% rename from csaxs_bec/device_configs/flomni_config.yaml rename to csaxs_bec/device_configs/ptycho_flomni.yaml diff --git a/csaxs_bec/device_configs/lamni_config.yaml b/csaxs_bec/device_configs/ptycho_lamni.yaml similarity index 100% rename from csaxs_bec/device_configs/lamni_config.yaml rename to csaxs_bec/device_configs/ptycho_lamni.yaml diff --git a/csaxs_bec/device_configs/omny_config.yaml b/csaxs_bec/device_configs/ptycho_omny.yaml similarity index 100% rename from csaxs_bec/device_configs/omny_config.yaml rename to csaxs_bec/device_configs/ptycho_omny.yaml diff --git a/csaxs_bec/device_configs/user_setup.yaml b/csaxs_bec/device_configs/user_setup.yaml new file mode 100644 index 0000000..d8ccfe0 --- /dev/null +++ b/csaxs_bec/device_configs/user_setup.yaml @@ -0,0 +1 @@ +############################################################