mx-bluesky 1.4.8__tar.gz → 1.4.9__tar.gz

{mx_bluesky-1.4.8 → mx_bluesky-1.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.4.8
+Version: 1.4.9
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -220,7 +220,7 @@ Requires-Dist: flask-restful
 Requires-Dist: ispyb
 Requires-Dist: jupyterlab
 Requires-Dist: matplotlib
-Requires-Dist: nexgen
+Requires-Dist: nexgen>=0.11.0
 Requires-Dist: numpy
 Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
@@ -235,11 +235,11 @@ Requires-Dist: scipy
 Requires-Dist: semver
 Requires-Dist: matplotlib
 Requires-Dist: blueapi>=0.5.0
-Requires-Dist: daq-config-server>=0.1.1
+Requires-Dist: daq-config-server==0.1.1
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.47.0
+Requires-Dist: dls-dodal==1.48.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.8 → mx_bluesky-1.4.9}/docs/developer/hyperion/deploying-hyperion.rst

@@ -68,7 +68,17 @@ For further information, see https://github.com/containers/podman/issues/2542
 Deploying to kubernetes
 -----------------------
 
-Once the docker image is built, the image can be deployed to kubernetes using the ``deploy_hyperion_to_k8s.sh`` script
+Once the docker image is built, the image can be deployed to kubernetes using the ``deploy_mx_bluesky_app_to_k8s.sh``
+script.
+
+Secrets
+~~~~~~~
+
+The deployment requires the following secrets to be created with the corresponding zocalo rabbitmq credentials if they
+are not already present:
+
+* ``rmq-creds``
+* ``rmq-api-reader``
 
 Production deployment
 ~~~~~~~~~~~~~~~~~~~~~
@@ -77,12 +87,13 @@ Then create and deploy the helm release
 
 ::
 
-    ./utility_scripts/deploy/deploy_hyperion_to_k8s.sh --beamline=<beamline> --checkout-to-prod hyperion
+    ./utility_scripts/deploy/deploy_mx_bluesky_app_to_k8s.sh --appVersion=x.y.z --beamline=<beamline> --checkout-to-prod hyperion hyperion
 
 This will run the ``deploy_mx_bluesky.py`` script to deploy the latest hyperion to ``/dls_sw``.
 You will be prompted to log into the beamline cluster, then it will create a helm release "hyperion".
 The source folders will be mounted as bind mounts to allow the pod to pick up changes in production.
 For production these are expected to be in the normal place defined in ``values.yaml``.
+If the non-k8s deployment of hyperion has already been performed, then omit ``--checkout-to-prod``.
 
 Development deployment
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -93,7 +104,7 @@ above, you install a dev deployment to the cluster you are currently logged into
 
 ::
 
-    ./utility_scripts/deploy/deploy_hyperion_to_k8s.sh --dev --beamline=<beamline> --repository=<your image repo> hyperion-test
+    ./utility_scripts/deploy/deploy_mx_bluesky_app_to_k8s.sh --dev --beamline=<beamline> --repository=<your image repo> hyperion-test hyperion
 
 
 The dev deployment bind-mounts the current ``hyperion`` workspace and ``../dodal`` into the container so that you can

{mx_bluesky-1.4.8 → mx_bluesky-1.4.9}/docs/developer/hyperion/index.rst

@@ -14,6 +14,7 @@ Documentation specific for the Hyperion module within MX-Bluesky
 
             reference/param-hierarchy
             reference/readme
+            reference/coordinate-systems
             deploying-hyperion
             system-tests
 

mx_bluesky-1.4.9/docs/developer/hyperion/reference/coordinate-systems.puml

@@ -0,0 +1,20 @@
+@startuml
+box "Request Coordinate Space"
+participant "GDA/Agamemnon"
+participant Hyperion
+end box
+
+boundary omega_flip
+
+box "Hardware Coordinate Space"
+participant "Ophyd Devices"
+participant "Nexus File"
+end box
+
+"GDA/Agamemnon" -> Hyperion: Hyperion Request\n(Request Coordinate Space)
+Hyperion -> "Ophyd Devices": Rotation Operations
+"Ophyd Devices" -> "Nexus File": PCAP Data 
+Hyperion -> "Nexus File": Write metadata\nRecord actual hardware coordinate system
+
+
+@enduml

mx_bluesky-1.4.9/docs/developer/hyperion/reference/coordinate-systems.rst

