diff --git a/pxiii_bec/device_configs/beam_steerer.yaml b/pxiii_bec/device_configs/beam_steerer.yaml index fe78291..577c29f 100644 --- a/pxiii_bec/device_configs/beam_steerer.yaml +++ b/pxiii_bec/device_configs/beam_steerer.yaml @@ -1,7 +1,7 @@ -beam_profile: +beam_profile_gaussian: readoutPriority: baseline - description: Beam location and size based on AD sample camera analysis - deviceClass: pxiii_bec.devices.BeamProfile + description: Beam location and size based on AD sample camera analysis with gaussiant fitting + deviceClass: pxiii_bec.devices.GaussianBeamProfile deviceConfig: prefix: "X06DA-ES-MS:XYP1:" deviceTags: @@ -9,6 +9,19 @@ beam_profile: enabled: true readOnly: false softwareTrigger: false + +beam_profile_centroid: + readoutPriority: baseline + description: Beam location and size based on AD sample camera analysis with centroid analysis + deviceClass: pxiii_bec.devices.CentroidBeamProfile + deviceConfig: + prefix: "X06DA-ES-MS:Stats5:" + deviceTags: + - beam + enabled: true + readOnly: false + softwareTrigger: false + beam_steering: readoutPriority: on_request description: Beam location and size based on AD sample camera analysis @@ -16,13 +29,15 @@ beam_steering: deviceConfig: prefix: "" hfm_step_per_x_px: -0.00013 - vfm_step_per_y_px: 0.00033 - sample_loc_x_px: 1000 - sample_loc_y_px: 1000 - px_tolerance: 2 - step_fraction: 0.4 + vfm_step_per_y_px: -0.00033 + sample_loc_x_px: 1030 + sample_loc_y_px: 889 + px_tolerance: 3 + step_fraction: 0.7 + userParameter: + profile_provider: "beam_profile_centroid" # "centroid" or "gaussian" deviceTags: - beam enabled: true readOnly: false - softwareTrigger: false \ No newline at end of file + softwareTrigger: false diff --git a/pxiii_bec/devices/__init__.py b/pxiii_bec/devices/__init__.py index af21dfb..d9be43d 100644 --- a/pxiii_bec/devices/__init__.py +++ b/pxiii_bec/devices/__init__.py @@ -5,7 +5,7 @@ Ophyd devices for the PX III beamline, including the MX specific Aerotech A3200 @author: mohacsi_i """ -from mx_bec.devices.beam_profile import BeamProfile +from mx_bec.devices.beam_profile import CentroidBeamProfile, GaussianBeamProfile from mx_bec.devices.beam_steering import BeamSteerer from .A3200 import AerotechAbrStage