Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
19 changes: 19 additions & 0 deletions src/dodal/beamlines/configs/i10_2/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
beamline: "i10"

base_imports:
- "from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline"
- "from dodal.device_manager import DeviceManager"
- "from dodal.log import set_beamline as set_log_beamline"
- "from dodal.utils import BeamlinePrefix, get_beamline_name"

setup_script: |
devices = DeviceManager()
BL = get_beamline_name('{beamline}')
set_log_beamline(BL)
set_utils_beamline(BL)
PREFIX = BeamlinePrefix(BL)

# Only these files will be processed
device_files:
- "devices/mirrors.yaml"
- "devices/detectors.yaml"
25 changes: 25 additions & 0 deletions src/dodal/beamlines/configs/i10_2/devices/detectors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- section: "Rasor Detectors"
device: rasor_det_scalers
type: RasorScalerCard1
import_from: "dodal.devices.i10.rasor.rasor_scaler_cards"
params:
prefix: "ME01D-EA-SCLR-01:SCALER1"

- section: "Rasor Detectors"
device: rasor_sr570
type: RasorSR570
import_from: "dodal.devices.i10.rasor.rasor_current_amp"
params:
prefix: "ME01D-EA-IAMP"

- section: "Rasor Detectors"
device: rasor_sr570_pa_scaler_det
type: CurrentAmpDet
import_from: "dodal.devices.current_amplifiers"
params:
current_amp: "rasor_sr570().ca1"
counter: "rasor_det_scalers().det"
decorators:
- name: "devices.factory"
args:
mock: true
25 changes: 25 additions & 0 deletions src/dodal/beamlines/configs/i10_2/devices/mirrors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- section: "Mirrors"
device: focusing_mirror
type: PiezoMirror
import_from: "dodal.devices.i10"
params:
prefix: 'f"{PREFIX.beamline_prefix}-OP-FOCS-01:"'

- section: "Mirrors"
device: switching_mirror
type: PiezoMirror
import_from: "dodal.devices.i10"
params:
prefix: "f'{PREFIX.beamline_prefix}-OP-SWTCH-01:'"
decorators:
- name: "devices.factory"
args:
skip: false

- section: "Mirrors"
device: switching_mirror_backup
type: PiezoMirror
import_from: "dodal.devices.i10"
params:
prefix: "tbsjkfbnskfbnsk"
decorators: [] #no decorators
Empty file.
17 changes: 17 additions & 0 deletions src/dodal/beamlines/configs/i10_recovered/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
beamline: i10
base_imports:
- from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
- from dodal.device_manager import DeviceManager
- from dodal.log import set_beamline as set_log_beamline
- from dodal.utils import BeamlinePrefix, get_beamline_name
setup_script: 'devices = DeviceManager()

BL = get_beamline_name(''{beamline}'')

set_log_beamline(BL)

set_utils_beamline(BL)