@@ -0,0 +1,76 @@
+Hyperion Coordinate Systems
+===========================
+
+Rotation Coordinate Systems
+---------------------------
+
+Within hyperion coordinates are expressed both in requests to Hyperion, in commands issued to hardware, and in the 
+output files sent to downstream analysis.
+
+.. uml:: coordinate-systems.puml
+
+Within requests to Hyperion, the requested rotations are defined with respect to a fixed coordinate system, that is 
+defined to be the same for all installations and the intention is that this should be the same as that defined by the
+nexus file format when all axes are in their positive orientations. Thus the same request made across different 
+deployments of Hyperion should result in the same physical motion regardless of the coordinate space conventions of 
+the underlying hardware.
+
+In the ``RotationScan`` parameter class ``scan_width_deg`` is defined to always be positive and the direction is 
+defined by ``rotation_direction`` which can be ``POSITIVE`` or ``NEGATIVE``
+
+The coordinate systems of the underlying hardware may differ from the request. At Diamond traditionally the omega 
+axis is implemented to be in the opposite direction, therefore the commands sent to the hardware are transformed and 
+the ``omega_flip`` feature flag controls this behaviour, which by default is set to ``True`` as this is 
+generally expected to be required for the beamlines here.
+
+In the Nexus output file, there is provision for describing the choice of axis orientations in the nexus file, and 
+the ``omega_flip`` parameter affects the omega axis description in ``/entry/sample/transformations/omega``. 
+This is especially important as if PCAP position capture is enabled then referenced data files will contain positions
+with respect to this axis.
+ 
+
+Gridscan Coordinate System
+--------------------------
+
+The diagram below shows how the coordinate system used in the 3D gridscan relates to the beam and sample loop. The blue arrows indicate the direction of the beam. The red grids represent the grids used during the scan.
+
+.. image:: ../../../images/176701633-b93bba62-b2e7-4740-a863-c6b388beb14f.png
+
+Motors Coordinate System
+------------------------
+
+.. include:: <isogrk1.txt>
+
+The diagram below shows the x,y,z directions of the smargon motor coordinate system. The smargon y, z axes change with the :math:`\omega`. x,y,z are measured in millimetres.
+
+
+* The pin runs from -ve x to +ve x
+* y is +ve towards the ceiling when :math:`\omega = 0`.
+* z is +ve towards the detector/away from the oav and parallel to the beam when :math:`\omega = 0`.
+* The x and y coordinates of the image are also shown, the image feed has x from left to right, y from top to bottom, with the pin to the right of the image.
+* |ohgr| rotates from the y axis at :math:`\omega = 0` (the floor to ceiling).
+
+:math:`\omega = 0`
+
+
+.. image:: ../../../images/motor-coords-omega-0.svg
+
+
+:math:`\omega = \alpha`
+
+.. image:: ../../../images/motor-coords-omega-alpha.svg
+
+
+OAV Image Coordinate System
+---------------------------
+
+In the OAV image the below coordinate system is used (with units in pixels). 
+
+.. image:: ../../../images/207297611-f67dfc25-a3a5-4ade-a1e7-28b54a136fa6.png
+
+Conversion Between OAV Image and Smargon
+----------------------------------------
+
+At :math:`\omega = 0`, :math:`x` and :math:`y` in the camera are antiparallel to :math:`x` and :math:`y` in the smargon. :math:`y` in the camera are is parallel to :math:`z` of the smargon at :math:`x` = :math:`\frac{\pi}{2}`. Then to convert from the camera to smargon coordinate systems we map
+
+:math:`x_\text{smargon} = -x, \quad y_\text{smargon} = -y\cos(\omega),\quad z_\text{smargon} = y sin(\omega).`

{mx_bluesky-1.4.8 → mx_bluesky-1.4.9}/docs/developer/hyperion/reference/readme.md

