Set 2 characters indentation level for YAML files

.yamllint.yaml

@@ -3,6 +3,9 @@
 extends: default
 
 rules:
+  indentation:
+    spaces: 2
+
   # Match line length to the one set by `black` the Python formatter
   line-length:
     max: 88

mxcubecore/configuration/alba_xaloc13/beamline_config.yml

@@ -1,15 +1,12 @@
 ---
 
-# yamllint disable rule:comments-indentation
-# yamllint disable rule:indentation
-
 # FIRST DRAFT of ALAB xaloc13 configuration. TO BE EDITED
 
 # The class to initialise, and init parameters
 _initialise_class:
-    class: mxcubecore.HardwareObjects.Beamline.Beamline
-    # Further key-value pairs here will be passed to the class init
-#    mode: devel
+  class: mxcubecore.HardwareObjects.Beamline.Beamline
+  # Further key-value pairs here will be passed to the class init
+  # mode: devel
 
 # objects
 #
@@ -23,98 +20,100 @@ _objects:
   # The !!o0map and the lines starting with '- ' give you an *orderd* dictionary
   # And thus a reproducible loading order
   !!omap
-    # The values are the file paths to the configuration file for the
-    # object, relative to the configuration file path(s)
-    #
-    # NB - the order is *NOT* arbitrary, as signal connnections are set
-    # on one object that require the other to be already loaded.
-    #
-    # Hardware:
-    - session: session.xml
-    - machine_info: mach-info.xml
-    - transmission: transmission.xml
-    - energy: energy.xml
-    - beam: beam-info.xml
-    - flux: flux.xml
-    - detector: pilatus.xml
-    - resolution: resolution.xml
-#    - hutch_interlock: door-interlock-mockup.xml
-#    - safety_shutter: safshut.xml
-    - fast_shutter: fastshut.xml
-    - sample_changer: cats.xml
-    # NBNB TODO remove plate_manipulater and treat as another smaple changer
-#    - plate_manipulator: plate-manipulator.xml
-    - diffractometer: mini-diff.xml
-    - graphics: Qt4_graphics-manager.xml
-    - lims: dbconnection.xml
-    - queue_manager: queue.xml
-    - queue_model: queue-model.xml
-    # Procedures:
-    - collect: mxcollect.xml
-    - xrf_spectrum: xrf-spectrum-mockup.xml
-    - energy_scan: energyscan-mockup.xml
-    #    - imaging: xray-imaging.xml # Only in EMBL as of 201907
-    - gphl_workflow: gphl-workflow.xml
-    - gphl_connection: gphl-setup.xml
-    # - centring: centring.xml
-    # Analysis:
-    - offline_processing: auto-processing.xml
-    - online_processing: parallel-processing.xml
-    - characterisation: data-analysis.xml
-    # - beam_realign: # Skipped - optional
+  # The values are the file paths to the configuration file for the
+  # object, relative to the configuration file path(s)
+  #
+  # NB - the order is *NOT* arbitrary, as signal connnections are set
+  # on one object that require the other to be already loaded.
+  #
+  # Hardware:
+  - session: session.xml
+  - machine_info: mach-info.xml
+  - transmission: transmission.xml
+  - energy: energy.xml
+  - beam: beam-info.xml
+  - flux: flux.xml
+  - detector: pilatus.xml
+  - resolution: resolution.xml
+  # - hutch_interlock: door-interlock-mockup.xml
+  # - safety_shutter: safshut.xml
+  - fast_shutter: fastshut.xml
+  - sample_changer: cats.xml
+  # NBNB TODO remove plate_manipulater and treat as another smaple changer
+  # - plate_manipulator: plate-manipulator.xml
+  - diffractometer: mini-diff.xml
+  - graphics: Qt4_graphics-manager.xml
+  - lims: dbconnection.xml
+  - queue_manager: queue.xml
+  - queue_model: queue-model.xml
+  # Procedures:
+  - collect: mxcollect.xml
+  - xrf_spectrum: xrf-spectrum-mockup.xml
+  - energy_scan: energyscan-mockup.xml
+  #    - imaging: xray-imaging.xml # Only in EMBL as of 201907
+  - gphl_workflow: gphl-workflow.xml
+  - gphl_connection: gphl-setup.xml
+  # - centring: centring.xml
+  # Analysis:
+  - offline_processing: auto-processing.xml
+  - online_processing: parallel-processing.xml
+  - characterisation: data-analysis.xml
+  # - beam_realign: # Skipped - optional
+
 # Non-object attributes:
 advanced_methods:
