Update the "Detector mode" drop-down menu (found in the "Task" dialogs) to show ROI modes defined on the server side, i.e. in the beamline_config.yml file; replace "detector_mode" with "detector_roi_mode", since that should be the correct name for this parameter (there is an attribute in the AcquisitionParameters object with that name)

Author: alessandro-olivo

demo/beamline_config.yml

@@ -100,11 +100,13 @@ configuration:
       skip_existing_images: true
       take_snapshots: true
       sub_wedge_size: 10
+      detector_mode_list: ["0", "C18", "C12", "C2"]
       # NB 'compression' not added as apparently never used
 
       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
@@ -122,6 +124,7 @@ configuration:
       cell_counting: zig-zag
       cell_spacing: vertical, horizontal
       mesh_center: top-left
+      detector_mode_list: ["0", "C18", "C2"]
 
       gphlworkflow:
         {}

ui/src/components/Tasks/Characterisation.jsx

@@ -51,7 +51,7 @@ class Characterisation extends React.Component {
 
     const stringFields = [
       'centringMethod',
-      'detector_mode',
+      'detector_roi_mode',
       'account_rad_damage',
       'opt_sad',
       'space_group',
@@ -170,11 +170,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}
+                  />
+                ) : null}
                 <InputField propName="overlap" label="Overlap" />
               </FieldsRow>
             </CollapsableRows>

ui/src/components/Tasks/DataCollection.jsx

@@ -57,7 +57,7 @@ class DataCollection extends React.Component {
       'shutterless',
       'inverse_beam',
       'centringMethod',
-      'detector_mode',
+      'detector_roi_mode',
       'space_group',
       'prefix',
       'subdir',
@@ -280,13 +280,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>
+              ) : null}
             </CollapsableRows>
           </Form>
 

ui/src/components/Tasks/GenericTaskForm.jsx

@@ -72,7 +72,7 @@ class GenericTaskForm extends React.Component {
       'shutterless',
       'inverse_beam',
       'centringMethod',
-      'detector_mode',
+      'detector_roi_mode',
       'space_group',
       'prefix',
       'subdir',

ui/src/components/Tasks/Helical.jsx

@@ -55,7 +55,7 @@ class Helical extends React.Component {
       'shutterless',
       'inverse_beam',
       'centringMethod',
-      'detector_mode',
+      'detector_roi_mode',
       'space_group',
       'prefix',
       'subdir',
@@ -171,11 +171,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}
+                  />
+                ) : null}
               </FieldsRow>
               <FieldsRow>
                 <CheckboxField propName="shutterless" label="Shutterless" />

ui/src/components/Tasks/Mesh.jsx

@@ -64,7 +64,7 @@ class Mesh extends React.Component {
       'shutterless',
       'inverse_beam',
       'centringMethod',
-      'detector_mode',
+      'detector_roi_mode',
       'space_group',
       'prefix',
       'subdir',
@@ -181,11 +181,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}
+                  />
+                ) : null}
               </FieldsRow>
               <FieldsRow>
                 <CheckboxField propName="shutterless" label="Shutterless" />