PREFIX = BeamlinePrefix(BL)'
device_files:
- devices.yaml
166 changes: 166 additions & 0 deletions src/dodal/beamlines/configs/i10_recovered/devices.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
- device: focusing_mirror
type: PiezoMirror
import_from: dodal.devices.i10
decorators:
- name: devices.factory
args: {}
params:
prefix: f'{PREFIX.beamline_prefix}-OP-FOCS-01:'
- device: slits
type: I10Slits
import_from: dodal.devices.i10
decorators:
- name: devices.factory
args: {}
params:
prefix: f'{PREFIX.beamline_prefix}-AL-SLITS-'
- device: slits_current
type: I10SlitsDrainCurrent
import_from: dodal.devices.i10
decorators:
- name: devices.factory
args: {}
params:
prefix: f'{PREFIX.beamline_prefix}-'
- device: diagnostics
type: I10Diagnostic
import_from: dodal.devices.i10.diagnostics
decorators:
- name: devices.factory
args: {}
params:
prefix: f'{PREFIX.beamline_prefix}-DI-'
- device: d5a_det
type: I10Diagnostic5ADet
import_from: dodal.devices.i10.diagnostics
decorators:
- name: devices.factory
args: {}
params:
prefix: f'{PREFIX.beamline_prefix}-DI-'
- device: pin_hole
type: XYStage
import_from: dodal.devices.motors
decorators:
- name: devices.factory
args: {}
params:
prefix: 'ME01D-EA-PINH-01:'
- device: det_slits
type: DetSlits
import_from: dodal.devices.i10.rasor.rasor_motors
decorators:
- name: devices.factory
args: {}
params:
prefix: ME01D-MO-APTR-0
- device: diffractometer
type: Diffractometer
import_from: dodal.devices.i10.rasor.rasor_motors
decorators:
- name: devices.factory
args: {}
params:
prefix: 'ME01D-MO-DIFF-01:'
- device: pa_stage
type: PaStage
import_from: dodal.devices.i10.rasor.rasor_motors
decorators:
- name: devices.factory
args: {}
params:
prefix: 'ME01D-MO-POLAN-01:'
- device: sample_stage
type: XYZStage
import_from: dodal.devices.motors
decorators:
- name: devices.factory
args: {}
params:
prefix: 'ME01D-MO-CRYO-01:'
- device: rasor_temperature_controller
type: Lakeshore340
import_from: dodal.devices.temperture_controller
decorators:
- name: devices.factory
args: {}
params:
prefix: 'ME01D-EA-TCTRL-01:'
- device: rasor_femto
type: RasorFemto
import_from: dodal.devices.i10.rasor.rasor_current_amp
decorators:
- name: devices.factory
args: {}
params:
prefix: ME01D-EA-IAMP
- device: rasor_det_scalers
type: RasorScalerCard1
import_from: dodal.devices.i10.rasor.rasor_scaler_cards
decorators:
- name: devices.factory
args: {}
params:
prefix: ME01D-EA-SCLR-01:SCALER1
- device: rasor_sr570
type: RasorSR570
import_from: dodal.devices.i10.rasor.rasor_current_amp
decorators:
- name: devices.factory
args: {}
params:
prefix: ME01D-EA-IAMP
- device: rasor_sr570_pa_scaler_det
type: CurrentAmpDet
import_from: dodal.devices.current_amplifiers
decorators:
- name: devices.factory
args: {}
params:
current_amp: rasor_sr570().ca1
counter: rasor_det_scalers().det
- device: rasor_femto_pa_scaler_det
type: CurrentAmpDet
import_from: dodal.devices.current_amplifiers
decorators:
- name: devices.factory
args: {}
params:
current_amp: rasor_femto().ca1
counter: rasor_det_scalers().det
- device: rasor_sr570_fluo_scaler_det
type: CurrentAmpDet
import_from: dodal.devices.current_amplifiers
decorators:
- name: devices.factory
args: {}
params:
current_amp: rasor_sr570().ca2
counter: rasor_det_scalers().fluo
- device: rasor_femto_fluo_scaler_det
type: CurrentAmpDet
import_from: dodal.devices.current_amplifiers
decorators:
- name: devices.factory
args: {}
params:
current_amp: rasor_femto().ca2
counter: rasor_det_scalers().fluo
- device: rasor_sr570_drain_scaler_det
type: CurrentAmpDet
import_from: dodal.devices.current_amplifiers
decorators:
- name: devices.factory
args: {}
params:
current_amp: rasor_sr570().ca3
counter: rasor_det_scalers().drain
- device: rasor_femto_drain_scaler_det
type: CurrentAmpDet
import_from: dodal.devices.current_amplifiers
decorators:
- name: devices.factory
args: {}
params:
current_amp: rasor_femto().ca3
counter: rasor_det_scalers().drain
6 changes: 6 additions & 0 deletions src/dodal/beamlines/configs/i10_recovered/generate_i10.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from dodal.common.beamlines.config_generator import translate_beamline_py_config_to_yaml

translate_beamline_py_config_to_yaml(
py_file_path="/workspaces/dodal/src/dodal/beamlines/i10.py",
output_dir="/workspaces/dodal/src/dodal/beamlines/configs/i10_recovered",
)
Loading
Loading