Skip to content

Make "detector mode" in the task dialogs configurable from the backend #1723

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
merged 5 commits into from
Jul 21, 2025
Merged

Make "detector mode" in the task dialogs configurable from the backend #1723

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
ba8d2f5
Update the "Detector mode" drop-down menu (in the "Task" dialogs) to …
alessandro-olivo Jul 1, 2025
633acda
Bump mxcubecore version
alessandro-olivo Jul 17, 2025
3984cba
Update tests (acq parameters)
alessandro-olivo Jul 17, 2025
87c24a2
Remove unnecessary optional chaining, "detector_mode_list" always exists
alessandro-olivo Jul 21, 2025
61d6d66
Add the "detector_mode_list" parameter to the demo.yaml configuration…
alessandro-olivo Jul 21, 2025
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
2 changes: 2 additions & 0 deletions demo.yaml/beamline_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ configuration:
helical:
# Defaults for helical scan. Missing values are taken from default
number_of_images: 100
detector_mode_list: ["0", "C18", "C2"]

characterisation:
# Defaults for characterisation. Missing values are taken from default
Expand All @@ -110,6 +111,7 @@ configuration:
overlap: -89
num_images: 4
shutterless: false
detector_mode_list: ["0", "C18", "C2"]

mesh:
# Defaults for 'advanced' acquisition. Missing values are taken from default
Expand Down
1 change: 1 addition & 0 deletions demo.yaml/detector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ configuration:
type: Eiger2
username: detector
width: 3110
roi_mode_list: '["0", "C18", "C12", "C2"]'
objects:
detector_distance: dtox.yaml
2 changes: 2 additions & 0 deletions demo/beamline_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ configuration:
helical:
# Defaults for helical scan. Missing values are taken from default
number_of_images: 100
detector_mode_list: ["0", "C18", "C2"]

characterisation:
# Defaults for characterisation. Missing values are taken from default
Expand All @@ -123,6 +124,7 @@ configuration:
cell_counting: zig-zag
cell_spacing: vertical, horizontal
mesh_center: top-left
detector_mode_list: ["0", "C18", "C2"]

gphlworkflow:
{}
Expand Down
1 change: 1 addition & 0 deletions demo/detector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<height>3269</height>
<hasShutterless>True</hasShutterless>
<fileSuffix>cbf</fileSuffix>
<roi_mode_list>["0", "C18", "C12", "C2"]</roi_mode_list>

<beam>
<!-- Values are in pixels/mm and pixels resp. -->
Expand Down
8 changes: 4 additions & 4 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pydantic = ">=2.8.2,<2.9.0"
PyDispatcher = "^2.0.6"
pytz = "^2022.6"
tzlocal = "^4.2"
mxcubecore = ">=1.335.0"
mxcubecore = ">=1.342.0"
bcrypt = "^4.0.1"
authlib = "^1.3.0"
flask-limiter = "^3.12"
Expand Down
4 changes: 4 additions & 0 deletions test/input_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
"comments": "",
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_mode_list": ["0", "C18", "C12", "C2"],
"detector_roi_mode": 0,
"disable_processing": False,
"exp_time": 0.02,
Expand Down Expand Up @@ -187,6 +188,7 @@
"comments": "",
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_mode_list": ["0", "C18", "C12", "C2"],
"detector_roi_mode": 0,
"determine_rad_params": False,
"disable_processing": False,
Expand Down Expand Up @@ -261,6 +263,7 @@
"comments": "",
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_mode_list": ["0", "C18", "C2"],
"detector_roi_mode": 0,
"disable_processing": False,
"exp_time": 10,
Expand Down Expand Up @@ -314,6 +317,7 @@
"comments": "",
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_mode_list": ["0", "C18", "C12", "C2"],
"detector_roi_mode": 0,
"disable_processing": False,
"exp_time": 0.02,
Expand Down
14 changes: 8 additions & 6 deletions ui/src/components/Tasks/Characterisation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Characterisation extends React.Component {

const stringFields = [
'centringMethod',
'detector_mode',
'detector_roi_mode',
'account_rad_damage',
'opt_sad',
'space_group',
Expand Down Expand Up @@ -173,11 +173,13 @@ class Characterisation extends React.Component {
<InputField propName="kappa_phi" type="number" label="Phi" />
</FieldsRow>
<FieldsRow>
<SelectField
propName="detector_mode"
label="Detector mode"
list={['0', 'C18', 'C12', 'C2']}
/>
{this.props.initialValues.detector_mode_list.length > 0 && (
<SelectField
propName="detector_roi_mode"
label="Detector mode"
list={this.props.initialValues.detector_mode_list}
/>
)}
<InputField propName="overlap" label="Overlap" />
</FieldsRow>
</CollapsableRows>
Expand Down
18 changes: 10 additions & 8 deletions ui/src/components/Tasks/DataCollection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class DataCollection extends React.Component {
'shutterless',
'inverse_beam',
'centringMethod',
'detector_mode',
'detector_roi_mode',
'space_group',
'prefix',
'subdir',
Expand Down Expand Up @@ -283,13 +283,15 @@ class DataCollection extends React.Component {
<InputField propName="kappa" type="number" label="Kappa" />
<InputField propName="kappa_phi" type="number" label="Phi" />
</FieldsRow>
<FieldsRow>
<SelectField
propName="detector_mode"
label="Detector mode"
list={['0', 'C18', 'C12', 'C2']}
/>
</FieldsRow>
{this.props.initialValues.detector_mode_list.length > 0 && (
<FieldsRow>
<SelectField
propName="detector_roi_mode"
label="Detector mode"
list={this.props.initialValues.detector_mode_list}
/>
</FieldsRow>
)}
</CollapsableRows>
</Form>

Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Tasks/GenericTaskForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class GenericTaskForm extends React.Component {
'shutterless',
'inverse_beam',
'centringMethod',
'detector_mode',
'detector_roi_mode',
'space_group',
'prefix',
'subdir',
Expand Down
14 changes: 8 additions & 6 deletions ui/src/components/Tasks/Helical.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Helical extends React.Component {
'shutterless',
'inverse_beam',
'centringMethod',
'detector_mode',
'detector_roi_mode',
'space_group',
'prefix',
'subdir',
Expand Down Expand Up @@ -174,11 +174,13 @@ class Helical extends React.Component {
label="Beam size"
list={this.props.apertureList}
/>
<SelectField
propName="detector_mode"
label="Detector mode"
list={['0', 'C18', 'C2']}
/>
{this.props.initialValues.detector_mode_list.length > 0 && (
<SelectField
propName="detector_roi_mode"
label="Detector mode"
list={this.props.initialValues.detector_mode_list}
/>
)}
</FieldsRow>
<FieldsRow>
<CheckboxField propName="shutterless" label="Shutterless" />
Expand Down
14 changes: 8 additions & 6 deletions ui/src/components/Tasks/Mesh.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Mesh extends React.Component {
'shutterless',
'inverse_beam',
'centringMethod',
'detector_mode',
'detector_roi_mode',
'space_group',
'prefix',
'subdir',
Expand Down Expand Up @@ -184,11 +184,13 @@ class Mesh extends React.Component {
label="Beam size"
list={this.props.apertureList}
/>
<SelectField
propName="detector_mode"
label="Detector mode"
list={['0', 'C18', 'C2']}
/>
{this.props.initialValues.detector_mode_list.length > 0 && (
<SelectField
propName="detector_roi_mode"
label="Detector mode"
list={this.props.initialValues.detector_mode_list}
/>
)}
</FieldsRow>
<FieldsRow>
<CheckboxField propName="shutterless" label="Shutterless" />
Expand Down