Skip to content

Fixes for fast energy scans bugs #2094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Relm-Arrowny merged 3 commits into from
Jun 30, 2026
+28 −23
Merged

Fixes for fast energy scans bugs #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e32c62
possible fix for move pv in jaw phase
Relm-Arrowny Jun 16, 2026
7be79b6
Merge branch 'main' into 1970-jaw_phase-set-does-not-set-it-to-move
Relm-Arrowny Jun 29, 2026
b168979
fix d5a _det connection issue
Relm-Arrowny Jun 29, 2026
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
4 changes: 2 additions & 2 deletions src/dodal/beamlines/i10_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def idd_phase() -> UndulatorPhaseAxes:
def idd_jaw_phase() -> UndulatorJawPhase:
return UndulatorJawPhase(
prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
move_pv="RPQ1",
move_pv="JAW",
)


Expand Down Expand Up @@ -191,7 +191,7 @@ def idu_phase() -> UndulatorPhaseAxes:
def idu_jaw_phase() -> UndulatorJawPhase:
return UndulatorJawPhase(
prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
move_pv="RPQ1",
move_pv="JAW",
)


Expand Down
47 changes: 26 additions & 21 deletions src/dodal/devices/beamlines/i10/diagnostics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
StrictEnum,
)
from ophyd_async.core import StandardReadableFormat as Format
from ophyd_async.core._device import DeviceConnector
from ophyd_async.epics.adaravis import (
AravisDriverIO,
)
Expand Down Expand Up @@ -196,27 +195,33 @@ def __init__(self, prefix, name: str = "") -> None:
class I10Diagnostic5ADet(Device):
"""Diagnostic 5a detection with drain current and photo diode."""

def __init__(
self, prefix: str, name: str = "", connector: DeviceConnector | None = None
) -> None:
def __init__(self, prefix: str, name: str = "") -> None:
self.drain_current_amp = FemtoDDPCA(
prefix=prefix + "IAMP-06:",
suffix="GAIN",
gain_table=Femto3xxGainTable,
gain_to_current_table=Femto3xxGainToCurrentTable,
raise_timetable=Femto3xxRaiseTime,
)
self.drain_counter = StruckScaler(
prefix=prefix + "SCLR-02:SCALER2", suffix=".S17"
)
self.drain_current = CurrentAmpDet(
current_amp=FemtoDDPCA(
prefix=prefix + "IAMP-06:",
suffix="GAIN",
gain_table=Femto3xxGainTable,
gain_to_current_table=Femto3xxGainToCurrentTable,
raise_timetable=Femto3xxRaiseTime,
),
counter=StruckScaler(prefix=prefix + "SCLR-02:SCALER2", suffix=".S17"),
current_amp=self.drain_current_amp,
counter=self.drain_counter,
)
self.diode_current_amp = FemtoDDPCA(
prefix=prefix + "IAMP-05:",
suffix="GAIN",
gain_table=Femto3xxGainTable,
gain_to_current_table=Femto3xxGainToCurrentTable,
raise_timetable=Femto3xxRaiseTime,
)
self.diode_current = StruckScaler(
prefix=prefix + "SCLR-02:SCALER2", suffix=".S18"
)
self.diode = CurrentAmpDet(
FemtoDDPCA(
prefix=prefix + "IAMP-05:",
suffix="GAIN",
gain_table=Femto3xxGainTable,
gain_to_current_table=Femto3xxGainToCurrentTable,
raise_timetable=Femto3xxRaiseTime,
),
counter=StruckScaler(prefix=prefix + "SCLR-02:SCALER2", suffix=".S18"),
current_amp=self.diode_current_amp,
counter=self.diode_current,
)
super().__init__(name, connector)
super().__init__(name=name)
Loading