-    - MeshScan
-    - XrayCentering
+  - MeshScan
+  - XrayCentering
+
 tunable_wavelength: true
 disable_num_passes: false
 run_number: 1
 
 default_acquisition_parameters:
-    default:
-        # Default values, also used for standard acquisition.
-        # Values not given in other dictionaries are taken from here
-        exp_time: 0.3               # (s) exposure time
-        osc_start: 0.0              # (degrees) Only used if no current angle found
-        osc_range: 0.1              # (degrees)
-        num_passes: 1               # (int)
-        first_image: 1              # (int)
-        overlap: 0
-        num_images: 1               # (int)
-        detector_binning_mode: 1    # (int)
-        inverse_beam: false         # (bool)
-        take_dark_current: true     # (bool)
-        skip_existing_images: true  # (bool)
-        take_snapshots: true        # (bool)
+  default:
+    # Default values, also used for standard acquisition.
+    # Values not given in other dictionaries are taken from here
+    exp_time: 0.3               # (s) exposure time
+    osc_start: 0.0              # (degrees) Only used if no current angle found
+    osc_range: 0.1              # (degrees)
+    num_passes: 1               # (int)
+    first_image: 1              # (int)
+    overlap: 0
+    num_images: 1               # (int)
+    detector_binning_mode: 1    # (int)
+    inverse_beam: false         # (bool)
+    take_dark_current: true     # (bool)
+    skip_existing_images: true  # (bool)
+    take_snapshots: true        # (bool)
 
-    helical:
-        # Defaults for helical scan. Missing values are taken from default
-        exp_time: 0.04              # (s) exposure time
-        num_images: 100
+  helical:
+    # Defaults for helical scan. Missing values are taken from default
+    exp_time: 0.04              # (s) exposure time
+    num_images: 100
 
-    characterisation:
-        # Defaults for chareacterisation. Missing values are taken from default
-        osc_range: 1.0
+  characterisation:
+    # Defaults for chareacterisation. Missing values are taken from default
+    osc_range: 1.0
 
-    advanced:
-        # Defaults for 'advanced' acquisition. Missing values are taken from default
-        exp_time: 0.04              # (s) exposure time
-        osc_range: 0.5
-        num_images: 100
+  advanced:
+    # Defaults for 'advanced' acquisition. Missing values are taken from default
+    exp_time: 0.04              # (s) exposure time
+    osc_range: 0.5
+    num_images: 100
 
 acquisition_limit_values:
-    exposure_time:     # (s)
-        - 0.003
-        - 6000.0
-    osc_range:         # (degrees)
-        - -2165.0
-        - 2165.0
-    number_of_images:  # (int)
-        - 1
-        - 9999
-#    kappa:             # (degrees)
-#        - 0.0
-#        - 180.0
-#    kappa_phi:         # (degrees)
-#        - 0.0
-#        - 360.0
+  exposure_time:     # (s)
+    - 0.003
+    - 6000.0
+  osc_range:         # (degrees)
+    - -2165.0
+    - 2165.0
+  number_of_images:  # (int)
+    - 1
+    - 9999
+#  kappa:             # (degrees)
+#      - 0.0
+#      - 180.0
+#  kappa_phi:         # (degrees)
+#      - 0.0
+#      - 360.0