P11 config update

mxcubecore/configuration/desy_p11/backlight.xml

@@ -0,0 +1,12 @@
+
+<device class="P11BackLight">
+    <username>BackLight</username>
+
+    <tangoname>p11/register/eh.o.3.05</tangoname>
+
+    <open_time>8</open_time>
+    <close_time>4</close_time>
+
+    <channel type="tango" name="value" polling="500">value</channel>
+
+</device>

mxcubecore/configuration/desy_p11/beam-mockup.xml

@@ -0,0 +1,8 @@
+<object class="BeamMockup">
+    <device hwrid="/diff-aperture-mockup" role="aperture"/>
+    <device hwrid="/slits-mockup" role="slits"/>
+    <beam_position>340,256</beam_position>
+    <beam_divergence_horizontal>12.0</beam_divergence_horizontal>
+    <beam_divergence_vertical>12.0</beam_divergence_vertical>
+</object>
+

mxcubecore/configuration/desy_p11/beam.xml

@@ -0,0 +1,12 @@
+<object class="P11Beam">
+    <device hwrid="/diff-aperture-mockup" role="aperture"/>
+    <device hwrid="/slits-mockup" role="slits"/>
+
+    <channel type="tango" tangoname="p11/energy/1" name="beamsize" polling="500">BeamSize</channel>
+    <channel type="tango" tangoname="p11/energy/1" name="state" polling="500">State</channel>
+
+    <beam_divergence_vertical>0.05</beam_divergence_vertical>
+    <beam_divergence_horizontal>0.05</beam_divergence_horizontal>
+    <definer_type>"mirror"</definer_type>
+</object>
+

mxcubecore/configuration/desy_p11/beamline-test.xml

@@ -1,5 +1,4 @@
 <object class="BeamlineTestMockup">
-    <object href="/beamline-setup" role="beamline_setup"/> 
 
     <available_tests>["example_one", "example_two"]</available_tests>
     <startup_tests>["example_one"]</startup_tests>

mxcubecore/configuration/desy_p11/beamline_config.yml

@@ -0,0 +1,117 @@
+---
+# 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
+
+# objects
+#
+# Eventually all objects should use the yaml config system like Beamline,
+# but for now we can leave them as xml
+#
+# NBNB some objects that do not currently have their own config files
+# would need those added (e.g. the centring methods)
+#
+_objects: !!omap
+  # The !!o0map and the lines starting with '- ' give you an *ordered* dictionary
+  # And thus a reproducible loading order
+  # 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.xml
+  - flux: flux.xml
+  - detector: eiger.xml
+  - resolution: resolution.xml
+  - hutch_interlock: door-interlock.xml
+  - safety_shutter: shutter-eh.xml
+  - fast_shutter: fast-shutter.xml
+  - sample_changer: sample-changer.xml
+  # - sample_changer: sc-mockup.xml
+  # NBNB TODO remove plate_manipulater and treat as another smaple changer
+  # - plate_manipulator: plate-manipulator-mockup.xml
+  - diffractometer: nanodiff.xml
+  - sample_view: sample-view.xml
+  - lims: lims.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: offline-processing-mockup.xml
+  - online_processing: online-processing-mockup.xml
+  - characterisation: characterisation.xml
+  # - beam_realign:  # Skipped - optional
+# Non-object attributes:
+advanced_methods:
+  - MeshScan
+  - XrayCentering
+tunable_wavelength: true
+disable_num_passes: false
+run_online_processing: 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.01  # (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: 3600  # (int)
+    # detector_binning_mode: 1          # Removed as not in practice used.
+    inverse_beam: false  # (bool)
+    take_dark_current: true  # (bool)
+    skip_existing_images: true  # (bool)
+    take_snapshots: false  # (bool)
+  helical:
+    # Defaults for helical scan. Missing values are taken from default
+    num_images: 100
+  characterisation:
+    # Defaults for chareacterisation. Missing values are taken from default
+    exp_time: 0.05
+    osc_start: 0.0
+    osc_range: 1.0
+    opt_sad: false
+    account_rad_damage: true
+    strategy_complexity: 0
+    max_crystal_vd:im: 1.0
+    min_crystal_vdim: 1.0
+    max_crystal_vphi: 1.0
+    min_crystal_vphi: 1.0
+  advanced:
+    # Defaults for 'advanced' acquisition. Missing values are taken from default
+    osc_range: 0.5
+    num_images: 100
+acquisition_limit_values:
+  exposure_time:  # (s)
+    - 0.007
+    - 6000.0
+  osc_range:  # (degrees)
+    - -1000
+    - 1000
+  number_of_images:  # (int)
+    - 1
+    - 99999
+#    kappa:             # (degrees)
+#        - 0.0
+#        - 180.0
+#    kappa_phi:         # (degrees)
+#        - 0.0
+#        - 360.0

mxcubecore/configuration/desy_p11/beamstop.xml

@@ -0,0 +1,10 @@
+<device class="P11BeamStop">
+    <username>BeamStop</username>
+    <motorlist>bstopx</motorlist>
+
+    <object role="bstopx" href="/bstopx" />
+
+    <delta_bstopx>1</delta_bstopx>
+
+    <values>{"in": {"bstopx": 27000}, "out": {"bstopx": 69000}}</values>
+</device>

mxcubecore/configuration/desy_p11/beamstop_bcp.xml

@@ -0,0 +1,14 @@
+<device class="P11BeamStop">
+    <username>BeamStop</username>
+    <motorlist>bstopx, bstopy, bstopz</motorlist>
+
+    <object role="bstopx" href="/bstopx" />
+    <object role="bstopy" href="/bstopy" />
+    <object role="bstopz" href="/bstopz" />
+
+    <delta_bstopx>1</delta_bstopx>
+    <delta_bstopy>100</delta_bstopy>
+    <delta_bstopz>100</delta_bstopz>
+
+    <values>{"in": {"bstopx": 27000, "bstopy": -136, "bstopz": -135}, "out": {"bstopx": 69000, "bstopy": -136, "bstopz": -135}}</values>
+</device>

mxcubecore/configuration/desy_p11/bstopx.xml

@@ -0,0 +1,9 @@
+<device class="TangoMotor">
+    <actuator_name>bstopx</actuator_name>
+    <username>BeamStop X</username>
+
+    <tangoname>p11/motor/eh.3.09</tangoname>
+
+    <command type="tango" name="stopAxis">StopMove</command>
+    <channel type="tango" name="axisState" polling="500">State</channel>
+</device>

mxcubecore/configuration/desy_p11/bstopy.xml

@@ -0,0 +1,9 @@
+<device class="TangoMotor">
+    <actuator_name>bstopy</actuator_name>
+    <username>BeamStop Y</username>
+
+    <tangoname>p11/piezomotor/eh.4.09</tangoname>
+
+    <command type="tango" name="stopAxis">Stop</command>
+    <channel type="tango" name="axisState" polling="500">State</channel>
+</device>

mxcubecore/configuration/desy_p11/bstopz.xml

@@ -0,0 +1,9 @@
+<device class="TangoMotor">
+    <actuator_name>bstopz</actuator_name>
+    <username>BeamStop Z</username>
+
+    <tangoname>p11/piezomotor/eh.4.10</tangoname>
+
+    <command type="tango" name="stopAxis">Stop</command>
+    <channel type="tango" name="axisState" polling="500">State</channel>
+</device>