Skip to content
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

Jump to bottom

Remove save parameters button #189

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Remove save parameters button #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
511630b
comments
noemifrisina Aug 29, 2024
27b1dfa
Call write file at start of collection plan
noemifrisina Aug 29, 2024
5b9da9a
Remove button from edm
noemifrisina Aug 29, 2024
740be7b
Remember to yield
noemifrisina Aug 30, 2024
7f0dc96
Merge branch 'main' into 89_remove-set-params-button
noemifrisina Aug 30, 2024
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
43 changes: 0 additions & 43 deletions src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/DiamondChipI24-py3v1.edl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,49 +1431,6 @@ displayFileName {
}
endObjectProperties

# (Shell Command)
object shellCmdClass
beginObjectProperties
major 4
minor 3
release 0
x 580
y 665
w 165
h 50
fgColor index 14
bgColor index 17
topShadowColor index 1
botShadowColor index 14
font "arial-medium-r-18.0"
numCmds 1
command {
0 "blueapi -c CONFIG_LOCATION controller run write_parameter_file"
}
endObjectProperties

# (Static Text)
object activeXTextClass
beginObjectProperties
major 4
minor 1
release 1
x 590
y 670
w 141
h 36
font "arial-medium-r-16.0"
fontAlign "center"
fgColor index 14
bgColor index 0
useDisplayBg
value {
"Set parameters "
"and create shotlist"
}
autoSize
endObjectProperties

# (Lines)
object activeLineClass
beginObjectProperties
Expand Down
6 changes: 6 additions & 0 deletions src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
MappingType,
PumpProbeSetting,
)
from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 import (
write_parameter_file,
)
from mx_bluesky.beamlines.i24.serial.parameters import (
ChipDescription,
FixedTargetParameters,
Expand Down Expand Up @@ -747,6 +750,9 @@ def run_fixed_target_plan(
) -> MsgGenerator:
setup_logging()

# in the first instance, write params here
yield from write_parameter_file(detector_stage)

logger.info("Getting parameters from file.")
parameters = FixedTargetParameters.from_file(PARAM_FILE_PATH_FT / PARAM_FILE_NAME)

Expand Down
3 changes: 1 addition & 2 deletions src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,8 @@ def initialise_stages(

@log.log_on_entry
def write_parameter_file(
detector_stage: DetectorMotion = inject("detector_motion"),
detector_stage: DetectorMotion,
) -> MsgGenerator:
setup_logging()
param_path: Path = PARAM_FILE_PATH_FT
# Create directory if it doesn't yet exist.
param_path.mkdir(parents=True, exist_ok=True)
Expand Down
Loading