Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import json

import bluesky.plan_stubs as bps
from dodal.devices.focusing_mirror import (
FocusingMirrorWithStripes,
Expand All @@ -17,6 +15,9 @@
from mx_bluesky.common.utils.utils import (
energy_to_bragg_angle,
)
from mx_bluesky.hyperion.external_interaction.config_server import (
get_hyperion_config_client,
)

MIRROR_VOLTAGE_GROUP = "MIRROR_VOLTAGE_GROUP"
DCM_GROUP = "DCM_GROUP"
Expand All @@ -27,11 +28,12 @@ def _apply_and_wait_for_voltages_to_settle(
stripe: MirrorStripe,
mirror_voltages: MirrorVoltages,
):
with open(mirror_voltages.voltage_lookup_table_path) as lut_file:
json_obj = json.load(lut_file)

config_server = get_hyperion_config_client()
config_dict = config_server.get_file_contents(
mirror_voltages.voltage_lookup_table_path, dict
)
# sample mode is the only mode supported
sample_data = json_obj["sample"]
sample_data = config_dict["sample"]
if stripe == MirrorStripe.BARE:
stripe_key = "bare"
elif stripe == MirrorStripe.RHODIUM:
Expand Down