@@ -25,14 +25,17 @@ Note that because Hyperion makes heavy use of [Dodal](https://github.com/Diamond
 
 ## Starting the bluesky runner
 
-The bluesky runner is (re)started in production by GDA when it invokes `run_hyperion.sh`. 
+The bluesky runner is (re)started in production by GDA when it invokes `run_hyperion.sh`.
 
-If you wish to attempt to run from a developer machine, then (if you are able to connect all devices) 
-you may `run_hyperion.sh --dev --beamline=<beamline>`, which will give you a running instance albeit with
-read-only devices. The `--dev` flag ensures that logging will not be sent to the production Graylog/output folders.
 
 This script will determine which beamline you are on based on the `BEAMLINE` environment variable. If on a 
-beamline Hyperion will run with `INFO` level logging, sending its logs to both production graylog and to the beamline/log/bluesky/hyperion.log on the shared file system.
+beamline Hyperion will run with `INFO` level logging, sending its logs to both production graylog and to the
+beamline/log/bluesky/hyperion.log on the shared file system.
+
+If you wish to attempt to run from a developer machine, then (if you are able to connect all devices) 
+you may `run_hyperion.sh --dev --beamline=<beamline>`, which will give you a running instance albeit with
+read-only devices. The `--dev` flag ensures that logging will not be sent to the production Graylog/output folders
+and that hyperion will create mock devices.
 
 If in a dev environment Hyperion will log to a local graylog instance instead and into a file at `./tmp/dev/hyperion.log`. A local instance of graylog will need to be running for this to work correctly. To set this up and run up the containers on your local machine run the `setup_graylog.sh` script.
 
@@ -40,12 +43,6 @@ This uses the generic defaults for a local graylog instance. It can be accessed
 
 The hyperion python module can also be run directly without the startup script. It takes the same command line options, including:
 
-`INFO` level logging of the Bluesky event documents can be enabled with the flag
-
-```
-python -m hyperion --dev --verbose-event-logging
-```
-
 ## Testing
 
 Unit tests can be run with `pytest --random-order`. To see log output from tests you can turn on logging with the `--logging` command line option and then use the `-s` command line option to print logs into the console. So to run the unit tests such that all logs are at printed to the terminal, you can use `python -m pytest --random-order --logging -s`. Note that this will likely overrun your terminal buffer, so you can narrow the selection of tests with the `-k "<test name pattern>"` option.

mx_bluesky-1.4.9/docs/images/motor-coords-omega-0.svg

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.2" width="102.02mm" height="116.02mm" viewBox="1300 3100 10202 11602" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:presentation="http://sun.com/xmlns/staroffice/presentation" xmlns:smil="http://www.w3.org/2001/SMIL20/" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xml:space="preserve">
+ <defs>
+  <font id="EmbeddedFont_1" horiz-adv-x="2048">
+   <font-face font-family="Liberation Sans embedded" units-per-em="2048" font-weight="normal" font-style="normal" ascent="1852" descent="423"/>
+   <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0 Z"/>
+   <glyph unicode="z" horiz-adv-x="848" d="M 83,0 L 83,137 688,943 117,943 117,1082 901,1082 901,945 295,139 922,139 922,0 83,0 Z"/>
+   <glyph unicode="w" horiz-adv-x="1509" d="M 1174,0 L 965,0 776,765 740,934 C 734,904 725,861 712,805 699,748 631,480 508,0 L 300,0 -3,1082 175,1082 358,347 C 363,331 377,265 401,149 L 418,223 644,1082 837,1082 1026,339 1072,149 1103,288 1308,1082 1484,1082 1174,0 Z"/>
+   <glyph unicode="v" horiz-adv-x="1033" d="M 613,0 L 400,0 7,1082 199,1082 437,378 C 446,351 469,272 506,141 L 541,258 580,376 826,1082 1017,1082 613,0 Z"/>
+   <glyph unicode="t" horiz-adv-x="531" d="M 554,8 C 495,-8 434,-16 372,-16 228,-16 156,66 156,229 L 156,951 31,951 31,1082 163,1082 216,1324 336,1324 336,1082 536,1082 536,951 336,951 336,268 C 336,216 345,180 362,159 379,138 408,127 450,127 474,127 509,132 554,141 L 554,8 Z"/>
+   <glyph unicode="s" horiz-adv-x="901" d="M 950,299 C 950,197 912,118 835,63 758,8 650,-20 511,-20 376,-20 273,2 200,47 127,91 79,160 57,254 L 216,285 C 231,227 263,185 311,158 359,131 426,117 511,117 602,117 669,131 712,159 754,187 775,229 775,285 775,328 760,362 731,389 702,416 654,438 589,455 L 460,489 C 357,516 283,542 240,568 196,593 162,624 137,661 112,698 100,743 100,796 100,895 135,970 206,1022 276,1073 378,1099 513,1099 632,1099 727,1078 798,1036 868,994 912,927 931,834 L 769,814 C 759,862 732,899 689,925 645,950 586,963 513,963 432,963 372,951 333,926 294,901 275,864 275,814 275,783 283,758 299,738 315,718 339,701 370,687 401,673 467,654 568,629 663,605 732,583 774,563 816,542 849,520 874,495 898,470 917,442 930,410 943,377 950,340 950,299 Z"/>
+   <glyph unicode="r" horiz-adv-x="530" d="M 142,0 L 142,830 C 142,906 140,990 136,1082 L 306,1082 C 311,959 314,886 314,861 L 318,861 C 347,954 380,1017 417,1051 454,1085 507,1102 575,1102 599,1102 623,1099 648,1092 L 648,927 C 624,934 592,937 552,937 477,937 420,905 381,841 342,776 322,684 322,564 L 322,0 142,0 Z"/>
+   <glyph unicode="o" horiz-adv-x="980" d="M 1053,542 C 1053,353 1011,212 928,119 845,26 724,-20 565,-20 407,-20 288,28 207,125 126,221 86,360 86,542 86,915 248,1102 571,1102 736,1102 858,1057 936,966 1014,875 1053,733 1053,542 Z M 864,542 C 864,691 842,800 798,868 753,935 679,969 574,969 469,969 393,935 346,866 299,797 275,689 275,542 275,399 298,292 345,221 391,149 464,113 563,113 671,113 748,148 795,217 841,286 864,395 864,542 Z"/>
+   <glyph unicode="n" horiz-adv-x="874" d="M 825,0 L 825,686 C 825,757 818,813 804,852 790,891 768,920 737,937 706,954 661,963 602,963 515,963 447,933 397,874 347,815 322,732 322,627 L 322,0 142,0 142,851 C 142,977 140,1054 136,1082 L 306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 313,950 314,897 L 317,897 C 358,972 406,1025 461,1056 515,1087 582,1102 663,1102 782,1102 869,1073 924,1014 979,955 1006,857 1006,721 L 1006,0 825,0 Z"/>
+   <glyph unicode="m" horiz-adv-x="1457" d="M 768,0 L 768,686 C 768,791 754,863 725,903 696,943 645,963 570,963 493,963 433,934 388,875 343,816 321,734 321,627 L 321,0 142,0 142,851 C 142,977 140,1054 136,1082 L 306,1082 C 307,1079 307,1070 308,1055 309,1040 310,1024 311,1005 312,986 313,950 314,897 L 317,897 C 356,974 400,1027 450,1057 500,1087 561,1102 633,1102 715,1102 780,1086 828,1053 875,1020 908,968 927,897 L 930,897 C 967,970 1013,1022 1066,1054 1119,1086 1183,1102 1258,1102 1367,1102 1447,1072 1497,1013 1546,954 1571,856 1571,721 L 1571,0 1393,0 1393,686 C 1393,791 1379,863 1350,903 1321,943 1270,963 1195,963 1116,963 1055,934 1012,876 968,817 946,734 946,627 L 946,0 768,0 Z"/>
+   <glyph unicode="l" horiz-adv-x="187" d="M 138,0 L 138,1484 318,1484 318,0 138,0 Z"/>
+   <glyph unicode="k" horiz-adv-x="901" d="M 816,0 L 450,494 318,385 318,0 138,0 138,1484 318,1484 318,557 793,1082 1004,1082 565,617 1027,0 816,0 Z"/>
+   <glyph unicode="i" horiz-adv-x="187" d="M 137,1312 L 137,1484 317,1484 317,1312 137,1312 Z M 137,0 L 137,1082 317,1082 317,0 137,0 Z"/>
+   <glyph unicode="g" horiz-adv-x="927" d="M 548,-425 C 430,-425 336,-402 266,-356 196,-309 151,-243 131,-158 L 312,-132 C 324,-182 351,-220 392,-248 433,-274 486,-288 553,-288 732,-288 822,-183 822,27 L 822,201 820,201 C 786,132 739,80 680,45 621,10 551,-8 472,-8 339,-8 242,36 180,124 117,212 86,350 86,539 86,730 120,872 187,963 254,1054 355,1099 492,1099 569,1099 635,1082 692,1047 748,1012 791,962 822,897 L 824,897 C 824,917 825,952 828,1001 831,1050 833,1077 836,1082 L 1007,1082 C 1003,1046 1001,971 1001,858 L 1001,31 C 1001,-273 850,-425 548,-425 Z M 822,541 C 822,629 810,705 786,769 762,832 728,881 685,915 641,948 591,965 536,965 444,965 377,932 335,865 293,798 272,690 272,541 272,393 292,287 331,222 370,157 438,125 533,125 590,125 640,142 684,175 728,208 762,256 786,319 810,381 822,455 822,541 Z"/>
+   <glyph unicode="f" horiz-adv-x="557" d="M 361,951 L 361,0 181,0 181,951 29,951 29,1082 181,1082 181,1204 C 181,1303 203,1374 246,1417 289,1460 356,1482 445,1482 495,1482 537,1478 572,1470 L 572,1333 C 542,1338 515,1341 492,1341 446,1341 413,1329 392,1306 371,1283 361,1240 361,1179 L 361,1082 572,1082 572,951 361,951 Z"/>
+   <glyph unicode="e" horiz-adv-x="980" d="M 276,503 C 276,379 302,283 353,216 404,149 479,115 578,115 656,115 719,131 766,162 813,193 844,233 861,281 L 1019,236 C 954,65 807,-20 578,-20 418,-20 296,28 213,123 129,218 87,360 87,548 87,727 129,864 213,959 296,1054 416,1102 571,1102 889,1102 1048,910 1048,527 L 1048,503 276,503 Z M 862,641 C 852,755 823,838 775,891 727,943 658,969 568,969 481,969 412,940 361,882 310,823 282,743 278,641 L 862,641 Z"/>
+   <glyph unicode="d" horiz-adv-x="927" d="M 821,174 C 788,105 744,55 689,25 634,-5 565,-20 484,-20 347,-20 247,26 183,118 118,210 86,349 86,536 86,913 219,1102 484,1102 566,1102 634,1087 689,1057 744,1027 788,979 821,914 L 823,914 821,1035 821,1484 1001,1484 1001,223 C 1001,110 1003,36 1007,0 L 835,0 C 833,11 831,35 829,74 826,113 825,146 825,174 L 821,174 Z M 275,542 C 275,391 295,282 335,217 375,152 440,119 530,119 632,119 706,154 752,225 798,296 821,405 821,554 821,697 798,802 752,869 706,936 633,969 532,969 441,969 376,936 336,869 295,802 275,693 275,542 Z"/>
+   <glyph unicode="c" horiz-adv-x="901" d="M 275,546 C 275,402 298,295 343,226 388,157 457,122 548,122 612,122 666,139 709,174 752,209 778,262 788,334 L 970,322 C 956,218 912,135 837,73 762,11 668,-20 553,-20 402,-20 286,28 207,124 127,219 87,359 87,542 87,724 127,863 207,959 287,1054 402,1102 551,1102 662,1102 754,1073 827,1016 900,959 945,880 964,779 L 779,765 C 770,825 746,873 708,908 670,943 616,961 546,961 451,961 382,929 339,866 296,803 275,696 275,546 Z"/>
+   <glyph unicode="b" horiz-adv-x="953" d="M 1053,546 C 1053,169 920,-20 655,-20 573,-20 505,-5 451,25 396,54 352,102 318,168 L 316,168 C 316,147 315,116 312,74 309,31 307,7 306,0 L 132,0 C 136,36 138,110 138,223 L 138,1484 318,1484 318,1061 C 318,1018 317,967 314,908 L 318,908 C 351,977 396,1027 451,1057 506,1087 574,1102 655,1102 792,1102 892,1056 957,964 1021,872 1053,733 1053,546 Z M 864,540 C 864,691 844,800 804,865 764,930 699,963 609,963 508,963 434,928 388,859 341,790 318,680 318,529 318,387 341,282 386,215 431,147 505,113 607,113 698,113 763,147 804,214 844,281 864,389 864,540 Z"/>
+   <glyph unicode="a" horiz-adv-x="1060" d="M 414,-20 C 305,-20 224,9 169,66 114,123 87,202 87,302 87,414 124,500 198,560 271,620 390,652 554,656 L 797,660 797,719 C 797,807 778,870 741,908 704,946 645,965 565,965 484,965 426,951 389,924 352,897 330,853 323,793 L 135,810 C 166,1005 310,1102 569,1102 705,1102 807,1071 876,1009 945,946 979,856 979,738 L 979,272 C 979,219 986,179 1000,152 1014,125 1041,111 1080,111 1097,111 1117,113 1139,118 L 1139,6 C 1094,-5 1047,-10 1000,-10 933,-10 885,8 855,43 824,78 807,132 803,207 L 797,207 C 751,124 698,66 637,32 576,-3 501,-20 414,-20 Z M 455,115 C 521,115 580,130 631,160 682,190 723,231 753,284 782,336 797,390 797,445 L 797,534 600,530 C 515,529 451,520 408,504 364,488 330,463 307,430 284,397 272,353 272,299 272,240 288,195 320,163 351,131 396,115 455,115 Z"/>
+   <glyph unicode="Z" horiz-adv-x="1139" d="M 1187,0 L 65,0 65,143 923,1253 138,1253 138,1409 1140,1409 1140,1270 282,156 1187,156 1187,0 Z"/>
+   <glyph unicode="Y" horiz-adv-x="1298" d="M 777,584 L 777,0 587,0 587,584 45,1409 255,1409 684,738 1111,1409 1321,1409 777,584 Z"/>
+   <glyph unicode="X" horiz-adv-x="1298" d="M 1112,0 L 689,616 257,0 46,0 582,732 87,1409 298,1409 690,856 1071,1409 1282,1409 800,739 1323,0 1112,0 Z"/>
+   <glyph unicode="V" horiz-adv-x="1377" d="M 782,0 L 584,0 9,1409 210,1409 600,417 684,168 768,417 1156,1409 1357,1409 782,0 Z"/>
+   <glyph unicode="P" horiz-adv-x="1112" d="M 1258,985 C 1258,852 1215,746 1128,667 1041,588 922,549 773,549 L 359,549 359,0 168,0 168,1409 761,1409 C 919,1409 1041,1372 1128,1298 1215,1224 1258,1120 1258,985 Z M 1066,983 C 1066,1165 957,1256 738,1256 L 359,1256 359,700 746,700 C 959,700 1066,794 1066,983 Z"/>
+   <glyph unicode="O" horiz-adv-x="1430" d="M 1495,711 C 1495,564 1467,435 1411,324 1354,213 1273,128 1168,69 1063,10 938,-20 795,-20 650,-20 526,9 421,68 316,127 235,212 180,323 125,434 97,563 97,711 97,936 159,1113 282,1240 405,1367 577,1430 797,1430 940,1430 1065,1402 1170,1345 1275,1288 1356,1205 1412,1096 1467,987 1495,859 1495,711 Z M 1300,711 C 1300,886 1256,1024 1169,1124 1081,1224 957,1274 797,1274 636,1274 511,1225 423,1126 335,1027 291,889 291,711 291,534 336,394 425,291 514,187 637,135 795,135 958,135 1083,185 1170,286 1257,386 1300,528 1300,711 Z"/>
+   <glyph unicode="L" horiz-adv-x="927" d="M 168,0 L 168,1409 359,1409 359,156 1071,156 1071,0 168,0 Z"/>
+   <glyph unicode="E" horiz-adv-x="1138" d="M 168,0 L 168,1409 1237,1409 1237,1253 359,1253 359,801 1177,801 1177,647 359,647 359,156 1278,156 1278,0 168,0 Z"/>
+   <glyph unicode="D" horiz-adv-x="1218" d="M 1381,719 C 1381,574 1353,447 1296,338 1239,229 1159,145 1055,87 951,29 831,0 695,0 L 168,0 168,1409 634,1409 C 873,1409 1057,1349 1187,1230 1316,1110 1381,940 1381,719 Z M 1189,719 C 1189,894 1141,1027 1046,1119 950,1210 811,1256 630,1256 L 359,1256 359,153 673,153 C 776,153 867,176 946,221 1024,266 1084,332 1126,417 1168,502 1189,603 1189,719 Z"/>
+   <glyph unicode="C" horiz-adv-x="1324" d="M 792,1274 C 636,1274 515,1224 428,1124 341,1023 298,886 298,711 298,538 343,400 434,295 524,190 646,137 800,137 997,137 1146,235 1245,430 L 1401,352 C 1343,231 1262,138 1157,75 1052,12 930,-20 791,-20 649,-20 526,10 423,69 319,128 240,212 186,322 131,431 104,561 104,711 104,936 165,1112 286,1239 407,1366 575,1430 790,1430 940,1430 1065,1401 1166,1342 1267,1283 1341,1196 1388,1081 L 1207,1021 C 1174,1103 1122,1166 1050,1209 977,1252 891,1274 792,1274 Z"/>
+   <glyph unicode="A" horiz-adv-x="1377" d="M 1167,0 L 1006,412 364,412 202,0 4,0 579,1409 796,1409 1362,0 1167,0 Z M 685,1265 L 676,1237 C 659,1182 635,1111 602,1024 L 422,561 949,561 768,1026 C 749,1072 731,1124 712,1182 L 685,1265 Z"/>
+   <glyph unicode="-" horiz-adv-x="531" d="M 91,464 L 91,624 591,624 591,464 91,464 Z"/>
+   <glyph unicode="+" horiz-adv-x="1033" d="M 671,608 L 671,180 524,180 524,608 100,608 100,754 524,754 524,1182 671,1182 671,754 1095,754 1095,608 671,608 Z"/>
+   <glyph unicode=" " horiz-adv-x="556"/>
+  </font>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+  <g id="bullet-char-template-57356" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+  </g>
+  <g id="bullet-char-template-57354" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+  </g>
+  <g id="bullet-char-template-10146" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10132" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
+  </g>
+  <g id="bullet-char-template-10007" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
+  </g>
+  <g id="bullet-char-template-10004" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
+  </g>
+  <g id="bullet-char-template-9679" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+  </g>
+  <g id="bullet-char-template-8226" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+  </g>
+  <g id="bullet-char-template-8211" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+  </g>
+  <g id="bullet-char-template-61548" transform="scale(0.00048828125,-0.00048828125)">
+   <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332 928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437 1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577 173,740 Z"/>
+  </g>
+ </defs>
+ <g class="Page">
+  <g class="Group">
+   <g class="com.sun.star.drawing.LineShape">
+    <g id="id3">
+     <rect class="BoundingBox" stroke="none" fill="none" x="7050" y="3600" width="301" height="5402"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7200,9000 L 7200,4030"/>
+     <path fill="rgb(52,101,164)" stroke="none" d="M 7200,3600 L 7050,4050 7350,4050 7200,3600 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.LineShape">
+    <g id="id4">
+     <rect class="BoundingBox" stroke="none" fill="none" x="1800" y="8850" width="5402" height="301"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7200,9000 L 2230,9000"/>
+     <path fill="rgb(52,101,164)" stroke="none" d="M 1800,9000 L 2250,9150 2250,8850 1800,9000 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.LineShape">
+    <g id="id5">
+     <rect class="BoundingBox" stroke="none" fill="none" x="3400" y="8999" width="3802" height="3702"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7200,9000 L 3708,12400"/>
+     <path fill="rgb(52,101,164)" stroke="none" d="M 3400,12700 L 3827,12494 3618,12279 3400,12700 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.CustomShape">
+    <g id="id6">
+     <rect class="BoundingBox" stroke="none" fill="none" x="6559" y="8559" width="1484" height="884"/>
+     <path fill="none" stroke="rgb(255,0,0)" stroke-width="81" stroke-linejoin="round" d="M 8001,9001 C 8001,9071 7969,9140 7907,9201 7846,9262 7757,9312 7651,9347 7544,9382 7423,9401 7301,9401 7178,9401 7057,9382 6950,9347 6844,9312 6755,9262 6694,9201 6632,9140 6600,9071 6600,9001 6600,8930 6632,8861 6694,8800 6755,8739 6844,8689 6950,8654 7057,8619 7178,8600 7300,8600 7423,8600 7544,8619 7651,8654 7757,8689 7846,8739 7907,8800 7969,8861 8001,8930 8001,9001 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.LineShape">
+    <g id="id7">
+     <rect class="BoundingBox" stroke="none" fill="none" x="7959" y="8959" width="3383" height="83"/>
+     <path fill="none" stroke="rgb(255,0,0)" stroke-width="81" stroke-linejoin="round" d="M 8000,9000 L 11300,9000"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.LineShape">
+    <g id="id8">
+     <rect class="BoundingBox" stroke="none" fill="none" x="3800" y="6299" width="6302" height="6402"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4001,12496 L 4020,12477"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4077,12419 L 4096,12400"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4152,12342 L 4171,12323"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4228,12265 L 4247,12246"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4304,12188 L 4323,12169"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4379,12112 L 4398,12092"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4455,12035 L 4474,12016"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4530,11958 L 4549,11939"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4606,11881 L 4625,11862"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4682,11804 L 4701,11785"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4757,11727 L 4776,11708"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4833,11651 L 4852,11631"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4909,11574 L 4927,11555"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 4984,11497 L 5003,11478"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5060,11420 L 5079,11401"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5135,11343 L 5154,11324"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5211,11267 L 5230,11247"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5287,11190 L 5306,11170"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5362,11113 L 5381,11094"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5438,11036 L 5457,11017"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5514,10959 L 5532,10940"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5589,10882 L 5608,10863"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5665,10806 L 5684,10786"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5740,10729 L 5759,10710"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5816,10652 L 5835,10633"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5892,10575 L 5911,10556"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 5967,10498 L 5986,10479"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6043,10421 L 6062,10402"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6119,10345 L 6137,10325"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6194,10268 L 6213,10249"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6270,10191 L 6289,10172"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6345,10114 L 6364,10095"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6421,10037 L 6440,10018"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6497,9961 L 6516,9941"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6572,9884 L 6591,9864"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6648,9807 L 6667,9788"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6724,9730 L 6742,9711"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6799,9653 L 6818,9634"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6875,9576 L 6894,9557"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 6950,9500 L 6969,9480"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7026,9423 L 7045,9404"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7102,9346 L 7121,9327"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7177,9269 L 7196,9250"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7253,9192 L 7272,9173"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7329,9115 L 7347,9096"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7404,9039 L 7423,9019"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7480,8962 L 7499,8943"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7555,8885 L 7574,8866"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7631,8808 L 7650,8789"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7707,8731 L 7726,8712"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7782,8655 L 7801,8635"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7858,8578 L 7877,8558"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 7934,8501 L 7952,8482"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8009,8424 L 8028,8405"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8085,8347 L 8104,8328"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8160,8270 L 8179,8251"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8236,8194 L 8255,8174"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8312,8117 L 8331,8098"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8387,8040 L 8406,8021"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8463,7963 L 8482,7944"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8539,7886 L 8557,7867"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8614,7809 L 8633,7790"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8690,7733 L 8709,7713"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8765,7656 L 8784,7637"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8841,7579 L 8860,7560"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8917,7502 L 8936,7483"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 8992,7425 L 9011,7406"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9068,7349 L 9087,7329"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9144,7272 L 9162,7252"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9219,7195 L 9238,7176"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9295,7118 L 9314,7099"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9370,7041 L 9389,7022"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9446,6964 L 9465,6945"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9522,6888 L 9541,6868"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9597,6811 L 9616,6792"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9673,6734 L 9692,6715"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9748,6657 L 9767,6638"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9824,6580 L 9843,6561"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9900,6503 L 9919,6484"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 9975,6427 L 9994,6407"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 10051,6350 L 10070,6331"/>
+     <path fill="rgb(52,101,164)" stroke="none" d="M 3800,12700 L 4082,12556 3939,12416 3800,12700 Z"/>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.CustomShape">
+    <g id="id9">
+     <rect class="BoundingBox" stroke="none" fill="none" x="8499" y="4499" width="3003" height="1303"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 10000,5800 L 8500,5800 8500,4500 11500,4500 11500,5800 10000,5800 Z"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="9168" y="5090"><tspan fill="rgb(0,0,0)" stroke="none">OAV Camera</tspan></tspan><tspan class="TextPosition" x="8630" y="5408"><tspan fill="rgb(0,0,0)" stroke="none">looking towards z +ve</tspan></tspan></tspan></text>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.TextShape">
+    <g id="id10">
+     <rect class="BoundingBox" stroke="none" fill="none" x="7000" y="3100" width="501" height="570"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="7250" y="3483"><tspan fill="rgb(0,0,0)" stroke="none">Y</tspan></tspan></tspan></text>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.TextShape">
+    <g id="id11">
+     <rect class="BoundingBox" stroke="none" fill="none" x="3100" y="12900" width="677" height="570"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="3350" y="13283"><tspan fill="rgb(0,0,0)" stroke="none">Z</tspan></tspan></tspan></text>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.TextShape">
+    <g id="id12">
+     <rect class="BoundingBox" stroke="none" fill="none" x="1300" y="8700" width="401" height="601"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="1450" y="9083"><tspan fill="rgb(0,0,0)" stroke="none">X</tspan></tspan></tspan></text>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.CustomShape">
+    <g id="id13">
+     <rect class="BoundingBox" stroke="none" fill="none" x="1399" y="13399" width="3003" height="1303"/>
+     <path fill="none" stroke="rgb(52,101,164)" d="M 2900,14700 L 1400,14700 1400,13400 4400,13400 4400,14700 2900,14700 Z"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="1994" y="13990"><tspan fill="rgb(0,0,0)" stroke="none">Eiger Detector</tspan></tspan><tspan class="TextPosition" x="1520" y="14308"><tspan fill="rgb(0,0,0)" stroke="none">Looking towards z -ve</tspan></tspan></tspan></text>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.TextShape">
+    <g id="id14">
+     <rect class="BoundingBox" stroke="none" fill="none" x="4800" y="11900" width="2726" height="570"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="5050" y="12283"><tspan fill="rgb(0,0,0)" stroke="none">Direction of beam</tspan></tspan></tspan></text>
+    </g>
+   </g>
+   <g class="com.sun.star.drawing.TextShape">
+    <g id="id15">
+     <rect class="BoundingBox" stroke="none" fill="none" x="8900" y="9200" width="1101" height="601"/>
+     <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="282px" font-weight="400"><tspan class="TextPosition" x="9150" y="9583"><tspan fill="rgb(0,0,0)" stroke="none">Pin</tspan></tspan></tspan></text>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>