diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index b0a57d9..3afa665 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -8,6 +8,7 @@ module.exports = {
     "plugin:react-hooks/recommended",
     "plugin:react/recommended",
     "plugin:react/jsx-runtime",
+    "plugin:prettier/recommended",
   ],
   ignorePatterns: ["dist", ".eslintrc.cjs"],
   parser: "@typescript-eslint/parser",
@@ -26,7 +27,10 @@ module.exports = {
     "no-throw-literal": "off",
     "max-len": ["warn", { code: 80 }],
     "@typescript-eslint/no-throw-literal": "error",
-    "@typescript-eslint/no-misused-promises": ["error", { "checksVoidReturn": { "attributes": false } }],
+    "@typescript-eslint/no-misused-promises": [
+      "error",
+      { checksVoidReturn: { attributes: false } },
+    ],
   },
   settings: {
     react: {
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
index 5ed9ff4..55ff756 100644
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -29,7 +29,9 @@ jobs:
         run: npm ci
 
       - name: lint
-        run: npm run lint
+        run: |
+          npm run lint
+          npx prettier . --check
 
       - name: Tests
         run: npm run test
diff --git a/arkit.svg b/arkit.svg
index 9a658c8..2b4f983 100644
--- a/arkit.svg
+++ b/arkit.svg
@@ -1,116 +1,125 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1747px" preserveAspectRatio="none" style="width:1027px;height:1747px;" version="1.1" viewBox="0 0 1027 1747" width="1027px" zoomAndPan="magnify"><defs/><g><ellipse cx="58.3492" cy="1100.128" fill="#F8F8F8" rx="17.8492" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="21" x="47.8492" y="1103.8702">app</text><ellipse cx="520.7046" cy="1173.128" fill="#F8F8F8" rx="53.2046" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="485.2046" y="1176.8702">basicAppBar</text><!--MD5=[a6ea44cb3a57a1d10010999a6b55e716]
-entity _beamlineconfigStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="139" x="627" y="1289.886"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="119" x="637" y="1311.8919">beamlineconfigStore</text><ellipse cx="355.3714" cy="1296.8603" fill="#F8F8F8" rx="60.3714" ry="14.4743" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="89" x="310.8714" y="1300.6025">beamlineDialog</text><ellipse cx="520.4548" cy="1387.977" fill="#F8F8F8" rx="58.4548" ry="14.091" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="478.4548" y="1391.7191">BeamlineTable</text><ellipse cx="520.2601" cy="1124.938" fill="#F8F8F8" rx="60.7601" ry="14.552" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="90" x="475.2601" y="1128.6802">beamProperties</text><ellipse cx="520.5122" cy="1077.128" fill="#F8F8F8" rx="44.0122" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="491.5122" y="1080.8702">beamstop</text><!--MD5=[b3288f82aea54a3eaf1575100e7d0de8]
-entity _beamstopStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="109" x="642" y="1025.886"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="89" x="652" y="1047.8919">beamstopStore</text><ellipse cx="520.7046" cy="863.128" fill="#F8F8F8" rx="53.2046" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="485.2046" y="866.8702">cameraTube</text><!--MD5=[cb61f5a9fbf6155a70854d96a1a0186b]
-entity _cameraTubeStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="122" x="635.5" y="929.886"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="645.5" y="951.8919">cameraTubeStore</text><ellipse cx="203.0122" cy="511.132" fill="#F8F8F8" rx="44.0122" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="174.0122" y="514.8742">centrePlot</text><ellipse cx="520.7046" cy="21.132" fill="#F8F8F8" rx="53.2046" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="485.2046" y="24.8742">colourPicker</text><ellipse cx="202.7904" cy="1100.128" fill="#F8F8F8" rx="51.7904" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="69" x="168.2904" y="1103.8702">dataSideBar</text><ellipse cx="355.3344" cy="1601.0529" fill="#F8F8F8" rx="58.8344" ry="14.1669" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="85" x="312.8344" y="1604.7951">detectorDialog</text><!--MD5=[2954216a28af559177fd560618bc1dcd]
-entity _detectorStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="99" x="647" y="1459.886"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="79" x="657" y="1481.8919">detectorStore</text><ellipse cx="520.5862" cy="1646.1031" fill="#F8F8F8" rx="56.5862" ry="13.7172" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="79" x="481.0862" y="1649.8453">detectorTable</text><ellipse cx="355.3051" cy="27.132" fill="#F8F8F8" rx="43.3051" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="326.8051" y="30.8742">legendBar</text><ellipse cx="58.6274" cy="1054.128" fill="#F8F8F8" rx="25.6274" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="42.6274" y="1057.8702">main</text><ellipse cx="520.3309" cy="557.6562" fill="#F8F8F8" rx="64.3309" ry="15.2662" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="99" x="470.8309" y="561.3984">MessageDiagram</text><!--MD5=[29dac6c96591de790f438864f2e7c125]
-entity _numericRange--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="101" x="816" y="234.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="81" x="826" y="256.8959">numericRange</text><!--MD5=[ac8ec82d29538cc90342a8d0c02e821d]
-entity _plotStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="73" x="484" y="53.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="53" x="494" y="75.8959">plotStore</text><!--MD5=[478350613ba6941540b6248a553517e2]
-entity _Plotter--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="57" x="327" y="101.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="37" x="337" y="123.8959">Plotter</text><!--MD5=[682890370432bf166a9007ef5c4f77fa]
-entity _plotUtils--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="67" x="663" y="132.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="673" y="154.8959">plotUtils</text><ellipse cx="866.4548" cy="1305.977" fill="#F8F8F8" rx="58.4548" ry="14.091" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="824.4548" y="1309.7191">presetManager</text><ellipse cx="520.5772" cy="251.132" fill="#F8F8F8" rx="30.5772" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="501.0772" y="254.8742">qrange</text><!--MD5=[69536b9dc36a4a7375270f59c9e888e0]
-entity _qspace--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="62" x="835.5" y="300.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="845.5" y="322.8959">qspace</text><ellipse cx="520.663" cy="205.132" fill="#F8F8F8" rx="29.163" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="37" x="502.163" y="208.8742">qvalue</text><ellipse cx="520.4558" cy="423.6812" fill="#F8F8F8" rx="56.9558" ry="13.7912" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="480.4558" y="427.4234">rangeDiagram</text><ellipse cx="520.5477" cy="649.132" fill="#F8F8F8" rx="47.5477" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="489.0477" y="652.8742">rangeTable</text><!--MD5=[551ef8a1ec5300c6a2cdd5ab44cb90de]
-entity _ray--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="37" x="678" y="186.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="688" y="208.8959">ray</text><ellipse cx="355.5122" cy="601.132" fill="#F8F8F8" rx="44.0122" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="326.5122" y="604.8742">resultsBar</text><!--MD5=[7efb2db2f2184c088c9dbbb8036c83c7]
-entity _resultsStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="90" x="651.5" y="704.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="661.5" y="726.8959">resultsStore</text><ellipse cx="696.3757" cy="605.0651" fill="#F8F8F8" rx="71.3757" ry="16.6751" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="116" x="638.3757" y="608.8073">scatteringQuantities</text><ellipse cx="355.3051" cy="555.132" fill="#F8F8F8" rx="43.3051" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="326.8051" y="558.8742">svgEllipse</text><!--MD5=[0190f419ef54fc162964943b68b4f170]
-entity _types--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="51" x="965" y="1199.886"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="975" y="1221.8919">types</text><!--MD5=[37349b9385241d7e086cfee13ce1f69a]
-entity _unitRange--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="76" x="658.5" y="408.89"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="56" x="668.5" y="430.8959">unitRange</text><!--MD5=[2e43345867f0b2f1f095711d58ea3100]
-entity _units--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="48" x="842.5" y="977.886"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="28" x="852.5" y="999.8919">units</text><ellipse cx="58.4619" cy="1008.128" fill="#F8F8F8" rx="48.9619" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="65" x="25.9619" y="1011.8702">vite-env.d</text><ellipse cx="58.4975" cy="962.128" fill="#F8F8F8" rx="52.4975" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="70" x="23.4975" y="965.8702">vite.config</text><!--MD5=[8d1b8dcf6968eb6c0f6a0eeba4da8d0b]
-link app to basicAppBar--><path d="M75.5762,1104.506 C93.7549,1109.594 124.302,1117.736 151,1122.886 C262.279,1144.352 394.21,1159.888 466.152,1167.534 " fill="none" id="app-&gt;basicAppBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="471.227,1168.071,462.6989,1163.1443,466.2549,1167.5438,461.8554,1171.0997,471.227,1168.071" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[27b8899d8d132aae21cf1d9ed0d6989c]
-link app to centrePlot--><path d="M76.0026,1096.825 C87.6099,1093.783 102.5287,1087.912 111,1076.886 C179.448,987.792 197.943,615.62 201.356,528.97 " fill="none" id="app-&gt;centrePlot" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="201.551,523.91,197.2194,532.7552,201.3653,528.9065,205.2139,533.0524,201.551,523.91" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0810c7685c88ac48a48b75abc1428981]
-link app to dataSideBar--><path d="M76.6888,1099.886 C93.7588,1099.886 120.872,1099.886 145.518,1099.886 " fill="none" id="app-&gt;dataSideBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="150.736,1099.886,141.736,1095.886,145.736,1099.886,141.736,1103.886,150.736,1099.886" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cb79cf68647b5cb239913d9bebb0cb07]
-link basicAppBar to _beamlineconfigStore--><path d="M531.809,1185.633 C549.214,1206.507 586.327,1248.309 625,1274.886 C631.697,1279.488 639.162,1283.701 646.66,1287.452 " fill="none" id="basicAppBar-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="651.326,1289.727,644.9896,1282.1871,646.8318,1287.5356,641.4833,1289.3779,651.326,1289.727" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d5b5f7e7db4763188e527d021e1f4680]
-link basicAppBar to _beamstopStore--><path d="M556.342,1163.234 C566.011,1159.779 576.249,1155.353 585,1149.886 C604.967,1137.412 649.852,1091.359 675.856,1063.902 " fill="none" id="basicAppBar-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="679.55,1059.992,670.4613,1063.7861,676.1159,1063.6261,676.2759,1069.2807,679.55,1059.992" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[7921f7b70aeb436d8beccca1759cbdc1]
-link basicAppBar to _cameraTubeStore--><path d="M561.801,1164.635 C570.374,1161.269 578.721,1156.536 585,1149.886 C627.669,1104.694 592.879,1069.095 625,1015.886 C636.326,997.123 653.946,979.877 668.736,967.32 " fill="none" id="basicAppBar-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="672.825,963.905,663.353,966.6035,668.9872,967.1099,668.4808,972.744,672.825,963.905" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a53683efcb8c10ceff36ad11e470ad38]
-link basicAppBar to _detectorStore--><path d="M528.977,1185.948 C556.047,1233.244 649.126,1395.865 683.025,1455.091 " fill="none" id="basicAppBar-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="685.552,1459.505,684.5524,1449.707,683.0681,1455.1656,677.6094,1453.6813,685.552,1459.505" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[25c3e4fbb57df2ce1c1a5f4bd384aebc]
-link basicAppBar to presetManager--><path d="M549.651,1183.77 C611.862,1207.822 760.959,1265.468 829.689,1292.04 " fill="none" id="basicAppBar-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="834.496,1293.899,827.5441,1286.9225,829.8324,1292.0959,824.6591,1294.3842,834.496,1293.899" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c88ccc7ce9192c94659d87e570087f24]
-link basicAppBar to _units--><path d="M572.898,1170.72 C625.521,1166.385 707.893,1153.56 768,1115.886 C807.76,1090.964 838.501,1044.049 854.124,1016.533 " fill="none" id="basicAppBar-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="856.682,1011.96,848.7964,1017.8606,854.2403,1016.3233,855.7776,1021.7672,856.682,1011.96" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2c5a3409c0970752d8e3e7b370d0f02e]
-link _beamlineconfigStore to presetManager--><path d="M766.317,1306.476 C778.369,1306.404 790.852,1306.33 802.729,1306.259 " fill="none" id="_beamlineconfigStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="807.779,1306.229,798.7552,1302.2831,802.7791,1306.259,798.8032,1310.2829,807.779,1306.229" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f023a1ddb850476760c038fde5bccad9]
-link _beamlineconfigStore to _types--><path d="M752.766,1289.852 C814.308,1270.883 911.486,1240.931 959.96,1225.991 " fill="none" id="_beamlineconfigStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="964.779,1224.505,955.0001,1223.3334,960.0008,1225.9777,957.3565,1230.9785,964.779,1224.505" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1103eaaeb21d2c0f08a9c1884c0c1344]
-link _beamlineconfigStore to _units--><path d="M706.772,1289.667 C735.341,1236.61 822.006,1075.661 853.715,1016.771 " fill="none" id="_beamlineconfigStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="856.257,1012.052,848.4667,1018.0779,853.8854,1016.4538,855.5095,1021.8725,856.257,1012.052" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cef44439f357db85a391aaa3af015476]
-link beamlineDialog to _beamlineconfigStore--><path d="M415.937,1298.639 C473.194,1300.328 559.969,1302.888 621.638,1304.707 " fill="none" id="beamlineDialog-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="626.779,1304.859,617.9006,1300.5958,621.7812,1304.7118,617.6652,1308.5924,626.779,1304.859" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d91b0af663a27f32b1c71375c4404bdf]
-link beamlineDialog to BeamlineTable--><path d="M380.551,1310.313 C410.262,1326.9 460.698,1355.058 491.94,1372.5 " fill="none" id="beamlineDialog-&gt;BeamlineTable" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="496.406,1374.993,490.4973,1367.1134,492.0402,1372.5558,486.5978,1374.0987,496.406,1374.993" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[bf38fa111286f8b222b1383685e9e858]
-link beamlineDialog to presetManager--><path d="M363.617,1311.308 C377.324,1337.224 410.139,1390.921 456,1411.886 C594.927,1475.394 778.443,1365.716 842.368,1322.361 " fill="none" id="beamlineDialog-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="846.762,1319.357,837.0748,1321.1341,842.6343,1322.1788,841.5896,1327.7383,846.762,1319.357" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a4f0e2c57f133afdf156fcebe888438b]
-link beamlineDialog to _types--><path d="M408.969,1290.022 C493.126,1279.041 663.51,1256.923 808,1238.886 C861.436,1232.215 923.76,1224.724 959.723,1220.429 " fill="none" id="beamlineDialog-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="964.833,1219.819,955.4223,1216.9141,959.8683,1220.4117,956.3707,1224.8577,964.833,1219.819" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2ea7845b182a81617fcad8462c7308ce]
-link BeamlineTable to _beamlineconfigStore--><path d="M548.724,1375.535 C559.968,1370.413 573.125,1364.391 585,1358.886 C608.069,1348.191 633.775,1336.104 654.584,1326.277 " fill="none" id="BeamlineTable-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="659.218,1324.087,649.3718,1324.3141,654.697,1326.2225,652.7886,1331.5477,659.218,1324.087" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[926ecf4a29be9dfa448d41475ec1cf2f]
-link BeamlineTable to _types--><path d="M573.081,1394.029 C655.113,1401.042 817.044,1403.338 925,1329.886 C956.866,1308.204 974.907,1265.227 983.396,1238.972 " fill="none" id="BeamlineTable-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="984.968,1233.956,978.4611,1241.3492,983.4737,1238.7275,986.0954,1243.7401,984.968,1233.956" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5455ba9f5ce98eaaac06cd004c30d6d6]
-link beamProperties to _beamlineconfigStore--><path d="M560.371,1136.053 C569.002,1139.622 577.735,1144.174 585,1149.886 C609.99,1169.534 659.087,1247.065 682.493,1285.314 " fill="none" id="beamProperties-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="685.216,1289.777,683.9418,1280.0109,682.6112,1285.5091,677.1131,1284.1785,685.216,1289.777" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1995ceb19db107ff992e398a9a5205f3]
-link beamProperties to _units--><path d="M577.088,1119.471 C628.562,1112.865 706.242,1098.78 768,1069.886 C796.953,1056.34 825.38,1032.995 843.999,1015.94 " fill="none" id="beamProperties-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="848.051,1012.186,838.7303,1015.368,844.3831,1015.584,844.1671,1021.2367,848.051,1012.186" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f166fb516c5b1f7a8577b7ea9202db6d]
-link beamstop to _beamstopStore--><path d="M557.553,1069.841 C580.417,1065.373 610.528,1059.49 636.784,1054.359 " fill="none" id="beamstop-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="641.98,1053.344,632.3795,1051.1464,637.073,1054.304,633.9154,1058.9975,641.98,1053.344" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1891423738104a4572e5076a4b323a72]
-link beamstop to _detectorStore--><path d="M558.128,1083.633 C568.179,1087.188 578.176,1092.613 585,1100.886 C651.859,1181.939 592.545,1233.954 625,1333.886 C639.629,1378.93 666.196,1427.642 682.209,1454.997 " fill="none" id="beamstop-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="684.877,1459.526,683.7508,1449.7417,682.3372,1455.2191,676.8598,1453.8055,684.877,1459.526" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[131b0465e9e2cc08fc8218ddaab1d7ea]
-link beamstop to _types--><path d="M552.207,1086.072 C637.443,1111.57 876.192,1182.99 959.982,1208.056 " fill="none" id="beamstop-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="964.802,1209.498,957.3259,1203.0865,960.0117,1208.0651,955.0332,1210.7509,964.802,1209.498" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[7ae26055c92be63b1f83a74f13ca6f65]
-link beamstop to _units--><path d="M536.919,1064.773 C556.263,1050.324 591.032,1026.76 625,1015.886 C698.796,992.261 791.433,991.806 837.212,993.377 " fill="none" id="beamstop-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="842.292,993.567,833.448,989.233,837.2955,993.3799,833.1486,997.2274,842.292,993.567" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[666a710d1e968a5be0766850d287cf3e]
-link _beamstopStore to presetManager--><path d="M708.523,1060.142 C738.719,1107.414 822.588,1238.708 853.693,1287.402 " fill="none" id="_beamstopStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="856.534,1291.85,855.061,1282.1119,853.8428,1287.6361,848.3187,1286.4179,856.534,1291.85" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f8f5570b792fc7cbc7267c74c7ae2927]
-link _beamstopStore to _types--><path d="M738.744,1059.997 C785.756,1080.371 863.975,1116.961 925,1158.886 C940.973,1169.86 957.186,1184.457 969.361,1196.262 " fill="none" id="_beamstopStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="973.006,1199.829,969.3704,1190.6757,969.4321,1196.3322,963.7756,1196.394,973.006,1199.829" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cd0d6eeb45f632b570deb01bb673f8d4]
-link _beamstopStore to _units--><path d="M751.118,1027.566 C779.807,1019.37 813.959,1009.612 837.432,1002.905 " fill="none" id="_beamstopStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="842.273,1001.522,832.5203,1000.1492,837.4655,1002.896,834.7187,1007.8412,842.273,1001.522" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cc2e012cd93548fb44f6c1d48ea73314]
-link cameraTube to _cameraTubeStore--><path d="M547.904,874.151 C559.369,879.139 572.912,885.163 585,890.886 C609.681,902.571 637.061,916.44 658.392,927.453 " fill="none" id="cameraTube-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="662.849,929.758,656.6935,922.0697,658.4082,927.4604,653.0174,929.175,662.849,929.758" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b98a4da009f87a9fd615cc543b126100]
-link cameraTube to _units--><path d="M569.829,867.876 C621.034,874.551 703.268,889.295 768,919.886 C796.901,933.544 825.337,956.87 843.972,973.889 " fill="none" id="cameraTube-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="848.028,977.636,844.1295,968.5916,844.3546,974.2439,838.7022,974.469,848.028,977.636" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a0f8c73950ed7aaed729061f5adc9c60]
-link _cameraTubeStore to presetManager--><path d="M719.959,964.037 C735.369,976.843 755.259,995.575 768,1015.886 C825.871,1108.142 853.585,1238.639 862.326,1286.947 " fill="none" id="_cameraTubeStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="863.207,1291.894,865.5685,1282.3324,862.3311,1286.9713,857.6922,1283.7339,863.207,1291.894" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[24e1f68fdaae5548182611ce749fc733]
-link _cameraTubeStore to _types--><path d="M757.643,935.036 C808.185,928.752 879.297,929.023 925,967.886 C959.851,997.521 980.232,1139.22 986.981,1194.618 " fill="none" id="_cameraTubeStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="987.592,1199.703,990.4912,1190.2905,986.9963,1194.7386,982.5482,1191.2437,987.592,1199.703" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2ff52b8f357b4ccc68ecb8b937a908a0]
-link _cameraTubeStore to _units--><path d="M757.204,963.944 C784.445,971.727 815.417,980.576 837.24,986.812 " fill="none" id="_cameraTubeStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="842.306,988.259,834.7522,981.9392,837.4986,986.8846,832.5532,989.6311,842.306,988.259" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[49e584d2392b49681bb6c973a83847d4]
-link centrePlot to _beamlineconfigStore--><path d="M204.771,523.9 C208.404,578.85 226.622,796.503 295,958.886 C344.419,1076.245 358.938,1113.459 456,1195.886 C508.114,1240.142 580.825,1270.514 632.428,1288.153 " fill="none" id="centrePlot-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="637.355,1289.821,630.1124,1283.1468,632.6189,1288.218,627.5477,1290.7245,637.355,1289.821" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[17e2f0fb9204db1e0088a5db68c6d712]
-link centrePlot to _beamstopStore--><path d="M203.684,524.02 C203.176,573.9 207.725,754.115 295,859.886 C383.697,967.38 549.169,1014.579 637.089,1032.845 " fill="none" id="centrePlot-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="641.992,1033.851,633.9787,1028.125,637.0939,1032.8468,632.372,1035.9619,641.992,1033.851" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[da964260897d31862023a421c2c3107a]
-link centrePlot to _cameraTubeStore--><path d="M208.157,523.81 C226.616,578.87 306.903,795.169 456,885.886 C509.423,918.391 579.644,933.656 630.22,940.776 " fill="none" id="centrePlot-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="635.36,941.481,626.9875,936.2943,630.4064,940.8011,625.8997,944.22,635.36,941.481" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[227c26e375aaba699cfa574f52e64c74]
-link centrePlot to _detectorStore--><path d="M205.162,523.98 C214.218,625.63 273.733,1285.854 295,1321.886 C366.505,1443.034 550.17,1469.8 641.818,1475.5 " fill="none" id="centrePlot-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="646.915,1475.801,638.166,1471.2782,641.9237,1475.5067,637.6952,1479.2644,646.915,1475.801" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[74fdfa913bad1fff3c80abc7bfb9ddc1]
-link centrePlot to legendBar--><path d="M205.028,497.88 C210.534,431.11 238.412,127.21 295,54.89 C300.877,47.38 309.253,41.79 317.872,37.66 " fill="none" id="centrePlot-&gt;legendBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="322.672,35.52,312.8232,35.5348,318.106,37.5576,316.0833,42.8404,322.672,35.52" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[774e2276e55e235112045360db7d3ce1]
-link centrePlot to _plotStore--><path d="M204.833,497.7 C209.223,432.77 231.906,147.8 295,91.89 C345.277,47.33 429.029,53.07 478.784,61.7 " fill="none" id="centrePlot-&gt;_plotStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="483.787,62.6,475.6333,57.0758,478.8653,61.7184,474.2227,64.9504,483.787,62.6" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1a433a4545821ffa8217ccd8ba4a348c]
-link centrePlot to _Plotter--><path d="M203.714,497.82 C203.281,447.36 207.966,262.46 295,150.89 C302.007,141.9 312.261,135.13 322.291,130.18 " fill="none" id="centrePlot-&gt;_Plotter" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="326.87,128.04,317.0233,128.2476,322.3448,130.1666,320.4258,135.488,326.87,128.04" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b4108886d4e8d8675452315385a60436]
-link centrePlot to _plotUtils--><path d="M203.395,497.61 C202.003,449.73 204.202,284.63 295,205.89 C348.76,159.26 568.501,151.36 657.653,150.09 " fill="none" id="centrePlot-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="662.822,150.03,653.7702,146.1486,657.8224,150.0957,653.8753,154.1479,662.822,150.03" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[423a0401b2042c3075ea042a9878ad62]
-link centrePlot to qrange--><path d="M204.722,497.67 C207.695,457.33 222.57,335.16 295,278.89 C350.961,235.41 439.556,239.31 486.987,245.4 " fill="none" id="centrePlot-&gt;qrange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="492.005,246.07,483.616,240.9101,487.0493,245.4059,482.5535,248.8392,492.005,246.07" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d3c519e5934b16dad37e5c35731f1ac7]
-link centrePlot to qvalue--><path d="M204.095,497.8 C205.175,454.12 214.957,312.29 295,243.89 C349.55,197.27 439.508,197.13 487.309,201.01 " fill="none" id="centrePlot-&gt;qvalue" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="492.362,201.45,483.7415,196.6869,487.3807,201.0177,483.0499,204.6569,492.362,201.45" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5fd5c8f6fa94b2c6867559c9cf8f5bff]
-link centrePlot to resultsBar--><path d="M218.314,523.32 C235.584,537.85 265.931,561.94 295,577.89 C303.029,582.29 312.078,586.25 320.652,589.59 " fill="none" id="centrePlot-&gt;resultsBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="325.356,591.38,318.3701,584.4376,320.6837,589.5997,315.5216,591.9132,325.356,591.38" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[756d14e4e3b21c420852f0cd1d65889d]
-link centrePlot to _resultsStore--><path d="M211.948,523.76 C226.323,546.26 258.555,593.26 295,623.89 C357.592,676.49 377.229,690.98 456,712.886 C519.819,730.636 596.884,729.79 646.04,726.612 " fill="none" id="centrePlot-&gt;_resultsStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="651.3,726.256,642.0508,722.872,646.3114,726.5931,642.5902,730.8538,651.3,726.256" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[05038317e69905c92926fb2f22ce0fa2]
-link centrePlot to scatteringQuantities--><path d="M244.75,506.53 C315.862,500.39 466.353,493.89 585,532.89 C618.852,544.01 652.382,568.22 673.471,585.49 " fill="none" id="centrePlot-&gt;scatteringQuantities" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="677.519,588.85,673.1509,580.0228,673.6725,585.6556,668.0398,586.1772,677.519,588.85" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[ec0ab718f7bd762d2aaf8ed7eabe2fb9]
-link centrePlot to svgEllipse--><path d="M234.819,519.9 C259.167,527.01 293.184,536.96 318.731,544.43 " fill="none" id="centrePlot-&gt;svgEllipse" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="323.722,545.89,316.2055,539.5259,318.9228,544.4874,313.9613,547.2046,323.722,545.89" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b38abf43950d7be6cbacc3ae0bbd0c79]
-link centrePlot to _types--><path d="M232.282,501.01 C250.043,495.33 273.567,488.78 295,485.89 C507.325,457.25 614.44,429.48 768,578.89 C953.803,759.66 983.883,1104.065 988.632,1194.621 " fill="none" id="centrePlot-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="988.887,1199.727,992.4345,1190.5392,988.6384,1194.7332,984.4444,1190.937,988.887,1199.727" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[892b893cb945f9a4f2c539e38f2932c4]
-link centrePlot to _unitRange--><path d="M219.603,498.73 C257.443,470.16 358.195,399.55 456,377.89 C511.977,365.49 528.866,366.22 585,377.89 C592.259,379.39 625.378,393.96 653.482,406.65 " fill="none" id="centrePlot-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="658.304,408.83,651.7525,401.4762,653.7484,406.7693,648.4554,408.7652,658.304,408.83" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[39eb32801e3d5d27aac83d8e87323799]
-link colourPicker to _plotUtils--><path d="M556.326,30.56 C565.994,34.02 576.236,38.44 585,43.89 C622.565,67.23 657.975,105 678.165,128.59 " fill="none" id="colourPicker-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="681.513,132.54,678.7274,123.0933,678.2729,128.7319,672.6344,128.2774,681.513,132.54" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1a17118c4acc28502d65b21d31e03b90]
-link dataSideBar to _beamlineconfigStore--><path d="M204.642,1112.946 C207.385,1152.729 221.666,1272.69 295,1321.886 C402.569,1394.048 565.481,1353.326 646.361,1325.737 " fill="none" id="dataSideBar-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="651.569,1323.94,641.7564,1323.0959,646.8427,1325.5716,644.367,1330.658,651.569,1323.94" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[4ea2db8ec269957f0383dfe908e961d1]
-link dataSideBar to beamlineDialog--><path d="M213.045,1112.854 C229.119,1135.774 263.897,1184.805 295,1224.886 C309.449,1243.505 326.669,1264.189 338.857,1278.593 " fill="none" id="dataSideBar-&gt;beamlineDialog" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="342.155,1282.482,339.3852,1273.0306,338.9213,1278.6684,333.2835,1278.2045,342.155,1282.482" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[593a2f9d50681742633a4877e39128e4]
-link dataSideBar to beamProperties--><path d="M252.951,1103.765 C307.89,1108.118 397.158,1115.192 457.073,1119.939 " fill="none" id="dataSideBar-&gt;beamProperties" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="462.416,1120.363,453.7608,1115.6633,457.4317,1119.9673,453.1277,1123.6382,462.416,1120.363" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[841643dca18cbc05eab8cebc34e0ad25]
-link dataSideBar to beamstop--><path d="M253.297,1096.292 C313.187,1091.926 413.501,1084.613 472.388,1080.32 " fill="none" id="dataSideBar-&gt;beamstop" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="477.604,1079.94,468.3365,1076.6063,472.6173,1080.3043,468.9193,1084.585,477.604,1079.94" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c85f8075560e14db0462701e8121aacb]
-link dataSideBar to _beamstopStore--><path d="M234.418,1089.441 C251.945,1083.782 274.501,1077.104 295,1072.886 C414.622,1048.27 558.038,1043.294 636.69,1042.607 " fill="none" id="dataSideBar-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="641.777,1042.568,632.7464,1038.6375,636.7771,1042.6066,632.8081,1046.6373,641.777,1042.568" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0ed4eec2974998b2b49777ecb3d26043]
-link dataSideBar to cameraTube--><path d="M210.635,1086.98 C223.811,1062.401 255.447,1008.346 295,974.886 C352.87,925.931 435.803,891.778 482.984,874.925 " fill="none" id="dataSideBar-&gt;cameraTube" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="487.716,873.25,477.897,872.4831,483.0027,874.9187,480.567,880.0244,487.716,873.25" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e096a37c1e8dcccfd139f8c80b842b28]
-link dataSideBar to _cameraTubeStore--><path d="M222.074,1087.584 C239.92,1075.921 268.334,1058.632 295,1047.886 C408.73,1002.053 549.214,972.386 629.97,957.738 " fill="none" id="dataSideBar-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="635.202,956.795,625.635,954.4555,630.2814,957.6823,627.0546,962.3286,635.202,956.795" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2c520802993f4a3cc52bcfad8b6ffc66]
-link dataSideBar to detectorDialog--><path d="M204.372,1113.064 C206.392,1167.697 219.008,1380.652 295,1532.886 C304.862,1552.643 321.869,1571.232 335.181,1583.965 " fill="none" id="dataSideBar-&gt;detectorDialog" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="338.828,1587.397,335.0137,1578.3168,335.1862,1583.971,329.532,1584.1436,338.828,1587.397" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[de5213a13e684cdbe5b67250157e3f54]
-link dataSideBar to _detectorStore--><path d="M204.947,1113.133 C209.727,1175.86 233.457,1442.022 295,1490.886 C398.374,1572.964 568.492,1525.697 649.651,1495.72 " fill="none" id="dataSideBar-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="654.394,1493.951,644.5636,1493.3484,649.7092,1495.6983,647.3593,1500.844,654.394,1493.951" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0ccfb32cb233dd35566530626feb0a1e]
-link dataSideBar to _units--><path d="M207.712,1086.649 C217.254,1054.731 245.43,972.511 295,922.886 C351.894,865.929 377.765,858.865 456,839.886 C591.973,806.899 648.154,809.679 768,881.886 C805.975,904.765 836.742,947.54 852.972,973.394 " fill="none" id="dataSideBar-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="855.642,977.704,854.3042,967.9464,853.0095,973.4531,847.5028,972.1584,855.642,977.704" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1304498b7e36290b0ef7968c5014725f]
-link detectorDialog to _detectorStore--><path d="M397.701,1591.011 C444.044,1579.359 521.173,1558.317 585,1532.886 C611.114,1522.481 639.366,1508.103 660.767,1496.522 " fill="none" id="detectorDialog-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="665.226,1494.095,655.4088,1494.8839,660.8343,1496.4852,659.233,1501.9107,665.226,1494.095" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5d956cd3429e9aeaaddc26d227784ecf]
-link detectorDialog to detectorTable--><path d="M394.716,1611.4364 C419.681,1618.3286 452.28,1627.3282 477.898,1634.4005 " fill="none" id="detectorDialog-&gt;detectorTable" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="482.924,1635.7881,475.314,1629.5361,478.1045,1634.4567,473.1838,1637.2472,482.924,1635.7881" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c56bd43eb580f38e664f438a9d1f36b0]
-link detectorDialog to presetManager--><path d="M413.182,1604.124 C500.932,1605.916 669.766,1596.031 768,1503.886 C822.828,1452.456 850.883,1363.564 860.999,1324.836 " fill="none" id="detectorDialog-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="862.254,1319.931,856.1471,1327.658,861.0141,1324.7748,863.8973,1329.6418,862.254,1319.931" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[37f2ca96678743cb428f74aecd6aa1f1]
-link detectorDialog to _types--><path d="M370.15,1614.5182 C388.054,1631.3348 421.291,1659.0288 456,1669.8859 C659.499,1733.5418 791.419,1735.079 925,1568.886 C966.443,1517.325 983.57,1307.974 988.157,1239.024 " fill="none" id="detectorDialog-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="988.491,1233.927,983.9133,1242.6473,988.1653,1238.9164,991.8963,1243.1684,988.491,1233.927" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[20bfe200a114777378bd73a15049fea5]
-link _detectorStore to presetManager--><path d="M744.708,1459.717 C752.937,1455.569 761.069,1450.636 768,1444.886 C809.602,1410.368 841.635,1353.972 856.459,1324.758 " fill="none" id="_detectorStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="858.858,1319.97,851.2506,1326.2252,856.6185,1324.4404,858.4032,1329.8084,858.858,1319.97" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[47685ed1073a677d32df603d637da26a]
-link _detectorStore to _types--><path d="M746.15,1473.257 C797.163,1466.927 876.512,1449.555 925,1401.886 C970.659,1356.997 984.045,1278.095 987.932,1239.472 " fill="none" id="_detectorStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="988.44,1234.074,983.6167,1242.661,987.9729,1239.0521,991.5817,1243.4083,988.44,1234.074" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[759abe2480fa291aedf7b67b32a4022b]
-link _detectorStore to _units--><path d="M707.211,1459.725 C721.861,1433.326 749.828,1380.871 768,1333.886 C812.941,1217.689 848.027,1072.087 860.541,1017.195 " fill="none" id="_detectorStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="861.681,1012.171,855.7874,1020.0618,860.5738,1017.0469,863.5888,1021.8333,861.681,1012.171" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5b2d0942037cb08013c24b055e3ca1f5]
-link detectorTable to _detectorStore--><path d="M535.153,1632.6247 C565.3,1603.345 637.744,1532.983 674.03,1497.739 " fill="none" id="detectorTable-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="677.848,1494.03,668.6058,1497.4333,674.2621,1497.5145,674.181,1503.1707,677.848,1494.03" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[9ab77d2b3e6b24773d077a36433313b6]
-link detectorTable to _types--><path d="M571.987,1640.1948 C660.991,1627.1595 844.042,1586.236 925,1464.886 C973.498,1392.191 985.545,1285.043 988.526,1239.113 " fill="none" id="detectorTable-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="988.832,1234.081,984.2941,1242.8221,988.5291,1239.0718,992.2794,1243.3068,988.832,1234.081" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[08824a3ba6720dad2419584cda81b6e8]
-link legendBar to colourPicker--><path d="M398.901,25.33 C418.462,24.61 441.962,23.74 463.001,22.97 " fill="none" id="legendBar-&gt;colourPicker" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="468.01,22.78,458.8694,19.1126,463.0134,22.9633,459.1627,27.1072,468.01,22.78" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[859e2ca28cb76f44f0370c60baffe4d6]
-link legendBar to _plotStore--><path d="M388.315,35.47 C414.132,42.44 450.705,52.32 478.679,59.87 " fill="none" id="legendBar-&gt;_plotStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="483.798,61.25,476.1554,55.0379,478.9716,59.9439,474.0656,62.7601,483.798,61.25" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a7ba3c821d48259f80a967b14cc45774]
-link <b>main</b> to app--><path d="M58.5,1066.916 C58.5,1071.732 58.5,1076.548 58.5,1081.363 " fill="none" id="&lt;b&gt;main&lt;/b&gt;-&gt;app" style="stroke: #000000; stroke-width: 1.0;"/><polygon fill="#000000" points="58.5,1086.589,62.5,1077.589,58.5,1081.589,54.5,1077.589,58.5,1086.589" style="stroke: #000000; stroke-width: 1.0;"/><!--MD5=[82c1f8e9a20de97d7eabc92ecd792005]
-link _Plotter to _plotStore--><path d="M384.151,110.74 C410.081,103.11 449.175,91.6 478.691,82.9 " fill="none" id="_Plotter-&gt;_plotStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="483.713,81.42,473.9498,80.1241,478.9165,82.8318,476.2087,87.7985,483.713,81.42" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[49d95620f04899f6aa063a5444cfa81d]
-link _Plotter to _plotUtils--><path d="M384.242,121.42 C444.809,126.96 588.949,140.14 657.726,146.43 " fill="none" id="_Plotter-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="662.945,146.91,654.3465,142.1074,657.9658,146.4549,653.6183,150.0742,662.945,146.91" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f66ddaf772cc78b11c3af50aec607105]
-link _plotUtils to _numericRange--><path d="M730.326,160.22 C742.51,164.63 756.223,170.29 768,176.89 C795.367,192.22 823.428,214.65 842.377,230.98 " fill="none" id="_plotUtils-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="846.516,234.58,842.348,225.6566,842.7425,231.2996,837.0994,231.6941,846.516,234.58" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[7c97b5a79daef19f1851810c5c9628a2]
-link presetManager to _types--><path d="M894.676,1293.53 C904.553,1288.574 915.592,1282.474 925,1275.886 C941.11,1264.605 957.439,1249.626 969.636,1237.583 " fill="none" id="presetManager-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="973.284,1233.948,964.0859,1237.4687,969.7428,1237.4778,969.7336,1243.1347,973.284,1233.948" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0596d30483a882cc19ac5c32929d0c5a]
-link qrange to _numericRange--><path d="M551.127,250.97 C608.82,251.14 737.02,251.51 810.648,251.73 " fill="none" id="qrange-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="815.854,251.74,806.8655,247.7143,810.854,251.7257,806.8426,255.7143,815.854,251.74" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[157ef11e6a0ba65ccbc9363f896c36c5]
-link qrange to _qspace--><path d="M548.493,256.14 C610.163,268.15 761.363,297.6 830.261,311.02 " fill="none" id="qrange-&gt;_qspace" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="835.476,312.04,827.4051,306.3955,830.568,311.0855,825.8779,314.2483,835.476,312.04" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c36a8607e6475574cee7fb0a79f5dc5f]
-link qrange to _ray--><path d="M546.801,244.05 C580.62,234.92 640.066,218.86 672.612,210.07 " fill="none" id="qrange-&gt;_ray" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="677.597,208.72,667.8653,207.2053,672.77,210.0239,669.9515,214.9286,677.597,208.72" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[781606cfc6e5fc380a20c156d0bd8efa]
-link qrange to _types--><path d="M540.801,260.63 C620.754,301.01 921.958,453.35 925,457.89 C967.057,520.59 985.407,1075.45 988.878,1194.469 " fill="none" id="qrange-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="989.032,1199.804,992.7707,1190.6923,988.8877,1194.8061,984.774,1190.9232,989.032,1199.804" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[62e662b571a1e13086db8d9d47736400]
-link _qspace to _types--><path d="M897.656,333.84 C908.116,340.97 918.773,350.39 925,361.89 C965.74,437.09 985.317,1066.407 988.893,1194.271 " fill="none" id="_qspace-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="989.042,1199.637,992.7911,1190.5296,988.9034,1194.6389,984.7941,1190.7513,989.042,1199.637" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2b7bdd1805499b0002c364951c568ca3]
-link qvalue to _plotUtils--><path d="M544.606,197.58 C573.506,188.45 623.371,172.69 657.824,161.79 " fill="none" id="qvalue-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="662.791,160.22,653.0042,159.1166,658.0232,161.726,655.4137,166.745,662.791,160.22" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cc578e726c93036f57cbbbd44df52c7a]
-link qvalue to _ray--><path d="M549.843,204.72 C584.072,204.53 640.973,204.2 672.572,204.02 " fill="none" id="qvalue-&gt;_ray" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="677.793,203.99,668.7703,200.0415,672.7931,204.0186,668.816,208.0414,677.793,203.99" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e3d73fafa21a9812183994b7122589ba]
-link rangeDiagram to _unitRange--><path d="M577.512,424.53 C602.081,424.81 630.441,425.14 653.199,425.4 " fill="none" id="rangeDiagram-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="658.263,425.46,649.3093,421.3574,653.2633,425.4029,649.2179,429.3569,658.263,425.46" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e5ff59a501fdb35405cbd1ecb801cb13]
-link rangeTable to _resultsStore--><path d="M547.174,659.66 C574.205,671 617.305,689.08 650.096,702.84 " fill="none" id="rangeTable-&gt;_resultsStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="654.856,704.83,648.1101,697.6541,650.2469,702.8919,645.0091,705.0287,654.856,704.83" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d799cd6b21528669722a26ecffb8ffa9]
-link rangeTable to scatteringQuantities--><path d="M555.877,640.19 C580.585,633.94 614.363,625.4 642.507,618.29 " fill="none" id="rangeTable-&gt;scatteringQuantities" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="647.693,616.97,637.9878,615.2937,642.845,618.1934,639.9453,623.0506,647.693,616.97" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[da8458e95ab223cabcc393d0ddb71351]
-link rangeTable to _unitRange--><path d="M535.048,636.28 C548.375,623.6 568.994,603.2 585,583.89 C623.273,537.7 662.105,478.76 681.962,447.55 " fill="none" id="rangeTable-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="684.752,443.15,676.5601,448.6174,682.0789,447.3755,683.3208,452.8943,684.752,443.15" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[bf1fd359bb09bada2fc721f388a83091]
-link rangeTable to _units--><path d="M565.528,644.54 C619.8,641.7 711.732,645.48 768,694.89 C852.32,768.919 864.123,916.617 865.476,972.64 " fill="none" id="rangeTable-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="865.576,977.77,869.4004,968.694,865.4789,972.7709,861.4019,968.8494,865.576,977.77" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[738392c8b93e1f7abe76e3831bf71f28]
-link _ray to _numericRange--><path d="M715.161,208.93 C737.725,215.38 777.82,226.83 810.931,236.29 " fill="none" id="_ray-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="815.763,237.68,808.2099,231.3593,810.9558,236.3051,806.01,239.0509,815.763,237.68" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b6bb703ad39547b021a8c4ecd01eb7ab]
-link resultsBar to MessageDiagram--><path d="M389.094,592.29 C412.708,586.06 445.016,577.54 471.565,570.53 " fill="none" id="resultsBar-&gt;MessageDiagram" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="476.452,569.24,466.7288,567.6716,471.6179,570.5172,468.7723,575.4062,476.452,569.24" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[6a36f5b4999f4480cfc82ddf050159b2]
-link resultsBar to _numericRange--><path d="M392.253,593.57 C401.139,590.16 409.867,585.17 416,577.89 C474.375,508.53 395.222,445.14 456,377.89 C503.94,324.84 710.829,280.4 810.89,261.56 " fill="none" id="resultsBar-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="815.865,260.63,806.2826,258.3544,810.9504,261.5501,807.7547,266.2178,815.865,260.63" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e685bebbe24c6d328514b7c19be7463a]
-link resultsBar to rangeDiagram--><path d="M388.976,592.38 C398.331,588.9 408.125,584.18 416,577.89 C440.57,558.26 487.861,479 508.927,442.48 " fill="none" id="resultsBar-&gt;rangeDiagram" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="511.602,437.83,503.6403,443.6275,509.1038,442.1612,510.5702,447.6247,511.602,437.83" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[81dde4b43ce4c99d877ce2d82a86b82e]
-link resultsBar to rangeTable--><path d="M387.159,609.91 C414.271,617.9 453.882,629.56 482.698,638.05 " fill="none" id="resultsBar-&gt;rangeTable" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="487.587,639.49,480.0879,633.1054,482.7916,638.0743,477.8227,640.778,487.587,639.49" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[993f8bb94a42bb540980ca6aef589b54]
-link resultsBar to _resultsStore--><path d="M369.863,613.24 C387.977,629.28 421.982,656.99 456,671.89 C518.444,699.23 596.721,711.943 646.439,717.62 " fill="none" id="resultsBar-&gt;_resultsStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="651.458,718.18,642.957,713.2068,646.4888,717.6256,642.07,721.1575,651.458,718.18" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f512c4e3e8f7ee8d0ef86666be1ccb3a]
-link resultsBar to scatteringQuantities--><path d="M399.779,601.4 C455.187,602.05 552.108,603.19 619.839,603.99 " fill="none" id="resultsBar-&gt;scatteringQuantities" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="625.072,604.05,616.1195,599.9449,620.0723,603.9914,616.0258,607.9443,625.072,604.05" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[4548d82b079e5330e8b9bef202663786]
-link resultsBar to _unitRange--><path d="M392.14,593.47 C401.026,590.06 409.781,585.1 416,577.89 C468.945,516.47 392.691,450.55 456,399.89 C485.539,376.25 592.939,399 653.399,414.39 " fill="none" id="resultsBar-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="658.384,415.67,650.6608,409.5583,653.5409,414.4271,648.6722,417.3072,658.384,415.67" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c66619fc71b08ccb6dfb96dbbab0fb64]
-link resultsBar to _units--><path d="M364.359,613.76 C379.274,637.08 413.98,686.39 456,712.886 C578.074,789.869 656.774,710.923 768,802.886 C822.872,848.255 850.062,932.383 860.389,972.491 " fill="none" id="resultsBar-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="861.679,977.62,863.3646,967.9165,860.4603,972.7708,855.6059,969.8664,861.679,977.62" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[95ec0a6772fe0d0910ec9af1a6eb4857]
-link _resultsStore to _units--><path d="M739.23,738.985 C749.634,744.752 760.07,752.027 768,760.886 C825.519,825.139 852.108,928.125 861.417,972.905 " fill="none" id="_resultsStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="862.417,977.818,864.5414,968.201,861.4197,972.9185,856.7022,969.7967,862.417,977.818" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[51d0e88da8530ca185511c1bba80cc5c]
-link _unitRange to _numericRange--><path d="M715.54,408.76 C730.379,394.27 751.565,372.6 768,351.89 C788.152,326.49 785.255,313.99 808,290.89 C814.783,284 822.956,277.6 830.983,272.06 " fill="none" id="_unitRange-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="835.417,269.07,825.7157,270.7686,831.2666,271.8583,830.177,277.4092,835.417,269.07" style="stroke: #000000; stroke-width: 0.5;"/><script type="text/plantuml"><![CDATA[MD5=[06dd516db168c59396aa887c4a9ec641]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="2001px" preserveAspectRatio="none" style="width:1092px;height:2001px;" version="1.1" viewBox="0 0 1092 2001" width="1092px" zoomAndPan="magnify"><defs/><g><ellipse cx="58.3492" cy="534.102" fill="#F8F8F8" rx="17.8492" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="21" x="47.8492" y="537.8442">app</text><ellipse cx="517.2046" cy="415.102" fill="#F8F8F8" rx="53.2046" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="481.7046" y="418.8442">basicAppBar</text><!--MD5=[a6ea44cb3a57a1d10010999a6b55e716]
+entity _beamlineconfigStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="139" x="618" y="573.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="119" x="628" y="595.8659">beamlineconfigStore</text><ellipse cx="355.3714" cy="565.8343" fill="#F8F8F8" rx="60.3714" ry="14.4743" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="89" x="310.8714" y="569.5765">beamlineDialog</text><ellipse cx="516.9548" cy="713.951" fill="#F8F8F8" rx="58.4548" ry="14.091" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="474.9548" y="717.6931">BeamlineTable</text><ellipse cx="516.7601" cy="892.912" fill="#F8F8F8" rx="60.7601" ry="14.552" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="90" x="471.7601" y="896.6542">beamProperties</text><ellipse cx="517.0122" cy="277.102" fill="#F8F8F8" rx="44.0122" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="488.0122" y="280.8442">beamstop</text><!--MD5=[b3288f82aea54a3eaf1575100e7d0de8]
+entity _beamstopStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="109" x="633" y="477.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="89" x="643" y="499.8659">beamstopStore</text><ellipse cx="517.2046" cy="845.102" fill="#F8F8F8" rx="53.2046" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="481.7046" y="848.8442">cameraTube</text><!--MD5=[cb61f5a9fbf6155a70854d96a1a0186b]
+entity _cameraTubeStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="122" x="626.5" y="741.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="636.5" y="763.8659">cameraTubeStore</text><ellipse cx="355.5122" cy="1208.107" fill="#F8F8F8" rx="44.0122" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="326.5122" y="1211.8492">centrePlot</text><ellipse cx="687.7046" cy="1692.107" fill="#F8F8F8" rx="53.2046" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="652.2046" y="1695.8492">colourPicker</text><ellipse cx="202.7904" cy="534.102" fill="#F8F8F8" rx="51.7904" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="69" x="168.2904" y="537.8442">dataSideBar</text><ellipse cx="355.3344" cy="146.0269" fill="#F8F8F8" rx="58.8344" ry="14.1669" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="85" x="312.8344" y="149.7691">detectorDialog</text><!--MD5=[2954216a28af559177fd560618bc1dcd]
+entity _detectorStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="99" x="638" y="171.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="79" x="648" y="193.8659">detectorStore</text><ellipse cx="517.0862" cy="104.0772" fill="#F8F8F8" rx="56.5862" ry="13.7172" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="79" x="477.5862" y="107.8194">detectorTable</text><ellipse cx="516.8051" cy="1692.107" fill="#F8F8F8" rx="43.3051" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="488.3051" y="1695.8492">legendBar</text><ellipse cx="58.6274" cy="488.102" fill="#F8F8F8" rx="25.6274" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="42.6274" y="491.8442">main</text><ellipse cx="687.3309" cy="1558.6312" fill="#F8F8F8" rx="64.3309" ry="15.2662" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="99" x="637.8309" y="1562.3734">MessageDiagram</text><!--MD5=[29dac6c96591de790f438864f2e7c125]
+entity _numericRange--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="101" x="980" y="1470.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="81" x="990" y="1492.8709">numericRange</text><!--MD5=[ac8ec82d29538cc90342a8d0c02e821d]
+entity _plotStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="73" x="651" y="1772.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="53" x="661" y="1794.8709">plotStore</text><!--MD5=[478350613ba6941540b6248a553517e2]
+entity _Plotter--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="57" x="488.5" y="1772.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="37" x="498.5" y="1794.8709">Plotter</text><!--MD5=[682890370432bf166a9007ef5c4f77fa]
+entity _plotUtils--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="67" x="835" y="1518.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="845" y="1540.8709">plotUtils</text><ellipse cx="868.4548" cy="482.951" fill="#F8F8F8" rx="58.4548" ry="14.091" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="826.4548" y="486.6931">presetManager</text><ellipse cx="687.5772" cy="1128.107" fill="#F8F8F8" rx="30.5772" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="668.0772" y="1131.8492">qrange</text><!--MD5=[69536b9dc36a4a7375270f59c9e888e0]
+entity _qspace--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="62" x="837.5" y="852.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="847.5" y="874.8659">qspace</text><ellipse cx="687.663" cy="1254.107" fill="#F8F8F8" rx="29.163" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="37" x="669.163" y="1257.8492">qvalue</text><ellipse cx="687.4558" cy="1738.6562" fill="#F8F8F8" rx="56.9558" ry="13.7912" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="647.4558" y="1742.3984">rangeDiagram</text><ellipse cx="687.5477" cy="1510.107" fill="#F8F8F8" rx="47.5477" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="656.0477" y="1513.8492">rangeTable</text><!--MD5=[551ef8a1ec5300c6a2cdd5ab44cb90de]
+entity _ray--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="37" x="850" y="1284.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="860" y="1306.8709">ray</text><ellipse cx="517.0122" cy="1510.107" fill="#F8F8F8" rx="44.0122" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="488.0122" y="1513.8492">resultsBar</text><!--MD5=[7efb2db2f2184c088c9dbbb8036c83c7]
+entity _resultsStore--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="90" x="823.5" y="1380.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="833.5" y="1402.8709">resultsStore</text><ellipse cx="868.3757" cy="1600.0401" fill="#F8F8F8" rx="71.3757" ry="16.6751" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="116" x="810.3757" y="1603.7823">scatteringQuantities</text><ellipse cx="516.8051" cy="1116.107" fill="#F8F8F8" rx="43.3051" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="488.3051" y="1119.8492">svgEllipse</text><!--MD5=[02b93abcf72e1c5ee49edbe2c6e06f3e]
+entity _svgMask--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="69" x="482.5" y="1190.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="492.5" y="1212.8709">svgMask</text><!--MD5=[0190f419ef54fc162964943b68b4f170]
+entity _types--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="51" x="1005" y="465.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="1015" y="487.8659">types</text><!--MD5=[37349b9385241d7e086cfee13ce1f69a]
+entity _unitRange--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="76" x="830.5" y="1636.865"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="56" x="840.5" y="1658.8709">unitRange</text><!--MD5=[2e43345867f0b2f1f095711d58ea3100]
+entity _units--><rect fill="#F8F8F8" height="34.4844" rx="3" ry="3" style="stroke: #000000; stroke-width: 0.5;" width="48" x="1006.5" y="942.86"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="28" x="1016.5" y="964.8659">units</text><ellipse cx="58.4619" cy="442.102" fill="#F8F8F8" rx="48.9619" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="65" x="25.9619" y="445.8442">vite-env.d</text><ellipse cx="58.4975" cy="396.102" fill="#F8F8F8" rx="52.4975" ry="13.242" style="stroke: #383838; stroke-width: 0.5;"/><text fill="#000000" font-family="Tahoma, sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="70" x="23.4975" y="399.8442">vite.config</text><!--MD5=[8d1b8dcf6968eb6c0f6a0eeba4da8d0b]
+link app to basicAppBar--><path d="M75.0473,528.36 C112.525,515.23 210.971,481.56 295,459.86 C353.956,444.64 422.834,431.31 467.826,423.19 " fill="none" id="app-&gt;basicAppBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="472.919,422.27,463.3534,419.925,467.9978,423.1544,464.7684,427.7988,472.919,422.27" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[27b8899d8d132aae21cf1d9ed0d6989c]
+link app to centrePlot--><path d="M64.8721,546.14 C100.6581,627.9 304.407,1093.415 346.781,1190.229 " fill="none" id="app-&gt;centrePlot" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="348.788,1194.814,348.8417,1184.9653,346.7823,1190.2339,341.5136,1188.1745,348.788,1194.814" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0810c7685c88ac48a48b75abc1428981]
+link app to dataSideBar--><path d="M76.6888,533.86 C93.7588,533.86 120.872,533.86 145.518,533.86 " fill="none" id="app-&gt;dataSideBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="150.736,533.86,141.736,529.86,145.736,533.86,141.736,537.86,150.736,533.86" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cb79cf68647b5cb239913d9bebb0cb07]
+link basicAppBar to _beamlineconfigStore--><path d="M529.579,427.5 C548.083,447.63 585.544,488.17 618,521.86 C633.735,538.2 651.823,556.4 665.46,570 " fill="none" id="basicAppBar-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="669.182,573.71,665.6298,564.5241,665.64,570.1809,659.9832,570.1912,669.182,573.71" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d5b5f7e7db4763188e527d021e1f4680]
+link basicAppBar to _beamstopStore--><path d="M542.884,426.29 C553.705,431.31 566.511,437.31 578,442.86 C595.896,451.51 600.105,454.21 618,462.86 C626.575,467.01 635.792,471.38 644.599,475.51 " fill="none" id="basicAppBar-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="649.442,477.77,642.9869,470.3315,644.9136,475.6501,639.595,477.5769,649.442,477.77" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[7921f7b70aeb436d8beccca1759cbdc1]
+link basicAppBar to _cameraTubeStore--><path d="M524.4,427.93 C549.768,479.72 643.441,670.96 675.588,736.59 " fill="none" id="basicAppBar-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="677.972,741.46,677.604,731.618,675.772,736.97,670.42,735.138,677.972,741.46" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a53683efcb8c10ceff36ad11e470ad38]
+link basicAppBar to _detectorStore--><path d="M527.542,402.07 C555.261,364.89 635.997,256.6 670.53,210.28 " fill="none" id="basicAppBar-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="673.724,206,665.1289,210.8088,670.7281,210.0031,671.5339,215.6023,673.724,206" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[25c3e4fbb57df2ce1c1a5f4bd384aebc]
+link basicAppBar to presetManager--><path d="M559.12,422.86 C623.486,435.39 747.847,459.58 817.365,473.11 " fill="none" id="basicAppBar-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="822.685,474.15,814.6141,468.5055,817.777,473.1955,813.0869,476.3583,822.685,474.15" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c88ccc7ce9192c94659d87e570087f24]
+link basicAppBar to _units--><path d="M554.261,405.6 C635.676,387.21 834.129,356.15 940,458.86 C1009.88,526.66 1025.77,849.03 1028.84,937.41 " fill="none" id="basicAppBar-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1029.02,942.65,1032.7093,933.5182,1028.8487,937.6529,1024.714,933.7923,1029.02,942.65" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2c5a3409c0970752d8e3e7b370d0f02e]
+link _beamlineconfigStore to presetManager--><path d="M732.504,573.74 C741.019,569.49 749.589,564.51 757,558.86 C778.814,542.23 774.803,527.98 797,511.86 C806.009,505.32 816.709,499.95 827.016,495.68 " fill="none" id="_beamlineconfigStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="831.717,493.8,821.8747,493.4417,827.0771,495.6631,824.8557,500.8656,831.717,493.8" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f023a1ddb850476760c038fde5bccad9]
+link _beamlineconfigStore to _types--><path d="M742.532,573.75 C815.269,550.71 942.174,510.52 999.672,492.31 " fill="none" id="_beamlineconfigStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1004.685,490.72,994.8966,489.6303,999.9193,492.2327,997.3169,497.2554,1004.685,490.72" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1103eaaeb21d2c0f08a9c1884c0c1344]
+link _beamlineconfigStore to _units--><path d="M714.263,607.93 C762.901,641.08 869.665,718.38 940,802.86 C976.014,846.12 1005.505,905.85 1019.93,937.73 " fill="none" id="_beamlineconfigStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1022.11,942.6,1022.0785,932.7512,1020.0647,938.0375,1014.7785,936.0236,1022.11,942.6" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cef44439f357db85a391aaa3af015476]
+link beamlineDialog to _beamlineconfigStore--><path d="M413.605,570.19 C468.779,574.37 552.617,580.72 612.801,585.28 " fill="none" id="beamlineDialog-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="617.82,585.66,609.1474,580.9925,612.8342,585.2829,608.5439,588.9697,617.82,585.66" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d91b0af663a27f32b1c71375c4404bdf]
+link beamlineDialog to BeamlineTable--><path d="M371.794,580.06 C401.314,607.45 466.03,667.5 497.747,696.93 " fill="none" id="beamlineDialog-&gt;BeamlineTable" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="501.447,700.36,497.581,691.3016,497.7858,696.9548,492.1326,697.1596,501.447,700.36" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[bf38fa111286f8b222b1383685e9e858]
+link beamlineDialog to presetManager--><path d="M415.569,563.62 C494.324,559.66 637.656,549.1 757,521.86 C783.553,515.81 812.553,505.42 834.18,496.89 " fill="none" id="beamlineDialog-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="838.956,494.98,829.1148,494.5929,834.3107,496.8296,832.074,502.0255,838.956,494.98" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a4f0e2c57f133afdf156fcebe888438b]
+link beamlineDialog to _types--><path d="M362.731,551.35 C379.419,513.2 425.893,411.63 456,391.86 C635.925,273.73 745.251,317.2 940,408.86 C967.304,421.72 993.276,444.84 1010.14,461.83 " fill="none" id="beamlineDialog-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1013.81,465.57,1010.3675,456.3424,1010.3104,461.9989,1004.6538,461.9418,1013.81,465.57" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[4fe4c9cbb468c411bc26630e866667b5]
+link beamlineDialog to _units--><path d="M362.368,580.63 C375.469,612.25 409.634,687.71 456,737.86 C500.687,786.21 531.8,774.97 578,821.86 C600.492,844.7 592.693,862.2 618,881.86 C735.747,973.363 928.919,968.321 1001.109,962.69 " fill="none" id="beamlineDialog-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1006.09,962.29,996.7961,959.0307,1001.1064,962.6942,997.4428,967.0045,1006.09,962.29" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2ea7845b182a81617fcad8462c7308ce]
+link BeamlineTable to _beamlineconfigStore--><path d="M550.194,702.23 C559.817,697.77 569.939,691.99 578,684.86 C602.566,663.14 593.291,644.42 618,622.86 C623.384,618.17 629.576,614.02 635.988,610.4 " fill="none" id="BeamlineTable-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="640.456,607.98,630.637,608.7461,636.0587,610.3599,634.4449,615.7817,640.456,607.98" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[926ecf4a29be9dfa448d41475ec1cf2f]
+link BeamlineTable to _types--><path d="M559.813,704.28 C638.292,685.11 811.333,637.24 940,560.86 C966.529,545.12 992.632,521.12 1009.74,503.9 " fill="none" id="BeamlineTable-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1013.46,500.12,1004.2965,503.7298,1009.9532,503.684,1009.999,509.3407,1013.46,500.12" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[754936b4b878625bd70453caf012e787]
+link BeamlineTable to _units--><path d="M535.802,727.25 C555.599,742 588.66,766.24 618,785.86 C695.808,837.91 711.142,859.56 797,896.86 C867.543,927.51 956.724,946.64 1001.356,954.98 " fill="none" id="BeamlineTable-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1006.31,955.9,998.1872,950.3304,1001.3933,954.991,996.7328,958.1971,1006.31,955.9" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5455ba9f5ce98eaaac06cd004c30d6d6]
+link beamProperties to _beamlineconfigStore--><path d="M558.024,882.06 C565.456,878.54 572.575,873.91 578,867.86 C620.064,820.96 595.267,790.62 618,731.86 C634.802,688.44 659.744,640.07 674.439,612.77 " fill="none" id="beamProperties-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="676.883,608.25,669.0911,614.2738,674.5102,612.6511,676.1329,618.0702,676.883,608.25" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1995ceb19db107ff992e398a9a5205f3]
+link beamProperties to _units--><path d="M524.497,907.35 C537.619,934.59 570.165,992.777 618,1015.865 C746.887,1078.072 802.76,1058.445 940,1017.865 C964.716,1010.556 989.016,994.046 1006.04,980.503 " fill="none" id="beamProperties-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1010.21,977.131,1000.6993,979.6896,1006.3254,980.279,1005.736,985.905,1010.21,977.131" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f166fb516c5b1f7a8577b7ea9202db6d]
+link beamstop to _beamstopStore--><path d="M527.788,289.53 C555.617,325.53 635.422,428.78 670.092,473.64 " fill="none" id="beamstop-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="673.303,477.79,670.9661,468.2224,670.2462,473.8333,664.6353,473.1133,673.303,477.79" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1891423738104a4572e5076a4b323a72]
+link beamstop to _detectorStore--><path d="M543.013,266.36 C553.973,261.47 566.851,255.3 578,248.86 C596.792,238.01 599.21,231.72 618,220.86 C625.672,216.43 634.06,212.11 642.254,208.15 " fill="none" id="beamstop-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="646.78,205.99,636.9347,206.2562,642.2675,208.1434,640.3802,213.4762,646.78,205.99" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[131b0465e9e2cc08fc8218ddaab1d7ea]
+link beamstop to _types--><path d="M548.435,267.67 C623.693,246.95 821.026,205.16 940,295.86 C994.51,337.42 1017.45,420.64 1025.62,460.54 " fill="none" id="beamstop-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1026.64,465.64,1028.7865,456.0279,1025.6539,460.7382,1020.9436,457.6056,1026.64,465.64" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[7ae26055c92be63b1f83a74f13ca6f65]
+link beamstop to _units--><path d="M555.435,283.42 C648.854,300.53 888.453,349.42 940,408.86 C975.479,449.78 1017.23,839.31 1027.26,937.49 " fill="none" id="beamstop-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.79,942.74,1030.872,933.3858,1027.2911,937.765,1022.9119,934.1841,1027.79,942.74" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[666a710d1e968a5be0766850d287cf3e]
+link _beamstopStore to presetManager--><path d="M742.206,491.26 C762.608,489.9 785.981,488.33 806.971,486.92 " fill="none" id="_beamstopStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="811.971,486.59,802.7236,483.201,806.9822,486.9245,803.2588,491.1831,811.971,486.59" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f8f5570b792fc7cbc7267c74c7ae2927]
+link _beamstopStore to _types--><path d="M729.452,477.83 C749.444,470.41 774.077,462.57 797,458.86 C859.742,448.73 876.989,450.56 940,458.86 C960.236,461.53 982.397,467.45 999.605,472.74 " fill="none" id="_beamstopStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1004.778,474.36,997.383,467.8551,1000.0061,472.867,994.9942,475.4901,1004.778,474.36" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cd0d6eeb45f632b570deb01bb673f8d4]
+link _beamstopStore to _units--><path d="M715.115,512.07 C765.678,546.02 876.253,626.48 940,719.86 C988.906,791.51 1015.25,893.32 1025.01,937.73 " fill="none" id="_beamstopStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1026.12,942.85,1028.1262,933.2076,1025.0626,937.9631,1020.3071,934.8995,1026.12,942.85" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cc2e012cd93548fb44f6c1d48ea73314]
+link cameraTube to _cameraTubeStore--><path d="M541.076,833.09 C568.652,819.01 615.2,795.26 648.199,778.41 " fill="none" id="cameraTube-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="652.965,775.98,643.1301,776.5051,648.5107,778.2514,646.7644,783.632,652.965,775.98" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b98a4da009f87a9fd615cc543b126100]
+link cameraTube to _units--><path d="M554.847,854.09 C563.281,857.6 571.628,862.39 578,868.86 C613.019,904.47 577.039,945.3 618,973.865 C738.24,1057.723 929.911,998.241 1001.405,971.26 " fill="none" id="cameraTube-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1006.34,969.376,996.5053,968.848,1001.6686,971.1588,999.3578,976.3222,1006.34,969.376" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a0f8c73950ed7aaed729061f5adc9c60]
+link _cameraTubeStore to presetManager--><path d="M699.697,741.6 C731.644,692.34 823.027,551.44 855.704,501.05 " fill="none" id="_cameraTubeStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="858.499,496.74,850.2512,502.1227,855.7825,500.9377,856.9675,506.4691,858.499,496.74" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[24e1f68fdaae5548182611ce749fc733]
+link _cameraTubeStore to _types--><path d="M708.554,741.58 C729.507,724.19 763.883,697.49 797,679.86 C856.7,648.09 887.555,670.56 940,627.86 C981.158,594.36 1008.58,536.6 1021.31,505.04 " fill="none" id="_cameraTubeStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1023.23,500.21,1016.1918,507.0994,1021.3854,504.8573,1023.6275,510.0508,1023.23,500.21" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2ff52b8f357b4ccc68ecb8b937a908a0]
+link _cameraTubeStore to _units--><path d="M738.154,775.93 C756.616,782.24 777.75,789.42 797,795.86 C860.439,817.11 885.461,804.12 940,842.86 C975.525,868.1 1003.41,911.58 1018.09,937.83 " fill="none" id="_cameraTubeStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1020.67,942.52,1019.8204,932.7079,1018.2527,938.1432,1012.8174,936.5755,1020.67,942.52" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[49e584d2392b49681bb6c973a83847d4]
+link centrePlot to _beamlineconfigStore--><path d="M357.342,1194.478 C362.194,1121.328 388.739,770.3 456,689.86 C493.274,645.29 524.842,666.33 578,642.86 C596.184,634.84 600.105,631.52 618,622.86 C626.575,618.72 635.792,614.35 644.599,610.22 " fill="none" id="centrePlot-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="649.442,607.96,639.595,608.1531,644.9136,610.0799,642.9869,615.3985,649.442,607.96" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[17e2f0fb9204db1e0088a5db68c6d712]
+link centrePlot to _beamstopStore--><path d="M357.458,1194.7 C363.133,1119.534 394.208,744.67 456,649.86 C499.709,582.8 583.643,537.54 637.263,514 " fill="none" id="centrePlot-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="642.033,511.93,632.1845,511.8486,637.4473,513.9228,635.373,519.1857,642.033,511.93" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[da964260897d31862023a421c2c3107a]
+link centrePlot to _cameraTubeStore--><path d="M358.188,1194.789 C364.028,1154.756 386.951,1032.484 456,964.865 C497.515,924.21 536.208,958.24 578,917.86 C610.655,886.32 592.103,861.16 618,823.86 C629.71,807 646.355,791.08 660.304,779.22 " fill="none" id="centrePlot-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="664.161,775.98,654.6956,778.7014,660.3309,779.1941,659.8382,784.8295,664.161,775.98" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[227c26e375aaba699cfa574f52e64c74]
+link centrePlot to _detectorStore--><path d="M357.754,1194.878 C368.712,1081.473 448.014,263.35 456,253.86 C478.664,226.95 572.103,207.22 632.833,196.93 " fill="none" id="centrePlot-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="637.875,196.08,628.3382,193.6203,632.9436,196.9052,629.6586,201.5106,637.875,196.08" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[74fdfa913bad1fff3c80abc7bfb9ddc1]
+link centrePlot to legendBar--><path d="M360.185,1220.964 C372.69,1265.171 415.013,1412.799 456,1532.865 C473.661,1584.599 497.187,1644.735 508.837,1674.011 " fill="none" id="centrePlot-&gt;legendBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="510.736,1678.775,511.1163,1668.9335,508.8832,1674.1309,503.6858,1671.8979,510.736,1678.775" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[774e2276e55e235112045360db7d3ce1]
+link centrePlot to _plotStore--><path d="M357.314,1221.029 C362.015,1292.954 387.891,1637.989 456,1714.865 C468.859,1729.379 582.69,1761.872 645.429,1778.931 " fill="none" id="centrePlot-&gt;_plotStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="650.596,1780.332,642.9566,1774.116,645.7703,1779.0234,640.8628,1781.8371,650.596,1780.332" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1a433a4545821ffa8217ccd8ba4a348c]
+link centrePlot to _Plotter--><path d="M357.434,1221.319 C362.872,1296.471 392.428,1664.164 456,1754.865 C462.843,1764.627 473.348,1772.069 483.667,1777.527 " fill="none" id="centrePlot-&gt;_Plotter" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="488.381,1779.896,482.1336,1772.2822,483.9129,1777.6519,478.5431,1779.4312,488.381,1779.896" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b4108886d4e8d8675452315385a60436]
+link centrePlot to _plotUtils--><path d="M371.282,1220.139 C390.381,1235.801 424.88,1263.429 456,1284.865 C591.04,1377.878 760.44,1475.556 832.485,1516.264 " fill="none" id="centrePlot-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="837.088,1518.862,831.2157,1510.9553,832.7335,1516.4047,827.2841,1517.9225,837.088,1518.862" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[423a0401b2042c3075ea042a9878ad62]
+link centrePlot to qrange--><path d="M362.781,1195.034 C375.955,1169.789 409.178,1114.268 456,1092.865 C505.314,1070.322 524.436,1084.439 578,1092.865 C607.084,1097.439 639.001,1108.515 660.64,1116.992 " fill="none" id="centrePlot-&gt;qrange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="665.368,1118.866,658.4756,1111.8308,660.7199,1117.0233,655.5273,1119.2677,665.368,1118.866" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d3c519e5934b16dad37e5c35731f1ac7]
+link centrePlot to qvalue--><path d="M385.787,1217.329 C405.44,1223.302 432.023,1230.66 456,1234.865 C525.499,1247.053 608.195,1251.461 653.223,1253.027 " fill="none" id="centrePlot-&gt;qvalue" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="658.258,1253.196,649.398,1248.8948,653.2608,1253.0274,649.1283,1256.8903,658.258,1253.196" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5fd5c8f6fa94b2c6867559c9cf8f5bff]
+link centrePlot to resultsBar--><path d="M363.354,1220.841 C388.763,1268.952 477.618,1437.192 506.705,1492.265 " fill="none" id="centrePlot-&gt;resultsBar" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="509.172,1496.936,508.5074,1487.1096,506.8376,1492.5144,501.4328,1490.8446,509.172,1496.936" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[756d14e4e3b21c420852f0cd1d65889d]
+link centrePlot to _resultsStore--><path d="M378.137,1219.121 C397.969,1229.081 428.362,1243.454 456,1252.865 C586.113,1297.168 630.99,1268.967 757,1323.865 C788.75,1337.697 821.23,1360.725 842.684,1377.424 " fill="none" id="centrePlot-&gt;_resultsStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="846.825,1380.675,842.2173,1371.9704,842.8927,1377.5868,837.2763,1378.2622,846.825,1380.675" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[05038317e69905c92926fb2f22ce0fa2]
+link centrePlot to scatteringQuantities--><path d="M356.676,1221.096 C358.029,1301.893 369.248,1728.258 456,1816.865 C550.053,1912.9288 653.783,1933.007 757,1846.865 C833.3,1783.187 733.553,1703.356 797,1626.865 C801.334,1621.639 806.801,1617.423 812.764,1614.022 " fill="none" id="centrePlot-&gt;scatteringQuantities" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="817.41,1611.576,807.5828,1612.228,812.9854,1613.9047,811.3087,1619.3074,817.41,1611.576" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[ec0ab718f7bd762d2aaf8ed7eabe2fb9]
+link centrePlot to svgEllipse--><path d="M373.677,1195.802 C393.172,1182.354 426.146,1160.333 456,1143.865 C465.774,1138.473 476.767,1133.142 486.647,1128.603 " fill="none" id="centrePlot-&gt;svgEllipse" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="491.397,1126.441,481.5485,1126.5259,486.8456,1128.511,484.8605,1133.8081,491.397,1126.441" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[8fba3ce27d31faa0a99917de795bf411]
+link centrePlot to _svgMask--><path d="M399.663,1207.865 C423.851,1207.865 453.771,1207.865 477.211,1207.865 " fill="none" id="centrePlot-&gt;_svgMask" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="482.413,1207.865,473.413,1203.865,477.413,1207.865,473.413,1211.865,482.413,1207.865" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b38abf43950d7be6cbacc3ae0bbd0c79]
+link centrePlot to _types--><path d="M364.347,1194.915 C380.046,1169.522 417.161,1111.994 456,1069.865 C504.294,1017.479 524.866,1013.334 578,965.865 C677.424,877.04 689.368,839.54 797,760.86 C855.792,717.89 890.753,734.51 940,680.86 C988.461,628.07 1014.28,544.6 1024.38,505.05 " fill="none" id="centrePlot-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1025.65,500,1019.5866,507.7611,1024.4373,504.8507,1027.3477,509.7014,1025.65,500" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[892b893cb945f9a4f2c539e38f2932c4]
+link centrePlot to _unitRange--><path d="M356.224,1221.045 C354.693,1308.567 350.755,1805.203 456,1899.8645 C555.484,1989.344 644.988,1979.0556 757,1905.8645 C837.612,1853.191 859.786,1727.225 865.571,1676.047 " fill="none" id="centrePlot-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="866.111,1671.045,861.1698,1679.5646,865.5753,1676.0162,869.1237,1680.4218,866.111,1671.045" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f105472cf4318479871ebfab9a3b6a2a]
+link centrePlot to _units--><path d="M385.785,1198.386 C405.437,1192.406 432.019,1185.047 456,1180.865 C668.598,1143.781 761.531,1263.199 940,1141.865 C995.457,1104.162 1017.93,1021.828 1025.81,982.136 " fill="none" id="centrePlot-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1026.78,977.056,1021.1581,985.1427,1025.8393,981.9667,1029.0152,986.6479,1026.78,977.056" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[39eb32801e3d5d27aac83d8e87323799]
+link colourPicker to _plotUtils--><path d="M698.093,1678.851 C715.709,1655.598 755.255,1606.319 797,1573.865 C807.085,1566.024 819.012,1558.916 830.159,1553.026 " fill="none" id="colourPicker-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="834.882,1550.578,825.0509,1551.1697,830.4432,1552.8795,828.7334,1558.2718,834.882,1550.578" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1a17118c4acc28502d65b21d31e03b90]
+link dataSideBar to _beamlineconfigStore--><path d="M255.012,533.92 C327.474,534.84 464.07,539.72 578,561.86 C592.874,564.76 608.717,568.56 623.569,572.47 " fill="none" id="dataSideBar-&gt;_beamlineconfigStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="628.565,573.79,620.8938,567.6132,623.7326,572.5061,618.8397,575.3449,628.565,573.79" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[4ea2db8ec269957f0383dfe908e961d1]
+link dataSideBar to beamlineDialog--><path d="M243.149,542.19 C261.937,546.18 284.66,551.01 304.667,555.27 " fill="none" id="dataSideBar-&gt;beamlineDialog" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="309.691,556.34,301.721,550.5538,304.8006,555.299,300.0554,558.3785,309.691,556.34" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[593a2f9d50681742633a4877e39128e4]
+link dataSideBar to beamProperties--><path d="M203.726,547.02 C203.504,593.79 209.302,753.55 295,835.86 C336.358,875.59 401.586,888.62 450.477,892.44 " fill="none" id="dataSideBar-&gt;beamProperties" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="455.755,892.82,447.0664,888.1822,450.768,892.4599,446.4903,896.1614,455.755,892.82" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[841643dca18cbc05eab8cebc34e0ad25]
+link dataSideBar to beamstop--><path d="M215.14,521.12 C248.44,483.66 351.412,372.29 456,304.86 C465.05,299.03 475.51,293.72 485.137,289.32 " fill="none" id="dataSideBar-&gt;beamstop" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="489.786,287.24,479.9372,287.2689,485.2229,289.2841,483.2077,294.5698,489.786,287.24" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c85f8075560e14db0462701e8121aacb]
+link dataSideBar to _beamstopStore--><path d="M220.721,521.55 C238.217,509.49 266.988,491.93 295,484.86 C410.153,455.83 550.42,471.07 627.926,483.69 " fill="none" id="dataSideBar-&gt;_beamstopStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="632.939,484.51,624.7089,479.1003,628.0055,483.6973,623.4085,486.9939,632.939,484.51" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0ed4eec2974998b2b49777ecb3d26043]
+link dataSideBar to cameraTube--><path d="M205.04,547 C208.93,587.18 226.161,709.67 295,774.86 C340.201,817.68 411.467,834.31 460.795,840.77 " fill="none" id="dataSideBar-&gt;cameraTube" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="465.798,841.4,457.3683,836.3068,460.8372,840.7753,456.3687,844.2441,465.798,841.4" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e096a37c1e8dcccfd139f8c80b842b28]
+link dataSideBar to _cameraTubeStore--><path d="M214.648,546.68 C246.593,584.09 346.217,693.29 456,737.86 C508.806,759.3 573.852,763.43 621.366,762.85 " fill="none" id="dataSideBar-&gt;_cameraTubeStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="626.489,762.77,617.4262,758.9145,621.4896,762.85,617.5541,766.9135,626.489,762.77" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2c520802993f4a3cc52bcfad8b6ffc66]
+link dataSideBar to detectorDialog--><path d="M203.592,520.73 C202.707,470.01 205.953,284.36 295,174.86 C300.224,168.44 307.22,163.34 314.577,159.32 " fill="none" id="dataSideBar-&gt;detectorDialog" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="319.192,156.95,309.3578,157.4876,314.7406,159.2271,313.0011,164.6098,319.192,156.95" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[de5213a13e684cdbe5b67250157e3f54]
+link dataSideBar to _detectorStore--><path d="M209.039,520.91 C229.838,469.52 314.637,279.66 456,213.86 C512.16,187.73 584.096,183.98 632.546,185.15 " fill="none" id="dataSideBar-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="637.747,185.3,628.8625,181.0497,632.749,185.1601,628.6386,189.0465,637.747,185.3" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0ccfb32cb233dd35566530626feb0a1e]
+link dataSideBar to _units--><path d="M203.671,546.94 C203.078,597.42 207.255,782.32 295,892.86 C395.475,1019.442 460.97,1021.672 618,1059.865 C678.028,1074.465 695.223,1060.202 757,1059.865 C838.337,1059.42 865.758,1091.092 940,1057.865 C975.242,1042.092 1002.695,1004.978 1017.46,981.22 " fill="none" id="dataSideBar-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1020.06,976.948,1011.9596,982.5501,1017.4571,981.2171,1018.7901,986.7146,1020.06,976.948" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1304498b7e36290b0ef7968c5014725f]
+link detectorDialog to _detectorStore--><path d="M407.7,152.54 C468.802,160.5 570.499,173.75 632.718,181.86 " fill="none" id="detectorDialog-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="637.87,182.53,629.4621,177.401,632.9119,181.8842,628.4287,185.334,637.87,182.53" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5d956cd3429e9aeaaddc26d227784ecf]
+link detectorDialog to detectorTable--><path d="M395.927,135.48 C419.439,129.29 449.297,121.43 473.356,115.09 " fill="none" id="detectorDialog-&gt;detectorTable" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="478.398,113.77,468.6757,112.1962,473.5632,115.0445,470.7149,119.932,478.398,113.77" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c56bd43eb580f38e664f438a9d1f36b0]
+link detectorDialog to presetManager--><path d="M362.31,160.16 C375.069,189.93 408.25,259.22 456,299.86 C567.232,394.55 623.789,371.92 757,431.86 C783.803,443.93 814.104,457.94 836.187,468.22 " fill="none" id="detectorDialog-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="840.771,470.35,834.3043,462.9215,836.2394,468.2371,830.9237,470.1722,840.771,470.35" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[37f2ca96678743cb428f74aecd6aa1f1]
+link detectorDialog to _types--><path d="M371.303,132.32 C389.619,116.53 422.507,91.29 456,80.86 C661.46,16.93 777.692,-48.41 940,92.86 C996.545,142.08 1021.36,385.5 1027.76,460.7 " fill="none" id="detectorDialog-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1028.19,465.81,1031.431,456.5097,1027.776,460.8272,1023.4585,457.1721,1028.19,465.81" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[20bfe200a114777378bd73a15049fea5]
+link _detectorStore to presetManager--><path d="M698.897,205.94 C730.259,257.45 823.754,411.01 856.234,464.36 " fill="none" id="_detectorStore-&gt;presetManager" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="859.004,468.91,857.7413,459.1424,856.4043,464.639,850.9077,463.302,859.004,468.91" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[47685ed1073a677d32df603d637da26a]
+link _detectorStore to _types--><path d="M737.275,178.83 C792.579,170.43 882.504,166.17 940,211.86 C1018.57,274.3 1028.84,407.58 1029.7,460.52 " fill="none" id="_detectorStore-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1029.76,465.68,1033.6569,456.6349,1029.7029,460.6803,1025.6574,456.7263,1029.76,465.68" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[759abe2480fa291aedf7b67b32a4022b]
+link _detectorStore to _units--><path d="M737.056,203.29 C795.469,223.35 891.688,265.62 940,337.86 C974.181,388.98 1017.57,832.44 1027.44,937.58 " fill="none" id="_detectorStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.91,942.61,1031.045,933.2734,1027.4393,937.6322,1023.0805,934.0265,1027.91,942.61" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[5b2d0942037cb08013c24b055e3ca1f5]
+link detectorTable to _detectorStore--><path d="M543.951,115.78 C554.61,120.84 567.007,126.93 578,132.86 C596.241,142.72 599.695,147.13 618,156.86 C626.116,161.18 634.918,165.53 643.423,169.57 " fill="none" id="detectorTable-&gt;_detectorStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="648.111,171.78,641.6823,164.3187,643.5902,169.6441,638.2648,171.552,648.111,171.78" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[9ab77d2b3e6b24773d077a36433313b6]
+link detectorTable to _types--><path d="M570.206,99.05 C670.472,90.95 884.951,79.64 940,124.86 C992.948,168.37 1019.9,389.16 1027.33,460.56 " fill="none" id="detectorTable-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.87,465.83,1030.9493,456.4749,1027.3697,460.8551,1022.9894,457.2755,1027.87,465.83" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[1000145f932b2da05f3f84f972340a4c]
+link detectorTable to _units--><path d="M573.011,106.18 C667.315,113.5 857.627,143.61 940,266.86 C959.202,295.59 1015.14,822.31 1027.19,937.66 " fill="none" id="detectorTable-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.73,942.84,1030.756,933.4675,1027.2014,937.868,1022.8009,934.3133,1027.73,942.84" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[08824a3ba6720dad2419584cda81b6e8]
+link legendBar to colourPicker--><path d="M560.52,1691.865 C581.367,1691.865 606.774,1691.865 629.296,1691.865 " fill="none" id="legendBar-&gt;colourPicker" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="634.354,1691.865,625.354,1687.865,629.354,1691.865,625.354,1695.865,634.354,1691.865" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[859e2ca28cb76f44f0370c60baffe4d6]
+link legendBar to _plotStore--><path d="M542.647,1702.477 C553.901,1707.845 567.114,1714.908 578,1722.865 C598.298,1737.7 596.976,1749.077 618,1762.865 C626.635,1768.527 636.641,1773.305 646.293,1777.192 " fill="none" id="legendBar-&gt;_plotStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="650.996,1779.028,644.0675,1772.0283,646.3385,1777.2093,641.1575,1779.4803,650.996,1779.028" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[a7ba3c821d48259f80a967b14cc45774]
+link <b>main</b> to app--><path d="M58.5,500.89 C58.5,505.71 58.5,510.53 58.5,515.34 " fill="none" id="&lt;b&gt;main&lt;/b&gt;-&gt;app" style="stroke: #000000; stroke-width: 1.0;"/><polygon fill="#000000" points="58.5,520.57,62.5,511.57,58.5,515.57,54.5,511.57,58.5,520.57" style="stroke: #000000; stroke-width: 1.0;"/><!--MD5=[82c1f8e9a20de97d7eabc92ecd792005]
+link _Plotter to _plotStore--><path d="M545.824,1789.865 C572.952,1789.865 614.523,1789.865 645.449,1789.865 " fill="none" id="_Plotter-&gt;_plotStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="650.704,1789.865,641.704,1785.865,645.704,1789.865,641.704,1793.865,650.704,1789.865" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[49d95620f04899f6aa063a5444cfa81d]
+link _Plotter to _plotUtils--><path d="M545.791,1804.75 C594.699,1828.674 696.674,1868.0723 757,1816.865 C840.444,1746.033 733.423,1662.96 797,1573.865 C805.2,1562.373 817.985,1554.02 830.429,1548.122 " fill="none" id="_Plotter-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="834.988,1546.06,825.1393,1546.1234,830.4321,1548.1201,828.4355,1553.4128,834.988,1546.06" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f66ddaf772cc78b11c3af50aec607105]
+link _plotUtils to _numericRange--><path d="M902.264,1526.035 C923.091,1519.787 950.572,1511.543 974.663,1504.316 " fill="none" id="_plotUtils-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="979.749,1502.79,969.9794,1501.5432,974.9596,1504.226,972.2769,1509.2062,979.749,1502.79" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[7c97b5a79daef19f1851810c5c9628a2]
+link presetManager to _types--><path d="M927.264,482.86 C951.854,482.86 979.49,482.86 999.823,482.86 " fill="none" id="presetManager-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1004.829,482.86,995.829,478.86,999.829,482.86,995.829,486.86,1004.829,482.86" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[8868ea973ee9ff71efe777e6835e995b]
+link presetManager to _units--><path d="M887.741,496.26 C903.98,509.19 927.105,530.23 940,553.86 C1012.46,686.68 1026.26,874.18 1028.89,937.78 " fill="none" id="presetManager-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1029.08,942.85,1032.7171,933.6973,1028.8802,937.854,1024.7235,934.0171,1029.08,942.85" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[0596d30483a882cc19ac5c32929d0c5a]
+link qrange to _numericRange--><path d="M711.952,1135.752 C760.792,1153.283 874.318,1199.949 940,1274.865 C990.844,1332.856 1015.8,1423.893 1025.08,1465.621 " fill="none" id="qrange-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1026.18,1470.698,1028.1754,1461.0534,1025.1171,1465.8123,1020.3583,1462.754,1026.18,1470.698" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[157ef11e6a0ba65ccbc9363f896c36c5]
+link qrange to _qspace--><path d="M697.134,1115.421 C725.595,1074.399 816.689,943.1 852.674,891.23 " fill="none" id="qrange-&gt;_qspace" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="855.575,887.05,847.1526,892.1553,852.7203,891.155,853.7206,896.7227,855.575,887.05" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c36a8607e6475574cee7fb0a79f5dc5f]
+link qrange to _ray--><path d="M700.803,1139.824 C730.83,1169.012 808.164,1244.186 846.003,1280.968 " fill="none" id="qrange-&gt;_ray" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="849.978,1284.832,846.3147,1275.6898,846.3935,1281.3461,840.7372,1281.425,849.978,1284.832" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[781606cfc6e5fc380a20c156d0bd8efa]
+link qrange to _types--><path d="M691.164,1114.937 C700.298,1072.777 733.358,936.6 797,842.86 C845.416,771.56 891.27,782.96 940,711.86 C986.728,643.69 1013.97,547.64 1024.47,504.88 " fill="none" id="qrange-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1025.67,499.94,1019.6497,507.7346,1024.4842,504.7974,1027.4215,509.6319,1025.67,499.94" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[231dda5496ba5b5bbe52e27e446d2080]
+link qrange to _units--><path d="M716.29,1132.396 C765.478,1138.91 869.334,1145.747 940,1101.865 C984.883,1073.993 1011.08,1014.378 1022.55,981.961 " fill="none" id="qrange-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1024.27,977,1017.5495,984.1996,1022.6367,981.7257,1025.1106,986.8129,1024.27,977" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[62e662b571a1e13086db8d9d47736400]
+link _qspace to _types--><path d="M881.538,852.86 C896.722,830.84 922.91,790.88 940,753.86 C981.081,664.89 1012.11,551.63 1024.09,504.72 " fill="none" id="_qspace-&gt;_types" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1025.33,499.87,1019.2397,507.6101,1024.1005,504.7165,1026.9941,509.5773,1025.33,499.87" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[2b7bdd1805499b0002c364951c568ca3]
+link qvalue to _plotUtils--><path d="M702.522,1265.191 C717.683,1278.056 741.723,1300.333 757,1323.865 C783.29,1364.36 775.071,1381.851 797,1424.865 C813.623,1457.47 837.073,1492.768 852.281,1514.6 " fill="none" id="qvalue-&gt;_plotUtils" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="855.209,1518.782,853.3245,1509.1151,852.3416,1514.6859,846.7708,1513.703,855.209,1518.782" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[cc578e726c93036f57cbbbd44df52c7a]
+link qvalue to _ray--><path d="M713.014,1260.438 C747.733,1269.748 810.759,1286.649 844.584,1295.719 " fill="none" id="qvalue-&gt;_ray" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="849.753,1297.106,842.0968,1290.9107,844.9238,1295.8105,840.0239,1298.6375,849.753,1297.106" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[27b56c5062506f870d0f0e6faad1c02f]
+link qvalue to _units--><path d="M716.845,1254.059 C767.844,1252.887 875.729,1243.254 940,1185.865 C1001.707,1130.765 1021.39,1027.531 1027.23,982.188 " fill="none" id="qvalue-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.87,976.953,1022.8013,985.3974,1027.2597,981.9156,1030.7415,986.374,1027.87,976.953" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e3d73fafa21a9812183994b7122589ba]
+link rangeDiagram to _unitRange--><path d="M723.437,1727.886 C734.338,1724.127 746.303,1719.651 757,1714.865 C784.077,1702.75 813.416,1686.39 835.054,1673.663 " fill="none" id="rangeDiagram-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="839.55,1671.005,829.7669,1672.1413,835.2457,1673.5493,833.8377,1679.0281,839.55,1671.005" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e5ff59a501fdb35405cbd1ecb801cb13]
+link rangeTable to _resultsStore--><path d="M703.257,1497.418 C723.514,1480.707 761.476,1450.713 797,1429.865 C804.727,1425.33 813.21,1420.987 821.531,1417.044 " fill="none" id="rangeTable-&gt;_resultsStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="826.131,1414.895,816.2838,1415.0756,821.5999,1417.0091,819.6664,1422.3253,826.131,1414.895" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[d799cd6b21528669722a26ecffb8ffa9]
+link rangeTable to scatteringQuantities--><path d="M721.025,1519.115 C732.683,1522.983 745.724,1527.963 757,1533.865 C776.455,1544.046 778.341,1551.288 797,1562.865 C808.199,1569.813 820.835,1576.718 832.284,1582.648 " fill="none" id="rangeTable-&gt;scatteringQuantities" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="836.775,1584.955,830.5989,1577.2832,832.328,1582.6694,826.9419,1584.3984,836.775,1584.955" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[da8458e95ab223cabcc393d0ddb71351]
+link rangeTable to _unitRange--><path d="M727.094,1517.292 C737.78,1520.864 748.708,1526.127 757,1533.865 C789.897,1564.561 764.547,1595.699 797,1626.865 C804.952,1634.501 815.29,1640.034 825.587,1644.022 " fill="none" id="rangeTable-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="830.306,1645.747,823.2272,1638.8993,825.6101,1644.0298,820.4797,1646.4127,830.306,1645.747" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[bf1fd359bb09bada2fc721f388a83091]
+link rangeTable to _units--><path d="M734.631,1507.753 C791.707,1502.535 887.725,1484.767 940,1424.865 C999.108,1357.132 1022.54,1065.764 1028.12,982.291 " fill="none" id="rangeTable-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1028.46,977.098,1023.8768,985.8155,1028.1312,982.0872,1031.8595,986.3416,1028.46,977.098" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[738392c8b93e1f7abe76e3831bf71f28]
+link _ray to _numericRange--><path d="M887.289,1317.936 C901.978,1331.517 923.086,1351.757 940,1370.865 C968.086,1402.593 997.307,1442.261 1014.43,1466.301 " fill="none" id="_ray-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1017.48,1470.602,1015.5416,1460.9458,1014.5898,1466.522,1009.0136,1465.5702,1017.48,1470.602" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[b6bb703ad39547b021a8c4ecd01eb7ab]
+link resultsBar to MessageDiagram--><path d="M548.905,1518.852 C574.592,1526.322 611.517,1537.059 640.649,1545.531 " fill="none" id="resultsBar-&gt;MessageDiagram" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="645.623,1546.978,638.0973,1540.6248,640.8217,1545.5823,635.8642,1548.3068,645.623,1546.978" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[6a36f5b4999f4480cfc82ddf050159b2]
+link resultsBar to _numericRange--><path d="M549.211,1500.77 C568.778,1495.549 594.635,1489.517 618,1486.865 C745.112,1472.435 895.737,1478.681 974.787,1483.739 " fill="none" id="resultsBar-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="979.89,1484.07,971.1683,1479.4948,974.9005,1483.7457,970.6495,1487.4779,979.89,1484.07" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[e685bebbe24c6d328514b7c19be7463a]
+link resultsBar to rangeDiagram--><path d="M520.738,1523.009 C528.906,1559.004 556.457,1660.123 618,1714.865 C624.082,1720.274 631.456,1724.482 639.082,1727.75 " fill="none" id="resultsBar-&gt;rangeDiagram" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="643.854,1729.665,636.9923,1722.5998,639.214,1727.8021,634.0117,1730.0239,643.854,1729.665" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[81dde4b43ce4c99d877ce2d82a86b82e]
+link resultsBar to rangeTable--><path d="M561.393,1509.865 C583.694,1509.865 611.034,1509.865 634.462,1509.865 " fill="none" id="resultsBar-&gt;rangeTable" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="639.707,1509.865,630.707,1505.865,634.707,1509.865,630.707,1513.865,639.707,1509.865" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[993f8bb94a42bb540980ca6aef589b54]
+link resultsBar to _resultsStore--><path d="M534.097,1497.863 C553.157,1484.225 586.324,1462.258 618,1449.865 C684.727,1423.757 766.871,1409.872 818.228,1403.192 " fill="none" id="resultsBar-&gt;_resultsStore" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="823.408,1402.53,813.9733,1399.7039,818.4484,1403.1642,814.9881,1407.6393,823.408,1402.53" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[f512c4e3e8f7ee8d0ef86666be1ccb3a]
+link resultsBar to scatteringQuantities--><path d="M529.801,1522.506 C547.172,1540.145 581.533,1571.48 618,1584.865 C675.599,1606.006 745.684,1608.37 796.891,1606.249 " fill="none" id="resultsBar-&gt;scatteringQuantities" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="802.099,1606.015,792.9286,1602.4228,797.104,1606.2393,793.2875,1610.4147,802.099,1606.015" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[4548d82b079e5330e8b9bef202663786]
+link resultsBar to _unitRange--><path d="M526.466,1522.568 C541.847,1544.53 576.645,1589.307 618,1610.865 C684.51,1645.534 773.208,1653.09 824.964,1654.274 " fill="none" id="resultsBar-&gt;_unitRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="830.163,1654.375,821.2424,1650.2009,825.1639,1654.2779,821.087,1658.1994,830.163,1654.375" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[c66619fc71b08ccb6dfb96dbbab0fb64]
+link resultsBar to _units--><path d="M527.889,1496.99 C544.335,1476.481 579.345,1436.506 618,1414.865 C634.156,1405.819 927.059,1342.107 940,1328.865 C989.281,1278.435 1018.7,1054.611 1027.04,982.403 " fill="none" id="resultsBar-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.64,977.074,1022.6457,985.5626,1027.0733,982.0418,1030.5941,986.4694,1027.64,977.074" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[95ec0a6772fe0d0910ec9af1a6eb4857]
+link _resultsStore to _units--><path d="M913.685,1385.308 C923.573,1380.635 933.147,1374.325 940,1365.865 C989.026,1305.342 1019,1058.31 1027.2,982.256 " fill="none" id="_resultsStore-&gt;_units" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1027.75,977.081,1022.816,985.6049,1027.2185,982.0527,1030.7707,986.4552,1027.75,977.081" style="stroke: #000000; stroke-width: 0.5;"/><!--MD5=[51d0e88da8530ca185511c1bba80cc5c]
+link _unitRange to _numericRange--><path d="M906.613,1644.575 C918.136,1640.458 930.336,1634.715 940,1626.865 C979.754,1594.569 1007.57,1539.755 1020.78,1509.511 " fill="none" id="_unitRange-&gt;_numericRange" style="stroke: #000000; stroke-width: 0.5;"/><polygon fill="#000000" points="1022.78,1504.875,1015.5546,1511.5678,1020.808,1509.4697,1022.9061,1514.723,1022.78,1504.875" style="stroke: #000000; stroke-width: 0.5;"/><script type="text/plantuml"><![CDATA[MD5=[c0e3845da454463b59c363cf7cb183cc]
 @startuml
 
 scale max 1920 width
@@ -175,6 +184,7 @@ rectangle "ray" as _ray
 rectangle "resultsStore" as _resultsStore
 (scatteringQuantities)
 (svgEllipse)
+rectangle "svgMask" as _svgMask
 rectangle "types" as _types
 rectangle "unitRange" as _unitRange
 rectangle "units" as _units
@@ -198,8 +208,10 @@ _beamlineconfigStore --> _units
 (beamlineDialog) --> (BeamlineTable)
 (beamlineDialog) --> (presetManager)
 (beamlineDialog) --> _types
+(beamlineDialog) --> _units
 (BeamlineTable) --> _beamlineconfigStore
 (BeamlineTable) --> _types
+(BeamlineTable) --> _units
 (beamProperties) --> _beamlineconfigStore
 (beamProperties) --> _units
 (beamstop) --> _beamstopStore
@@ -228,8 +240,10 @@ _cameraTubeStore --> _units
 (centrePlot) --> _resultsStore
 (centrePlot) --> (scatteringQuantities)
 (centrePlot) --> (svgEllipse)
+(centrePlot) --> _svgMask
 (centrePlot) --> _types
 (centrePlot) --> _unitRange
+(centrePlot) --> _units
 (colourPicker) --> _plotUtils
 (dataSideBar) --> _beamlineconfigStore
 (dataSideBar) --> (beamlineDialog)
@@ -250,6 +264,7 @@ _detectorStore --> _types
 _detectorStore --> _units
 (detectorTable) --> _detectorStore
 (detectorTable) --> _types
+(detectorTable) --> _units
 (legendBar) --> (colourPicker)
 (legendBar) --> _plotStore
 (<b>main</b>) -[thickness=1]> (app)
@@ -257,13 +272,16 @@ _Plotter --> _plotStore
 _Plotter --> _plotUtils
 _plotUtils --> _numericRange
 (presetManager) --> _types
+(presetManager) --> _units
 (qrange) --> _numericRange
 (qrange) --> _qspace
 (qrange) --> _ray
 (qrange) --> _types
+(qrange) --> _units
 _qspace --> _types
 (qvalue) --> _plotUtils
 (qvalue) --> _ray
+(qvalue) --> _units
 (rangeDiagram) --> _unitRange
 (rangeTable) --> _resultsStore
 (rangeTable) --> (scatteringQuantities)
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 91b32d4..eb17982 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -3,7 +3,7 @@ kind: Component
 metadata:
   name: dedi-web
   title: Dedi-Web
-  description: A client only Q-Range calculator 
+  description: A client only Q-Range calculator
   annotations:
     backstage.io/techdocs-ref: dir:.
     github.com/project-slug: DiamondLightSource/dedi-web
@@ -13,4 +13,4 @@ metadata:
 spec:
   type: Application
   lifecycle: production
-  owner: group:data-analysis
\ No newline at end of file
+  owner: group:data-analysis
diff --git a/package-lock.json b/package-lock.json
index 43b2eff..c993e95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@emotion/react": "^11.11.3",
         "@emotion/styled": "^11.11.0",
-        "@h5web/lib": "^11.2.0",
+        "@h5web/lib": "^12.0.1",
         "@mui/icons-material": "^5.15.3",
         "@mui/material": "^5.14.17",
         "@mui/system": "^5.15.9",
@@ -33,9 +33,12 @@
         "@vitejs/plugin-react-swc": "^3.4.1",
         "arkit": "^1.6.4",
         "eslint": "^8.53.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react": "^7.33.1",
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.3",
+        "prettier": "^3.3.3",
         "typescript": "^5.4.5",
         "vite": "^5.2.13",
         "vitest": "^1.5.1"
@@ -800,6 +803,20 @@
         "@floating-ui/utils": "^0.2.0"
       }
     },
+    "node_modules/@floating-ui/react": {
+      "version": "0.26.14",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.14.tgz",
+      "integrity": "sha512-I2EhfezC+H0WfkMEkCcF9+++PU1Wq08bDKhHHGIoBZVCciiftEQHgrSI4dTUTsa7446SiIVW0gWATliIlVNgfg==",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.0.0",
+        "@floating-ui/utils": "^0.2.0",
+        "tabbable": "^6.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
     "node_modules/@floating-ui/react-dom": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz",
@@ -818,10 +835,11 @@
       "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q=="
     },
     "node_modules/@h5web/lib": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@h5web/lib/-/lib-11.2.0.tgz",
-      "integrity": "sha512-itB2zy/cv+tn55ydUk4zqc5/2aVL8984v98rClxrwxj10JIRlLKFz+g0RSDyAqhWUOjONcAG7Ud1kX9byX0WsQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/@h5web/lib/-/lib-12.0.1.tgz",
+      "integrity": "sha512-HuJJjsgxkWn6rPAX0W4tMJSMNh6xYLHw9YZqraAo2t8Gk5Xcddh0Pnd1ilJNss3LHu+vz2ASich5NUHxV01MOA==",
       "dependencies": {
+        "@floating-ui/react": "0.26.14",
         "@react-hookz/web": "24.0.4",
         "@visx/axis": "3.10.1",
         "@visx/drag": "3.3.0",
@@ -837,8 +855,7 @@
         "d3-scale-chromatic": "3.1.0",
         "ndarray": "1.0.19",
         "ndarray-ops": "1.2.2",
-        "react-aria-menubutton": "7.0.3",
-        "react-icons": "5.0.1",
+        "react-icons": "5.2.1",
         "react-keyed-flatten-children": "3.0.0",
         "react-measure": "2.5.2",
         "react-slider": "2.0.4",
@@ -1259,6 +1276,18 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -4008,6 +4037,48 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-config-prettier": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
+      "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0",
+        "synckit": "^0.9.1"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-prettier"
+      },
+      "peerDependencies": {
+        "@types/eslint": ">=8.0.0",
+        "eslint": ">=8.0.0",
+        "eslint-config-prettier": "*",
+        "prettier": ">=3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/eslint": {
+          "optional": true
+        },
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-plugin-react": {
       "version": "7.34.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz",
@@ -4281,6 +4352,12 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
+    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -4422,11 +4499,6 @@
       "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
       "dev": true
     },
-    "node_modules/focus-group": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/focus-group/-/focus-group-0.3.1.tgz",
-      "integrity": "sha512-IA01dzk2cStQso/qnt2rWhXCFBZlBfjZmohB9mXUx9feEaJcORAK0FQGvwaApsNNGwzEnqrp/2qTR4lq8PXfnQ=="
-    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
@@ -6627,6 +6699,33 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -6733,19 +6832,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-aria-menubutton": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/react-aria-menubutton/-/react-aria-menubutton-7.0.3.tgz",
-      "integrity": "sha512-Ql4W3rNiZmuVJ1wQ0UUeV4OZX3IZq2evsfEqJGefSMdfkK6o8X/6Ufxrzu0wL+/Dr7JUY3xnrnIQimSCFghlCQ==",
-      "dependencies": {
-        "focus-group": "^0.3.1",
-        "prop-types": "^15.6.0",
-        "teeny-tap": "^0.2.0"
-      },
-      "peerDependencies": {
-        "react": "^16.3.0 || ^17.0.0"
-      }
-    },
     "node_modules/react-color": {
       "version": "2.19.3",
       "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.19.3.tgz",
@@ -6791,9 +6877,9 @@
       }
     },
     "node_modules/react-icons": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.0.1.tgz",
-      "integrity": "sha512-WqLZJ4bLzlhmsvme6iFdgO8gfZP17rfjYEJ2m9RsZjZ+cc4k1hTzknEz63YS1MeT50kVzoa1Nz36f4BEx+Wigw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.2.1.tgz",
+      "integrity": "sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==",
       "peerDependencies": {
         "react": "*"
       }
@@ -7789,10 +7875,26 @@
         "react": ">=17.0"
       }
     },
-    "node_modules/teeny-tap": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/teeny-tap/-/teeny-tap-0.2.0.tgz",
-      "integrity": "sha512-HnA3I2sxRQe/SZgQTQgQvvA17DhfzhBJ1LfSOXZ5VUTbxGLvnAqUef84ZGNNSEbk1ZMEIDeghTHZagJ7LifAgg=="
+    "node_modules/synckit": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
+      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
+      "dev": true,
+      "dependencies": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
+    "node_modules/tabbable": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
     },
     "node_modules/text-table": {
       "version": "0.2.0",
@@ -7942,6 +8044,12 @@
         "strip-bom": "^3.0.0"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+      "dev": true
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -8060,7 +8168,7 @@
       "version": "5.4.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
       "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
-      "devOptional": true,
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/package.json b/package.json
index 0b6944d..e21c799 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
+    "format": "eslint --fix .",
     "dev": "vite --port 3000",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
@@ -16,7 +17,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@h5web/lib": "^11.2.0",
+    "@h5web/lib": "^12.0.1",
     "@mui/icons-material": "^5.15.3",
     "@mui/material": "^5.14.17",
     "@mui/system": "^5.15.9",
@@ -39,9 +40,12 @@
     "@vitejs/plugin-react-swc": "^3.4.1",
     "arkit": "^1.6.4",
     "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.3",
+    "prettier": "^3.3.3",
     "typescript": "^5.4.5",
     "vite": "^5.2.13",
     "vitest": "^1.5.1"
diff --git a/src/app.tsx b/src/app.tsx
index 6398410..76fa1ae 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,26 +1,39 @@
-import { Stack} from "@mui/material";
+import { Stack, ThemeProvider, createTheme } from "@mui/material";
 import DataSideBar from "./data-entry/dataSideBar";
 import CentrePlot from "./plot/centrePlot";
 import BasicAppBar from "./basicAppBar";
-import CssBaseline from '@mui/material/CssBaseline';
+import CssBaseline from "@mui/material/CssBaseline";
 
+const theme = createTheme({
+  breakpoints: {
+    values: {
+      xs: 0,
+      sm: 600,
+      md: 900,
+      lg: 1500,
+      xl: 1536,
+    },
+  },
+});
 
 export default function App(): JSX.Element {
   return (
     <>
-    <CssBaseline>
-      <Stack spacing={1}>
-      <BasicAppBar />
-      <Stack 
-          direction={{md: "column", lg:"row"}}
-          spacing={1}
-          justifyContent={"center"}
-        >
-        <DataSideBar/>
-        <CentrePlot />
-      </Stack>
-      </Stack>
-    </CssBaseline>
+      <CssBaseline>
+        <ThemeProvider theme={theme}>
+          <Stack spacing={1}>
+            <BasicAppBar />
+            <Stack
+              direction={{ md: "column", lg: "row" }}
+              spacing={1}
+              justifyContent={"center"}
+            >
+              <DataSideBar />
+              <CentrePlot />
+            </Stack>
+          </Stack>
+        </ThemeProvider>
+      </CssBaseline>
     </>
   );
 }
diff --git a/src/basicAppBar.tsx b/src/basicAppBar.tsx
index 6c6d277..03c78fa 100644
--- a/src/basicAppBar.tsx
+++ b/src/basicAppBar.tsx
@@ -38,9 +38,9 @@ export default function BasicAppBar(): JSX.Element {
   };
 
   return (
-    <AppBar  style={{position:"static", width: "100%"}}>
+    <AppBar style={{ position: "static", width: "100%" }}>
       <Toolbar>
-        <Typography variant="h6" component="div" sx={{ flexGrow: 1}}>
+        <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
           Dedi Web
         </Typography>
         <Autocomplete
diff --git a/src/calculations/numericRange.ts b/src/calculations/numericRange.ts
index 1c570ea..f16ee1a 100644
--- a/src/calculations/numericRange.ts
+++ b/src/calculations/numericRange.ts
@@ -1,6 +1,5 @@
 /**
- * A class which represents a unitless numeric range
- * by storing it's minimum and maximum numbers
+ * A class which represents a unitless numeric range.
  */
 export default class NumericRange {
   min: number;
@@ -19,8 +18,7 @@ export default class NumericRange {
   }
 
   /**
-   * Checks if the input is contained in this range.
-   *
+   * Checks if an input number is contained in this range.
    * @param value - Input number
    * @returns
    */
@@ -38,9 +36,9 @@ export default class NumericRange {
   }
 
   /**
-   * Finds the intersection of this range and the input range.
+   * Finds the intersection of this range and the input range. Or returns null
    * @param input input NumericRange
-   * @returns The intersection NumericRange or null
+   * @returns
    */
   intersect(input: NumericRange | null): NumericRange | null {
     if (input === null) {
diff --git a/src/calculations/qrange.ts b/src/calculations/qrange.ts
index f5a6542..dd64967 100644
--- a/src/calculations/qrange.ts
+++ b/src/calculations/qrange.ts
@@ -9,6 +9,7 @@ import {
   AppDetector,
 } from "../utils/types";
 import NumericRange from "./numericRange";
+import { formatLogMessage } from "../utils/units";
 
 /**
  * Is returned from computeQrange if the full
@@ -61,6 +62,11 @@ export function computeQrange(
   );
 
   if (typeof initialPositionX === "number" || !("units" in initialPositionX)) {
+    console.error(
+      formatLogMessage(
+        "Units are wrong for either beamcentre x or clearance width",
+      ),
+    );
     return defaultReturn;
   }
 
@@ -68,7 +74,13 @@ export function computeQrange(
     mathjs.multiply(clearanceHeight, mathjs.sin(beamProperties.angle)),
     beamcentreY,
   );
+
   if (typeof initialPositionY === "number" || !("units" in initialPositionY)) {
+    console.error(
+      formatLogMessage(
+        "Units are wrong for either beamcentre y or clearance width",
+      ),
+    );
     return defaultReturn;
   }
 
@@ -90,7 +102,10 @@ export function computeQrange(
     detectorHeight.toSI().toNumber(),
   );
 
-  if (t1 === null) return defaultReturn;
+  if (t1 === null) {
+    console.warn(formatLogMessage("Ray does not intersect with detector"));
+    return defaultReturn;
+  }
 
   const cameraOk =
     cameraTube !== null && cameraTube.diameter.toSI().toNumber() != 0;
@@ -104,7 +119,10 @@ export function computeQrange(
     t1 = t1.intersect(ray.getCircleIntersectionParameterRange(radius, centre));
   }
 
-  if (t1 === null) return defaultReturn;
+  if (t1 === null) {
+    console.warn(formatLogMessage("Ray does not intersect with camera tube"));
+    return defaultReturn;
+  }
 
   // set up the min, max and qspace values
   const ptMin = ray.getPoint(t1.min);
@@ -149,7 +167,12 @@ export function computeQrange(
     visibleQMax.length(),
   );
   const fullQRange = new NumericRange(fullQMin.length(), fullQMax.length());
-
+  console.info(
+    formatLogMessage(` The visible q range is: ${visibleQRange.toString()}`),
+  );
+  console.info(
+    formatLogMessage(` The full q range is: ${fullQRange.toString()}`),
+  );
   return { ptMin, ptMax, visibleQRange, fullQRange };
 }
 
diff --git a/src/calculations/qvalue.ts b/src/calculations/qvalue.ts
index 7e3859d..30ddf31 100644
--- a/src/calculations/qvalue.ts
+++ b/src/calculations/qvalue.ts
@@ -2,6 +2,7 @@ import { unit } from "mathjs";
 import { Vector2 } from "three";
 import { UnitVector } from "../plot/plotUtils";
 import { Ray } from "./ray";
+import { LengthUnits } from "../utils/units";
 
 // Add doc strings here
 
@@ -69,7 +70,7 @@ export const getPointForQ = (
   const distance = calculateDistanceFromQValue(q, c, v) ?? 0;
 
   const result = ray.getPointAtDistance(distance);
-  const x = unit(result.x, "m");
-  const y = unit(result.y, "m");
+  const x = unit(result.x, LengthUnits.metre);
+  const y = unit(result.y, LengthUnits.metre);
   return { x, y };
 };
diff --git a/src/data-entry/beamProperties.tsx b/src/data-entry/beamProperties.tsx
index e3415bc..6cdb6d0 100644
--- a/src/data-entry/beamProperties.tsx
+++ b/src/data-entry/beamProperties.tsx
@@ -17,6 +17,7 @@ import {
   wavelength2EnergyConverter,
   energy2WavelengthConverter,
   parseNumericInput,
+  AngstromSymbol,
 } from "../utils/units";
 import { useBeamlineConfigStore } from "./beamlineconfigStore";
 import { unit } from "mathjs";
@@ -131,16 +132,18 @@ export default function BeampropertiesDataEntry() {
             <MenuItem value={WavelengthUnits.nanometres}>
               {WavelengthUnits.nanometres}
             </MenuItem>
-            <MenuItem value={WavelengthUnits.angstroms}>{"\u212B"}</MenuItem>
+            <MenuItem value={WavelengthUnits.angstroms}>
+              {AngstromSymbol}
+            </MenuItem>
           </Select>
         </FormControl>
       </Stack>
       <Typography>
-        Minimum allowed wavelength: 
+        Minimum allowed wavelength:
         {" " + beamlineConfig.beamline.minWavelength.toString()}
       </Typography>
       <Typography>
-        Maximum allowed wavelength: 
+        Maximum allowed wavelength:
         {" " + beamlineConfig.beamline.maxWavelength.toString()}
       </Typography>
       <Stack direction="row" spacing={1}>
diff --git a/src/data-entry/beamlineconfigStore.ts b/src/data-entry/beamlineconfigStore.ts
index f8e3811..f2cd467 100644
--- a/src/data-entry/beamlineconfigStore.ts
+++ b/src/data-entry/beamlineconfigStore.ts
@@ -45,9 +45,11 @@ export const useBeamlineConfigStore = create<BeamlineConfigStore>((set) => ({
   beamlineName: defaultConfig.beamline,
   beamlineRecord: beamlineRecord,
 
-  energy: wavelength2EnergyConverter(defaultConfig.wavelength).to("keV"),
+  energy: wavelength2EnergyConverter(defaultConfig.wavelength).to(
+    EnergyUnits.kiloElectronVolts,
+  ),
   userEnergy: wavelength2EnergyConverter(defaultConfig.wavelength)
-    .to("keV")
+    .to(EnergyUnits.kiloElectronVolts)
     .toNumber(),
 
   wavelength: defaultConfig.wavelength,
diff --git a/src/data-entry/beamstop.tsx b/src/data-entry/beamstop.tsx
index 188778d..2feb522 100644
--- a/src/data-entry/beamstop.tsx
+++ b/src/data-entry/beamstop.tsx
@@ -10,7 +10,7 @@ import {
   InputAdornment,
   Divider,
 } from "@mui/material";
-import { LengthUnits } from "../utils/units";
+import { LengthUnits, MuSymbol } from "../utils/units";
 import { useBeamstopStore } from "./beamstopStore";
 import { useDetectorStore } from "./detectorStore";
 import { AppDetector } from "../utils/types";
@@ -73,9 +73,11 @@ export default function BeamStopDataEntry(): JSX.Element {
               )
             }
           >
-            <MenuItem value={LengthUnits.millimetre as string}>{"mm"}</MenuItem>
+            <MenuItem value={LengthUnits.millimetre as string}>
+              {LengthUnits.millimetre}
+            </MenuItem>
             <MenuItem value={LengthUnits.micrometre as string}>
-              {"\u03bc" + "m"}
+              {MuSymbol + "m"}
             </MenuItem>
           </Select>
         </FormControl>
diff --git a/src/data-entry/cameraTube.tsx b/src/data-entry/cameraTube.tsx
index ec03edc..6a01de6 100644
--- a/src/data-entry/cameraTube.tsx
+++ b/src/data-entry/cameraTube.tsx
@@ -6,11 +6,11 @@ import {
   MenuItem,
   Select,
   TextField,
-  Typography
+  Typography,
 } from "@mui/material";
 import { Stack } from "@mui/system";
 import { useCameraTubeStore } from "./cameraTubeStore";
-import { LengthUnits } from "../utils/units";
+import { LengthUnits, MuSymbol } from "../utils/units";
 
 /**
  * Component with inputs for cameratube data entry
@@ -50,8 +50,10 @@ export default function CameraTubeDataEntry(): JSX.Element {
               )
             }
           >
-            <MenuItem value={LengthUnits.millimetre}>{"mm"}</MenuItem>
-            <MenuItem value={LengthUnits.micrometre}>{"\u03bc" + "m"}</MenuItem>
+            <MenuItem value={LengthUnits.millimetre}>
+              {LengthUnits.millimetre}
+            </MenuItem>
+            <MenuItem value={LengthUnits.micrometre}>{MuSymbol + "m"}</MenuItem>
           </Select>
         </FormControl>
       </Stack>
diff --git a/src/data-entry/dataSideBar.tsx b/src/data-entry/dataSideBar.tsx
index 0962f4a..87263ee 100644
--- a/src/data-entry/dataSideBar.tsx
+++ b/src/data-entry/dataSideBar.tsx
@@ -11,7 +11,7 @@ import {
   Button,
   Divider,
 } from "@mui/material";
-import { LengthUnits } from "../utils/units";
+import { LengthUnits, MuSymbol } from "../utils/units";
 import BeamStopDataEntry from "./beamstop";
 import CameraTubeDataEntry from "./cameraTube";
 import BeampropertiesDataEntry from "./beamProperties";
@@ -71,7 +71,7 @@ export default function DataSideBar(): JSX.Element {
   };
 
   return (
-    <Stack  maxHeight={{ lg:"91vh" }} overflow={{ lg: "scroll"}}>
+    <Stack maxHeight={{ lg: "91vh" }} overflow={{ lg: "scroll" }}>
       <Stack spacing={1}>
         <Card sx={{ p: 2 }} variant="outlined">
           <Stack spacing={1}>
@@ -131,7 +131,7 @@ export default function DataSideBar(): JSX.Element {
               />
             </Stack>
             <Typography>
-              Resolution (hxw): 
+              Resolution (hxw):
               {detectorStore.detector.resolution.height} x{" "}
               {detectorStore.detector.resolution.width}
             </Typography>
@@ -158,7 +158,7 @@ export default function DataSideBar(): JSX.Element {
                     {LengthUnits.millimetre} x {LengthUnits.millimetre}
                   </MenuItem>
                   <MenuItem value={LengthUnits.micrometre}>
-                    {"\u03BC" + "m"} x {"\u03BC" + "m"}
+                    {MuSymbol + "m"} x {MuSymbol + "m"}
                   </MenuItem>
                 </Select>
               </FormControl>
diff --git a/src/dialogs/BeamlineTable.tsx b/src/dialogs/BeamlineTable.tsx
index b420c10..9ae4a9d 100644
--- a/src/dialogs/BeamlineTable.tsx
+++ b/src/dialogs/BeamlineTable.tsx
@@ -1,6 +1,7 @@
 import { useBeamlineConfigStore } from "../data-entry/beamlineconfigStore";
 import { AppBeamline } from "../utils/types";
 import { DataGrid, GridColDef, GridToolbar } from "@mui/x-data-grid";
+import { LengthUnits, WavelengthUnits } from "../utils/units";
 
 interface BeamlineTableRow {
   name: string;
@@ -18,11 +19,11 @@ function createData(name: string, beamline: AppBeamline): BeamlineTableRow {
     name: name,
     cameraTubeDiameter: beamline.cameratubeDiameter,
     beamstopDiameter: beamline.beamstopDiameter,
-    minWavelength: beamline.minWavelength.toNumber("nm"),
-    maxWavelength: beamline.maxWavelength.toNumber("nm"),
-    minCameraLength: beamline.minCameraLength.toNumber("m"),
-    maxCameraLength: beamline.maxCameraLength.toNumber("m"),
-    cameraLengthStep: beamline.cameraLengthStep.toNumber("m"),
+    minWavelength: beamline.minWavelength.toNumber(WavelengthUnits.nanometres),
+    maxWavelength: beamline.maxWavelength.toNumber(WavelengthUnits.nanometres),
+    minCameraLength: beamline.minCameraLength.toNumber(LengthUnits.metre),
+    maxCameraLength: beamline.maxCameraLength.toNumber(LengthUnits.metre),
+    cameraLengthStep: beamline.cameraLengthStep.toNumber(LengthUnits.metre),
   };
 }
 
diff --git a/src/dialogs/beamlineDialog.tsx b/src/dialogs/beamlineDialog.tsx
index 33c842a..5ec7b55 100644
--- a/src/dialogs/beamlineDialog.tsx
+++ b/src/dialogs/beamlineDialog.tsx
@@ -17,6 +17,7 @@ import { IOBeamline } from "../utils/types";
 import { useBeamlineConfigStore } from "../data-entry/beamlineconfigStore";
 import { createInternalBeamline } from "../presets/presetManager";
 import { SubmitHandler, useForm } from "react-hook-form";
+import { formatLogMessage, LengthUnits, WavelengthUnits } from "../utils/units";
 
 const INPUT_PRECISION = 0.000001;
 
@@ -37,6 +38,7 @@ export default function PresetDialog(props: {
       data.name,
       createInternalBeamline(data.beamline),
     );
+    console.info(formatLogMessage(`New detector created : ${data.name} `));
     console.log(data);
     props.handleClose();
     reset();
@@ -62,8 +64,7 @@ export default function PresetDialog(props: {
             <Grid item xs={12} sm={12} md={12} lg={8}>
               <BeamlineTable />
             </Grid>
-            <Grid item md={0} lg={1} >
-            </Grid>
+            <Grid item md={0} lg={1}></Grid>
             <Grid item xs={12} sm={12} md={12} lg={3}>
               <Stack spacing={1}>
                 <Typography>Add New Beamline:</Typography>
@@ -85,7 +86,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">nm</InputAdornment>
+                      <InputAdornment position="end">
+                        {WavelengthUnits.nanometres}
+                      </InputAdornment>
                     ),
                   }}
                 />
@@ -100,7 +103,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">nm</InputAdornment>
+                      <InputAdornment position="end">
+                        {WavelengthUnits.nanometres}
+                      </InputAdornment>
                     ),
                   }}
                 />
@@ -115,7 +120,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">m</InputAdornment>
+                      <InputAdornment position="end">
+                        {LengthUnits.metre}
+                      </InputAdornment>
                     ),
                   }}
                 />
@@ -130,7 +137,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">m</InputAdornment>
+                      <InputAdornment position="end">
+                        {LengthUnits.metre}
+                      </InputAdornment>
                     ),
                   }}
                 />
@@ -145,7 +154,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">m</InputAdornment>
+                      <InputAdornment position="end">
+                        {LengthUnits.metre}
+                      </InputAdornment>
                     ),
                   }}
                 />
@@ -162,7 +173,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">mm</InputAdornment>
+                      <InputAdornment position="end">
+                        {LengthUnits.millimetre}
+                      </InputAdornment>
                     ),
                   }}
                 />
@@ -177,7 +190,9 @@ export default function PresetDialog(props: {
                   }}
                   InputProps={{
                     endAdornment: (
-                      <InputAdornment position="end">mm</InputAdornment>
+                      <InputAdornment position="end">
+                        {LengthUnits.millimetre}
+                      </InputAdornment>
                     ),
                   }}
                 />
diff --git a/src/dialogs/detectorDialog.tsx b/src/dialogs/detectorDialog.tsx
index 70cf9c3..165f61f 100644
--- a/src/dialogs/detectorDialog.tsx
+++ b/src/dialogs/detectorDialog.tsx
@@ -28,7 +28,7 @@ export default function DetectorDialog(props: {
   handleOpen: () => void;
 }): JSX.Element {
   const detectorStore = useDetectorStore();
-  const { register, reset, handleSubmit } = useForm<DetectorForm>();
+  const { register, reset, handleSubmit, setValue } = useForm<DetectorForm>();
   const onSubmit: SubmitHandler<DetectorForm> = (data: DetectorForm) => {
     detectorStore.addNewDetector(
       data.name,
@@ -38,6 +38,7 @@ export default function DetectorDialog(props: {
     props.handleClose();
     reset();
   };
+  setValue("detector.mask.missingModules", []);
 
   return (
     <Dialog
@@ -58,9 +59,7 @@ export default function DetectorDialog(props: {
             <Grid item xs={12} sm={12} md={12} lg={8}>
               <DetectorTable />
             </Grid>
-            <Grid item md={0} lg={1} >
-            </Grid>
-            <Grid item xs={12} sm={12} md={12} lg={3}>
+            <Grid item xs={12} sm={12} md={12} lg={4}>
               <Stack spacing={1} width={"100%"}>
                 <Typography>Add new Detector:</Typography>
                 <TextField
@@ -123,6 +122,59 @@ export default function DetectorDialog(props: {
                     ),
                   }}
                 />
+                <Typography> Mask: </Typography>
+                <TextField
+                  type="number"
+                  label="Horizontal Modules"
+                  {...register("detector.mask.horizontalModules", {
+                    required: true,
+                  })}
+                  size="small"
+                  inputProps={{
+                    step: 1,
+                  }}
+                />
+                <TextField
+                  type="number"
+                  label="Vertical Modules"
+                  {...register("detector.mask.verticalModules", {
+                    required: true,
+                  })}
+                  size="small"
+                  inputProps={{
+                    step: 1,
+                  }}
+                />
+                <TextField
+                  type="number"
+                  label="Horizontal Gap"
+                  {...register("detector.mask.horizontalGap", {
+                    required: true,
+                  })}
+                  size="small"
+                  inputProps={{
+                    step: 1,
+                  }}
+                  InputProps={{
+                    endAdornment: (
+                      <InputAdornment position="end">px</InputAdornment>
+                    ),
+                  }}
+                />
+                <TextField
+                  type="number"
+                  label="Vertical Gap"
+                  {...register("detector.mask.verticalGap", { required: true })}
+                  size="small"
+                  inputProps={{
+                    step: 1,
+                  }}
+                  InputProps={{
+                    endAdornment: (
+                      <InputAdornment position="end">px</InputAdornment>
+                    ),
+                  }}
+                />
                 <Button variant="outlined" type="submit">
                   Submit
                 </Button>
diff --git a/src/dialogs/detectorTable.tsx b/src/dialogs/detectorTable.tsx
index 7d7806f..58f7fad 100644
--- a/src/dialogs/detectorTable.tsx
+++ b/src/dialogs/detectorTable.tsx
@@ -1,6 +1,7 @@
 import { AppDetector } from "../utils/types";
 import { DataGrid, GridColDef, GridToolbar } from "@mui/x-data-grid";
 import { useDetectorStore } from "../data-entry/detectorStore";
+import { LengthUnits } from "../utils/units";
 
 interface DetectorTableRow {
   name: string;
@@ -15,8 +16,8 @@ function createData(name: string, detector: AppDetector): DetectorTableRow {
     name: name,
     resolution_height: detector.resolution.height,
     resolution_width: detector.resolution.width,
-    pixel_height: detector.pixelSize.height.toNumber("mm"),
-    pixel_width: detector.pixelSize.width.toNumber("mm"),
+    pixel_height: detector.pixelSize.height.toNumber(LengthUnits.millimetre),
+    pixel_width: detector.pixelSize.width.toNumber(LengthUnits.millimetre),
   };
 }
 
diff --git a/src/plot/Plotter.ts b/src/plot/Plotter.ts
index 27f1371..988e8f6 100644
--- a/src/plot/Plotter.ts
+++ b/src/plot/Plotter.ts
@@ -50,6 +50,7 @@ export class Plotter {
     if (!this.scaleFactor) {
       throw TypeError("reciprocal units need a scaleFactor");
     }
+
     const newcentre = Plotter.convert2QSpace(
       centre,
       this.scaleFactor,
diff --git a/src/plot/centrePlot.tsx b/src/plot/centrePlot.tsx
index 93befff..fec12ca 100644
--- a/src/plot/centrePlot.tsx
+++ b/src/plot/centrePlot.tsx
@@ -7,7 +7,7 @@ import {
   SvgRect,
   VisCanvas,
 } from "@h5web/lib";
-import { Card, CardContent, Stack} from "@mui/material";
+import { Card, CardContent, Stack } from "@mui/material";
 import { Unit, MathType, divide, multiply, unit, createUnit } from "mathjs";
 import { Vector2, Vector3 } from "three";
 import { computeQrange } from "../calculations/qrange";
@@ -24,8 +24,8 @@ import {
   useResultStore,
 } from "../results/resultsStore";
 import {
-  convertBetweenQAndD,
-  convertBetweenQAndS,
+  convertFromDtoQ,
+  convertFromSToQ,
 } from "../results/scatteringQuantities";
 import {
   AppBeamline,
@@ -40,6 +40,12 @@ import { usePlotStore } from "./plotStore";
 import { UnitVector, color2String, getDomains } from "./plotUtils";
 import SvgAxisAlignedEllipse from "./svgEllipse";
 import { useMemo } from "react";
+import {
+  formatLogMessage,
+  LengthUnits,
+  ReciprocalWavelengthUnits,
+} from "../utils/units";
+import SvgMask from "./svgMask";
 
 /**
  * A react componenet that plots the items that make up the system
@@ -59,6 +65,7 @@ export default function CentrePlot(): JSX.Element {
   );
 
   const { ptMin, ptMax, visibleQRange, fullQRange } = useMemo(() => {
+    console.info(formatLogMessage("Calculating Q range"));
     // todo this might need to be moved elsewhere
     /* eslint-disable */
     // @ts-ignore
@@ -104,10 +111,10 @@ export default function CentrePlot(): JSX.Element {
   const visibleQRangeUnits = UnitRange.fromNumericRange(
     visibleQRange,
     "m^-1",
-  ).to("nm^-1");
-  console.log(visibleQRange);
+  ).to(ReciprocalWavelengthUnits.nanometres);
+
   const fullQRangeUnits = UnitRange.fromNumericRange(fullQRange, "m^-1").to(
-    "nm^-1",
+    ReciprocalWavelengthUnits.nanometres,
   );
 
   const { beamstopCentre, cameraTubeCentre, minPoint, maxPoint } =
@@ -165,12 +172,12 @@ export default function CentrePlot(): JSX.Element {
   }
 
   const domains = getDomains(plotDetector);
-
+  console.info(formatLogMessage("Refreshing plot"));
   return (
     <Stack direction="column" spacing={1} flexGrow={1}>
-    <Stack direction={{ sm: "column", md: "row"}} spacing={1} flexGrow={1}>
-    <Card variant="outlined" sx= {{ aspectRatio : 1.05 / 1}}>
-          <CardContent sx={{ width: "100%", height: "100%"}}>
+      <Stack direction={{ sm: "column", md: "row" }} spacing={1} flexGrow={1}>
+        <Card variant="outlined" sx={{ aspectRatio: 1.07 / 1 }}>
+          <CardContent sx={{ width: "100%", height: "100%" }}>
             <div
               style={{
                 display: "grid",
@@ -246,6 +253,29 @@ export default function CentrePlot(): JSX.Element {
                           id="detector"
                         />
                       )}
+                      {plotConfig.mask && (
+                        <SvgMask
+                          coords={[detectorLower, detectorUpper]}
+                          fill={color2String(plotConfig.maskColor)}
+                          numModules={
+                            new Vector3(
+                              detectorStore.detector.mask.horizontalModules,
+                              detectorStore.detector.mask.verticalModules,
+                            )
+                          }
+                          gapFraction={
+                            new Vector3(
+                              detectorStore.detector.mask.horizontalGap /
+                                detectorStore.detector.resolution.width,
+                              detectorStore.detector.mask.verticalGap /
+                                detectorStore.detector.resolution.height,
+                            )
+                          }
+                          missingSegments={
+                            detectorStore.detector.mask.missingModules ?? []
+                          }
+                        />
+                      )}
                       {plotConfig.inaccessibleRange && (
                         <SvgLine
                           coords={[beamstopCentre, visibleRangeStart]}
@@ -301,13 +331,13 @@ export default function CentrePlot(): JSX.Element {
             </div>
           </CardContent>
         </Card>
-      <LegendBar />
+        <LegendBar />
       </Stack>
       <ResultsBar
         visableQRange={visibleQRangeUnits}
         fullQrange={fullQRangeUnits}
       />
-      </Stack>
+    </Stack>
   );
 }
 
@@ -322,7 +352,10 @@ function getScaleFactor(wavelength: Unit, cameraLength: number | null) {
   if (cameraLength && wavelength) {
     scaleFactor = divide(
       2 * Math.PI,
-      multiply(unit(cameraLength, "m"), wavelength.to("m")),
+      multiply(
+        unit(cameraLength, LengthUnits.metre),
+        wavelength.to(LengthUnits.metre),
+      ),
     );
   }
   if (scaleFactor == null) {
@@ -355,13 +388,13 @@ function getReferencePoints(
   cameraTube: AppCircularDevice,
 ) {
   const minPoint: UnitVector = {
-    x: unit(ptMin.x, "m"),
-    y: unit(ptMin.y, "m"),
+    x: unit(ptMin.x, LengthUnits.metre),
+    y: unit(ptMin.y, LengthUnits.metre),
   };
 
   const maxPoint: UnitVector = {
-    x: unit(ptMax.x, "m"),
-    y: unit(ptMax.y, "m"),
+    x: unit(ptMax.x, LengthUnits.metre),
+    y: unit(ptMax.y, LengthUnits.metre),
   };
 
   const beamstopCentre: UnitVector = {
@@ -434,14 +467,14 @@ function getRequestedRange(
   const requestedMaxPt = getPointForQ(
     requestedRange.max,
     beamlineConfig.angle,
-    unit(beamlineConfig.cameraLength ?? NaN, "m"),
+    unit(beamlineConfig.cameraLength ?? NaN, LengthUnits.metre),
     beamlineConfig.wavelength,
     beamstopCentre,
   );
   const requestedMinPt = getPointForQ(
     requestedRange.min,
     beamlineConfig.angle,
-    unit(beamlineConfig.cameraLength ?? NaN, "m"),
+    unit(beamlineConfig.cameraLength ?? NaN, LengthUnits.metre),
     beamlineConfig.wavelength,
     beamstopCentre,
   );
@@ -460,18 +493,15 @@ function getRange(): (state: ResultStore) => UnitRange | null {
     }
 
     const getUnit = (value: number): Unit => {
-      let result: Unit;
-      switch (state.requested) {
-        case ScatteringOptions.d:
-          result = convertBetweenQAndD(unit(value, state.dUnits));
-          break;
-        case ScatteringOptions.s:
-          result = convertBetweenQAndS(unit(value, state.sUnits));
-          break;
-        default:
-          result = unit(value, state.qUnits);
+      if (state.requested === ScatteringOptions.d) {
+        return convertFromDtoQ(unit(value, state.dUnits));
       }
-      return result;
+
+      if (state.requested === ScatteringOptions.s) {
+        return convertFromSToQ(unit(value, state.sUnits));
+      }
+
+      return unit(value, state.qUnits);
     };
 
     return new UnitRange(
diff --git a/src/plot/legendBar.tsx b/src/plot/legendBar.tsx
index 92498c8..32619f3 100644
--- a/src/plot/legendBar.tsx
+++ b/src/plot/legendBar.tsx
@@ -19,14 +19,13 @@ export default function LegendBar(): JSX.Element {
   const plotConfig = usePlotStore();
 
   return (
-    <Card 
-      sx={{ flexGrow: 1 , overflow: "scroll"}}
-      variant="outlined">
+    <Card sx={{ flexGrow: 1, overflow: "scroll" }} variant="outlined">
       <CardContent>
         <Stack spacing={1}>
           <Typography variant="h6"> Legend</Typography>
           <Divider />
           <FormGroup>
+            {/* Detector */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -50,6 +49,7 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Camera Tube */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -73,6 +73,7 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Beamstop */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -96,6 +97,7 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Clearance */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -119,6 +121,7 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Visible Range */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -142,6 +145,7 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Requested Range */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -165,6 +169,7 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Inaccessible Range */}
             <FormControlLabel
               control={
                 <Checkbox
@@ -188,6 +193,30 @@ export default function LegendBar(): JSX.Element {
                 </Stack>
               }
             />
+            {/* Mask */}
+            <FormControlLabel
+              control={
+                <Checkbox
+                  checked={plotConfig.mask}
+                  onChange={(_, checked) =>
+                    plotConfig.update({ mask: checked })
+                  }
+                />
+              }
+              label={
+                <Stack direction={"row"}>
+                  <ColourPickerPopover
+                    color={plotConfig.maskColor}
+                    onChangeComplete={(color) =>
+                      plotConfig.update({ maskColor: color.rgb })
+                    }
+                  />
+                  <Typography display={"flex"} alignItems={"center"}>
+                    Mask
+                  </Typography>
+                </Stack>
+              }
+            />
           </FormGroup>
           <FormControl>
             <FormLabel id="demo-radio-buttons-group-label">Axes:</FormLabel>
diff --git a/src/plot/plotStore.ts b/src/plot/plotStore.ts
index e4ed3d9..13db9d9 100644
--- a/src/plot/plotStore.ts
+++ b/src/plot/plotStore.ts
@@ -7,9 +7,20 @@ export enum PlotAxes {
   reciprocal = "nm^-1",
 }
 
+// default colours used in app
+const lilac: RGBColor = { r: 144, g: 19, b: 254, a: 0.4 };
+const black: RGBColor = { r: 0, g: 0, b: 0, a: 1 };
+const blackOpaque: RGBColor = { r: 0, g: 0, b: 0, a: 0.2 };
+const turquoise: RGBColor = { r: 80, g: 227, b: 194, a: 0.4 };
+const mustard: RGBColor = { r: 245, g: 166, b: 35, a: 1 };
+const green: RGBColor = { r: 65, g: 117, b: 5, a: 1 };
+const red: RGBColor = { r: 208, g: 2, b: 27, a: 1 };
+
 export interface PlotConfig {
   detector: boolean;
   detectorColor: RGBColor;
+  mask: boolean;
+  maskColor: RGBColor;
   beamstop: boolean;
   beamstopColor: RGBColor;
   cameraTube: boolean;
@@ -28,19 +39,21 @@ export interface PlotConfig {
 
 export const usePlotStore = create<PlotConfig>((set) => ({
   detector: true,
-  detectorColor: { r: 144, g: 19, b: 254, a: 0.4 },
+  detectorColor: lilac,
+  mask: false,
+  maskColor: black,
   beamstop: true,
-  beamstopColor: { r: 0, g: 0, b: 0, a: 1 },
+  beamstopColor: black,
   cameraTube: true,
-  cameraTubeColor: { r: 80, g: 227, b: 194, a: 0.4 },
+  cameraTubeColor: turquoise,
   visibleRange: true,
-  visibleColor: { r: 245, g: 166, b: 35, a: 1 },
+  visibleColor: mustard,
   requestedRange: true,
-  requestedRangeColor: { r: 65, g: 117, b: 5, a: 1 },
+  requestedRangeColor: green,
   clearance: true,
-  clearanceColor: { r: 0, g: 0, b: 0, a: 0.2 },
+  clearanceColor: blackOpaque,
   inaccessibleRange: true,
-  inaccessibleRangeColor: { r: 208, g: 2, b: 27, a: 1 },
+  inaccessibleRangeColor: red,
   plotAxes: PlotAxes.milimeter,
   update: (newConfig) => {
     set({ ...newConfig });
diff --git a/src/plot/plotUtils.ts b/src/plot/plotUtils.ts
index ef96d94..3baaa71 100644
--- a/src/plot/plotUtils.ts
+++ b/src/plot/plotUtils.ts
@@ -6,20 +6,9 @@ import NumericRange from "../calculations/numericRange";
 export const getDomains = (
   detector: PlotRectangle,
 ): { xAxis: NumericRange; yAxis: NumericRange } => {
-  const maxAxis =
-    detector.upperBound.x > detector.upperBound.y
-      ? detector.upperBound.x
-      : detector.upperBound.y;
-
-  // todo suggestion - why not to use Math.max() or Math.min().
-  // todo ctnd or the mathjs equivalent?
-  const minAxis =
-    detector.lowerBound.x < detector.lowerBound.y
-      ? detector.lowerBound.x
-      : detector.lowerBound.y;
-
+  const maxAxis = Math.max(detector.upperBound.x, detector.upperBound.y);
+  const minAxis = Math.min(detector.lowerBound.x, detector.lowerBound.y);
   const offset = 0.2 * (maxAxis - minAxis);
-
   const min = Math.round(minAxis - offset);
   const max = Math.round(maxAxis + offset);
   const range = new NumericRange(min, max);
diff --git a/src/plot/svgMask.tsx b/src/plot/svgMask.tsx
new file mode 100644
index 0000000..1d676ef
--- /dev/null
+++ b/src/plot/svgMask.tsx
@@ -0,0 +1,156 @@
+import { SvgRect } from "@h5web/lib";
+import type { SVGProps } from "react";
+import { Vector3 } from "three";
+
+type Rect = [Vector3, Vector3];
+
+export interface SvgMaskProps extends SVGProps<SVGPathElement> {
+  coords: Rect;
+  strokePosition?: "inside" | "outside";
+  strokeWidth?: number;
+  numModules: Vector3;
+  gapFraction: Vector3;
+  missingSegments: number[];
+}
+
+export default function SvgMask(props: SvgMaskProps) {
+  // check if clone is needed later on
+  const [detectorUpper, detectorLower] = props.coords;
+
+  // Get full length and width of detector
+  const fulllength = detectorLower.clone().sub(detectorUpper);
+  // Get the length of the horizontal and vertical gaps between modules
+  const gaplength = fulllength.clone().multiply(props.gapFraction);
+  // Get the length and width of each detctor module from the detector length,
+  // number of gaps, gap length, and the number of modules
+  //
+  // module length =
+  //    (detector length - (number of gaps)*(gap length))/(number of modules)
+  const moduleLength = fulllength
+    .clone()
+    .sub(gaplength.clone().multiply(props.numModules.clone().subScalar(1)))
+    .divide(props.numModules);
+
+  return (
+    <>
+      {/* plot vertical stripes */}
+      {[...Array(props.numModules.x - 1).keys()].map((i: number) => (
+        <SvgRect
+          {...props}
+          key={i}
+          coords={generateVerticalStripes(
+            props.coords,
+            moduleLength.x,
+            gaplength.x,
+            i + 1,
+          )}
+          fill={props.fill}
+        />
+      ))}
+      {/* plot horizontal stripes */}
+      {[...Array(props.numModules.y - 1).keys()].map((item: number) => (
+        <SvgRect
+          {...props}
+          key={item}
+          coords={generateHorizontalStripes(
+            props.coords,
+            moduleLength.y,
+            gaplength.y,
+            item + 1,
+          )}
+          fill={props.fill}
+        />
+      ))}
+      {/* plot missing sections*/}
+      {props.missingSegments.map((item: number) => (
+        <SvgRect
+          {...props}
+          key={item}
+          coords={generateMissingModule(
+            props.coords,
+            props.numModules,
+            moduleLength,
+            gaplength,
+            item,
+          )}
+          fill={props.fill}
+        />
+      ))}
+    </>
+  );
+}
+
+function generateLowerBound(
+  moduleLen: number,
+  gapLen: number,
+  moduleNum: number,
+): number {
+  return moduleNum * moduleLen + (moduleNum - 1) * gapLen;
+}
+
+function generateUpperBound(
+  moduleLen: number,
+  gapLen: number,
+  moduleNum: number,
+): number {
+  return moduleNum * moduleLen + moduleNum * gapLen;
+}
+
+function generateVerticalStripes(
+  coords: Rect,
+  moduleLenX: number,
+  gapLenX: number,
+  idx: number,
+): Rect {
+  return [
+    new Vector3(
+      coords[0].x + generateLowerBound(moduleLenX, gapLenX, idx),
+      coords[0].y,
+    ),
+    new Vector3(
+      coords[0].x + generateUpperBound(moduleLenX, gapLenX, idx),
+      coords[1].y,
+    ),
+  ];
+}
+
+function generateHorizontalStripes(
+  coords: Rect,
+  moduleLenY: number,
+  gapLenY: number,
+  idx: number,
+): Rect {
+  return [
+    new Vector3(
+      coords[0].x,
+      coords[0].y + generateLowerBound(moduleLenY, gapLenY, idx),
+    ),
+    new Vector3(
+      coords[1].x,
+      coords[0].y + generateUpperBound(moduleLenY, gapLenY, idx),
+    ),
+  ];
+}
+
+function generateMissingModule(
+  coords: Rect,
+  moduleNum: Vector3,
+  moduleLen: Vector3,
+  gapLen: Vector3,
+  idx: number,
+): Rect {
+  return [
+    new Vector3(
+      coords[0].x + (moduleLen.x + gapLen.x) * (idx % moduleNum.x),
+      coords[0].y + (moduleLen.y + gapLen.y) * Math.floor(idx / moduleNum.x),
+    ),
+    new Vector3(
+      coords[0].x +
+        (moduleLen.x + gapLen.x) * (idx % moduleNum.x) +
+        moduleLen.x,
+      coords[0].y +
+        (moduleLen.y + gapLen.y) * Math.floor(idx / moduleNum.x) +
+        moduleLen.y,
+    ),
+  ];
+}
diff --git a/src/presets/detectors.json b/src/presets/detectors.json
index 213f321..665a0f6 100644
--- a/src/presets/detectors.json
+++ b/src/presets/detectors.json
@@ -7,6 +7,13 @@
     "pixelSize": {
       "width": 0.172,
       "height": 0.172
+    },
+    "mask": {
+      "horizontalModules": 3,
+      "verticalModules": 8,
+      "horizontalGap": 7,
+      "verticalGap": 17,
+      "missingModules": []
     }
   },
   "Pilatus P3-2M-DLS (for WAXS)": {
@@ -17,6 +24,13 @@
     "pixelSize": {
       "width": 0.172,
       "height": 0.172
+    },
+    "mask": {
+      "horizontalModules": 3,
+      "verticalModules": 8,
+      "horizontalGap": 7,
+      "verticalGap": 17,
+      "missingModules": [17, 20, 23]
     }
   },
   "Pilatus6m": {
@@ -27,6 +41,13 @@
     "pixelSize": {
       "width": 0.172,
       "height": 0.172
+    },
+    "mask": {
+      "horizontalModules": 12,
+      "verticalModules": 5,
+      "horizontalGap": 17,
+      "verticalGap": 7,
+      "missingModules": []
     }
   },
   "Pilatus100k": {
@@ -37,9 +58,16 @@
     "pixelSize": {
       "width": 0.172,
       "height": 0.172
+    },
+    "mask": {
+      "horizontalModules": 3,
+      "verticalModules": 1,
+      "horizontalGap": 17,
+      "verticalGap": 0,
+      "missingModules": []
     }
   },
-  "Pilatus300k-W":{
+  "Pilatus300k-W": {
     "resolution": {
       "width": 195,
       "height": 1495
@@ -47,6 +75,13 @@
     "pixelSize": {
       "width": 0.172,
       "height": 0.172
+    },
+    "mask": {
+      "horizontalModules": 1,
+      "verticalModules": 3,
+      "horizontalGap": 0,
+      "verticalGap": 7,
+      "missingModules": []
     }
   },
   "Eiger 500k": {
@@ -57,6 +92,13 @@
     "pixelSize": {
       "width": 7.5e-2,
       "height": 7.5e-2
+    },
+    "mask": {
+      "horizontalModules": 3,
+      "verticalModules": 8,
+      "horizontalGap": 7,
+      "verticalGap": 17,
+      "missingModules": []
     }
   },
   "Eiger 1M": {
diff --git a/src/presets/presetManager.ts b/src/presets/presetManager.ts
index ee38780..f89b007 100644
--- a/src/presets/presetManager.ts
+++ b/src/presets/presetManager.ts
@@ -9,7 +9,17 @@ import {
   IOBeamline,
   IODetector,
   IOPresetConfig,
+  DetectorMask,
 } from "../utils/types";
+import { LengthUnits, WavelengthUnits } from "../utils/units";
+
+const DefaultDetectorMask: DetectorMask = {
+  horizontalModules: 1,
+  verticalModules: 1,
+  horizontalGap: 0,
+  verticalGap: 0,
+  missingModules: [],
+};
 
 /**
  * Creates an internal detector with pixel size units from an IODetector
@@ -18,10 +28,11 @@ import {
  */
 export function createInternalDetector(detectorData: IODetector): AppDetector {
   return {
+    mask: DefaultDetectorMask,
     ...detectorData,
     pixelSize: {
-      height: unit(detectorData.pixelSize.height, "mm"),
-      width: unit(detectorData.pixelSize.height, "mm"),
+      height: unit(detectorData.pixelSize.height, LengthUnits.millimetre),
+      width: unit(detectorData.pixelSize.height, LengthUnits.millimetre),
     },
   };
 }
@@ -45,11 +56,17 @@ export function createInternalBeamline(beamlineData: IOBeamline): AppBeamline {
     cameratubeDiameter: beamlineData.cameratubeDiameter,
     beamstopDiameter: beamlineData.beamstopDiameter,
     // Solution to units not being properly initialised
-    minWavelength: unit(beamlineData.minWavelength, "nm").to("nm"),
-    maxWavelength: unit(beamlineData.maxWavelength, "nm").to("nm"),
-    minCameraLength: unit(beamlineData.minCameraLength, "m"),
-    maxCameraLength: unit(beamlineData.maxCameraLength, "m"),
-    cameraLengthStep: unit(beamlineData.cameraLengthStep, "m"),
+    minWavelength: unit(
+      beamlineData.minWavelength,
+      WavelengthUnits.nanometres,
+    ).to(WavelengthUnits.nanometres),
+    maxWavelength: unit(
+      beamlineData.maxWavelength,
+      WavelengthUnits.nanometres,
+    ).to(WavelengthUnits.nanometres),
+    minCameraLength: unit(beamlineData.minCameraLength, LengthUnits.metre),
+    maxCameraLength: unit(beamlineData.maxCameraLength, LengthUnits.metre),
+    cameraLengthStep: unit(beamlineData.cameraLengthStep, LengthUnits.metre),
   };
 }
 
@@ -72,15 +89,23 @@ function createPresetConfigRecord(preset: IOPresetConfig): AppConfig {
     ...preset,
     beamstop: {
       ...preset.beamstop,
-      diameter: unit(beamlineRecord[preset.beamline].beamstopDiameter, "mm"),
+      diameter: unit(
+        beamlineRecord[preset.beamline].beamstopDiameter,
+        LengthUnits.millimetre,
+      ),
     },
     cameraTube: {
       ...preset.cameraTube,
-      diameter: unit(beamlineRecord[preset.beamline].cameratubeDiameter, "mm"),
+      diameter: unit(
+        beamlineRecord[preset.beamline].cameratubeDiameter,
+        LengthUnits.millimetre,
+      ),
     },
     wavelength: unit(NaN, "nm"),
     angle: unit(90, "deg"),
-    cameraLength: beamlineRecord[preset.beamline].minCameraLength.toNumber("m"),
+    cameraLength: beamlineRecord[preset.beamline].minCameraLength.toNumber(
+      LengthUnits.metre,
+    ),
   };
 }
 
diff --git a/src/results/rangeTable.tsx b/src/results/rangeTable.tsx
index af6332b..b9c7a01 100644
--- a/src/results/rangeTable.tsx
+++ b/src/results/rangeTable.tsx
@@ -12,11 +12,12 @@ import {
   TableRow,
 } from "@mui/material";
 import { ScatteringOptions, useResultStore } from "./resultsStore";
-import { ReciprocalWavelengthUnits, WavelengthUnits } from "../utils/units";
 import {
-  convertBetweenQAndD,
-  convertBetweenQAndS,
-} from "./scatteringQuantities";
+  AngstromSymbol,
+  ReciprocalWavelengthUnits,
+  WavelengthUnits,
+} from "../utils/units";
+import { convertFromQtoD, convertFromQToS } from "./scatteringQuantities";
 import UnitRange from "../calculations/unitRange";
 
 export default function RangeTable(props: { qRange: UnitRange }): JSX.Element {
@@ -31,8 +32,10 @@ export default function RangeTable(props: { qRange: UnitRange }): JSX.Element {
     updateQUnits(event.target.value as ReciprocalWavelengthUnits);
   };
 
-  const handleSunits = (event: SelectChangeEvent<WavelengthUnits>) => {
-    updateSUnits(event.target.value as WavelengthUnits);
+  const handleSunits = (
+    event: SelectChangeEvent<ReciprocalWavelengthUnits>,
+  ) => {
+    updateSUnits(event.target.value as ReciprocalWavelengthUnits);
   };
 
   const handleDunits = (event: SelectChangeEvent<WavelengthUnits>) => {
@@ -40,14 +43,14 @@ export default function RangeTable(props: { qRange: UnitRange }): JSX.Element {
   };
   const qRange = props.qRange.to(resultsStore.qUnits as string);
   const sRange = props.qRange
-    .apply(convertBetweenQAndS)
+    .apply(convertFromQToS)
     .to(resultsStore.sUnits as string);
   const dRange = props.qRange
-    .apply(convertBetweenQAndD)
+    .apply(convertFromQtoD)
     .to(resultsStore.dUnits as string);
 
   return (
-    <Card variant="outlined" >
+    <Card variant="outlined">
       <TableContainer>
         <Table sx={{ minWidth: 50 }} aria-label="simple table" size="small">
           {/* TABLE HEAD */}
@@ -88,7 +91,7 @@ export default function RangeTable(props: { qRange: UnitRange }): JSX.Element {
                     {"1 / nm"}
                   </MenuItem>
                   <MenuItem value={ReciprocalWavelengthUnits.angstroms}>
-                    {"1 / " + "\u212B"}
+                    {"1 / " + AngstromSymbol}
                   </MenuItem>
                 </Select>
               </FormControl>
@@ -118,11 +121,11 @@ export default function RangeTable(props: { qRange: UnitRange }): JSX.Element {
                   value={resultsStore.sUnits}
                   onChange={handleSunits}
                 >
-                  <MenuItem value={WavelengthUnits.nanometres}>
-                    {WavelengthUnits.nanometres}
+                  <MenuItem value={ReciprocalWavelengthUnits.nanometres}>
+                    {"1 / nm"}
                   </MenuItem>
-                  <MenuItem value={WavelengthUnits.angstroms}>
-                    {"\u212B"}
+                  <MenuItem value={ReciprocalWavelengthUnits.angstroms}>
+                    {"1 / " + AngstromSymbol}
                   </MenuItem>
                 </Select>
               </FormControl>
@@ -156,7 +159,7 @@ export default function RangeTable(props: { qRange: UnitRange }): JSX.Element {
                     {WavelengthUnits.nanometres}
                   </MenuItem>
                   <MenuItem value={WavelengthUnits.angstroms}>
-                    {"\u212B"}
+                    {AngstromSymbol}
                   </MenuItem>
                 </Select>
               </FormControl>
diff --git a/src/results/resultsBar.tsx b/src/results/resultsBar.tsx
index 08a1ae4..0d7c4b1 100644
--- a/src/results/resultsBar.tsx
+++ b/src/results/resultsBar.tsx
@@ -15,6 +15,7 @@ import RadioGroup from "@mui/material/RadioGroup";
 import NumericRange from "../calculations/numericRange";
 import UnitRange from "../calculations/unitRange";
 import {
+  AngstromSymbol,
   ReciprocalWavelengthUnits,
   WavelengthUnits,
   parseNumericInput,
@@ -23,56 +24,71 @@ import { MessageDiagram } from "./MessageDiagram";
 import { RangeDiagram } from "./rangeDiagram";
 import RangeTable from "./rangeTable";
 import { ResultStore, ScatteringOptions, useResultStore } from "./resultsStore";
-import {
-  convertBetweenQAndD,
-  convertBetweenQAndS,
-} from "./scatteringQuantities";
+import { convertFromQtoD, convertFromQToS } from "./scatteringQuantities";
+
+interface VisibilitySettings {
+  textBoxUnits: WavelengthUnits | ReciprocalWavelengthUnits | null;
+  diagramVisible: UnitRange | null;
+  diagramFull: UnitRange | null;
+  diagramRequested: UnitRange | null;
+}
 
 function getVisibilitySettings(
   visableQRange: UnitRange,
   fullQrange: UnitRange,
   requestedRange: NumericRange | null,
   resultStore: ResultStore,
-) {
-  let diagramVisible: UnitRange | null = null;
-  let diagramFull: UnitRange | null = null;
-  let diagramRequested: UnitRange | null = null;
-
-  let textBoxUnits: WavelengthUnits | ReciprocalWavelengthUnits | null = null;
-  // NOTE early return pattern , reduces nesting logic
+): VisibilitySettings {
   if (!(visableQRange && fullQrange && requestedRange)) {
-    return { textBoxUnits, diagramVisible, diagramFull, diagramRequested };
+    return {
+      textBoxUnits: null,
+      diagramVisible: null,
+      diagramFull: null,
+      diagramRequested: null,
+    };
   }
 
-  switch (resultStore.requested) {
-    case ScatteringOptions.d:
-      diagramVisible = visableQRange.apply(convertBetweenQAndD).to("nm");
-      diagramFull = fullQrange.apply(convertBetweenQAndD).to("nm");
-      diagramRequested = UnitRange.fromNumericRange(
+  if (resultStore.requested === ScatteringOptions.d) {
+    return {
+      textBoxUnits: resultStore.dUnits,
+      diagramVisible: visableQRange
+        .apply(convertFromQtoD)
+        .to(WavelengthUnits.nanometres),
+      diagramFull: fullQrange
+        .apply(convertFromQtoD)
+        .to(WavelengthUnits.nanometres),
+      diagramRequested: UnitRange.fromNumericRange(
         requestedRange,
         resultStore.dUnits as string,
-      ).to("nm");
-      textBoxUnits = resultStore.dUnits;
-      break;
-    case ScatteringOptions.s:
-      diagramVisible = visableQRange.apply(convertBetweenQAndS).to("nm");
-      diagramFull = fullQrange.apply(convertBetweenQAndS).to("nm");
-      diagramRequested = UnitRange.fromNumericRange(
+      ).to(WavelengthUnits.nanometres),
+    };
+  }
+
+  if (resultStore.requested === ScatteringOptions.s) {
+    return {
+      textBoxUnits: resultStore.sUnits,
+      diagramVisible: visableQRange
+        .apply(convertFromQToS)
+        .to(ReciprocalWavelengthUnits.nanometres),
+      diagramFull: fullQrange
+        .apply(convertFromQToS)
+        .to(ReciprocalWavelengthUnits.nanometres),
+      diagramRequested: UnitRange.fromNumericRange(
         requestedRange,
         resultStore.sUnits as string,
-      ).to("nm");
-      textBoxUnits = resultStore.sUnits;
-      break;
-    default:
-      diagramVisible = visableQRange.to("nm^-1");
-      diagramFull = fullQrange.to("nm^-1");
-      diagramRequested = UnitRange.fromNumericRange(
-        requestedRange,
-        resultStore.qUnits as string,
-      ).to("nm^-1");
-      textBoxUnits = resultStore.qUnits;
+      ).to(ReciprocalWavelengthUnits.nanometres),
+    };
   }
-  return { textBoxUnits, diagramVisible, diagramFull, diagramRequested };
+
+  return {
+    textBoxUnits: resultStore.qUnits,
+    diagramVisible: visableQRange.to(ReciprocalWavelengthUnits.nanometres),
+    diagramFull: fullQrange.to(ReciprocalWavelengthUnits.nanometres),
+    diagramRequested: UnitRange.fromNumericRange(
+      requestedRange,
+      resultStore.qUnits as string,
+    ).to(ReciprocalWavelengthUnits.nanometres),
+  };
 }
 
 function RangeFormControl({ resultStore }: { resultStore: ResultStore }) {
@@ -112,9 +128,9 @@ const displayUnits = (
 ): string => {
   switch (textBoxUnits as string) {
     case "angstrom":
-      return "\u212B";
+      return AngstromSymbol;
     case "angstrom^-1":
-      return "\u212B^-1";
+      return AngstromSymbol + "^-1";
     case null:
       return "";
     default:
@@ -170,11 +186,11 @@ export default function ResultsBar({
         <Stack spacing={1}>
           <Typography variant="h6"> Results</Typography>
           <Divider />
-          <Stack 
-            direction={{md: "column", lg:"row"}}
+          <Stack
+            direction={{ md: "column", lg: "row" }}
             spacing={2}
-            sx={{direction:"column"}}
-            >
+            sx={{ direction: "column" }}
+          >
             {/* Range Table */}
             <RangeTable qRange={visableQRange} />
             {/* Requested Range */}
diff --git a/src/results/resultsStore.ts b/src/results/resultsStore.ts
index e8c3411..84639e3 100644
--- a/src/results/resultsStore.ts
+++ b/src/results/resultsStore.ts
@@ -1,8 +1,6 @@
 import { create } from "zustand";
 import { WavelengthUnits, ReciprocalWavelengthUnits } from "../utils/units";
 
-export const theta = "\u03B8";
-
 export enum ScatteringOptions {
   q = "q",
   s = "s",
@@ -12,7 +10,7 @@ export enum ScatteringOptions {
 export interface ResultStore {
   requested: ScatteringOptions;
   qUnits: ReciprocalWavelengthUnits;
-  sUnits: WavelengthUnits;
+  sUnits: ReciprocalWavelengthUnits;
   dUnits: WavelengthUnits;
   requestedMin: number | null;
   requestedMax: number | null;
@@ -24,7 +22,7 @@ export interface ResultStore {
     }>,
   ) => void;
   updateQUnits: (newunits: ReciprocalWavelengthUnits) => void;
-  updateSUnits: (newunits: WavelengthUnits) => void;
+  updateSUnits: (newunits: ReciprocalWavelengthUnits) => void;
   updateDUnits: (newunits: WavelengthUnits) => void;
 }
 
@@ -34,7 +32,7 @@ export interface ResultStore {
 export const useResultStore = create<ResultStore>((set) => ({
   requested: ScatteringOptions.q,
   qUnits: ReciprocalWavelengthUnits.nanometres,
-  sUnits: WavelengthUnits.nanometres,
+  sUnits: ReciprocalWavelengthUnits.nanometres,
   dUnits: WavelengthUnits.nanometres,
   requestedMin: null,
   requestedMax: null,
@@ -51,6 +49,7 @@ export const useResultStore = create<ResultStore>((set) => ({
   },
   updateQUnits: (newunits: ReciprocalWavelengthUnits) =>
     set({ qUnits: newunits }),
-  updateSUnits: (newunits: WavelengthUnits) => set({ sUnits: newunits }),
+  updateSUnits: (newunits: ReciprocalWavelengthUnits) =>
+    set({ sUnits: newunits }),
   updateDUnits: (newunits: WavelengthUnits) => set({ dUnits: newunits }),
 }));
diff --git a/src/results/scatteringQuantities.ts b/src/results/scatteringQuantities.ts
index d460196..6a92981 100644
--- a/src/results/scatteringQuantities.ts
+++ b/src/results/scatteringQuantities.ts
@@ -1,33 +1,27 @@
 import { Unit, divide, multiply } from "mathjs";
 
-export const convertBetweenQAndS = (quantity: Unit): Unit => {
-  const result = divide(1, quantity);
+export const convertFromQToS = (quantity: Unit): Unit => {
+  const result = multiply(quantity, 2 * Math.PI);
   if (typeof result == "number" || !("units" in result)) {
     throw TypeError("name this error later ");
   }
   return result;
 };
 
-export const convertBetweenQAndD = (quantity: Unit): Unit => {
-  const result = divide(2 * Math.PI, quantity);
+export const convertFromSToQ = (quantity: Unit): Unit => {
+  const result = divide(quantity, 2 * Math.PI);
   if (typeof result == "number" || !("units" in result)) {
     throw TypeError("name this error later ");
   }
   return result;
 };
 
-export const convertFromDTooS = (quantity: Unit): Unit => {
-  const result = divide(quantity, 2 * Math.PI);
+export const convertFromQtoD = (quantity: Unit): Unit => {
+  const result = divide(2 * Math.PI, quantity);
   if (typeof result == "number" || !("units" in result)) {
-    throw TypeError("");
+    throw TypeError("name this error later ");
   }
   return result;
 };
 
-export const convertFromStooD = (quantity: Unit): Unit => {
-  const result = multiply(quantity, 2 * Math.PI);
-  if (typeof result == "number" || !("units" in result)) {
-    throw TypeError("");
-  }
-  return result;
-};
+export const convertFromDtoQ = convertFromQtoD;
diff --git a/src/utils/types.ts b/src/utils/types.ts
index d4af3e8..8b108a7 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -14,6 +14,7 @@ export interface SimpleVector2 {
 export interface AppDetector {
   readonly resolution: { height: number; width: number };
   readonly pixelSize: { height: Unit; width: Unit };
+  readonly mask: DetectorMask;
 }
 
 /**
@@ -63,6 +64,7 @@ export interface AppConfig {
 export interface IODetector {
   readonly resolution: { height: number; width: number };
   readonly pixelSize: { height: number; width: number };
+  readonly mask?: DetectorMask;
 }
 
 /**
@@ -116,3 +118,14 @@ export interface DetectorMask {
   readonly verticalGap: number;
   readonly missingModules?: number[];
 }
+
+export interface Calibrant {
+  positions: Position[];
+}
+
+export interface Position {
+  d: number;
+  h: number;
+  k: number;
+  l: number;
+}
diff --git a/src/utils/units.ts b/src/utils/units.ts
index 48a7f15..be748db 100644
--- a/src/utils/units.ts
+++ b/src/utils/units.ts
@@ -6,12 +6,16 @@ export const PLANCK = unit(6.62607015e-34, "J s");
 
 // Refer to https://mathjs.org/docs/datatypes/units.html for unit strings
 
+export const AngstromSymbol = "\u212B";
+export const MuSymbol = "\u03bc";
+
 /**
  * An Enum of the Length Units that the app supports
  */
 export enum LengthUnits {
   millimetre = "mm",
   micrometre = "um",
+  metre = "m",
 }
 
 /**
@@ -100,3 +104,13 @@ export const enforceRangeLimits = (
   if (value < min) return min;
   return value;
 };
+
+/**
+ * Add timestamp to log message
+ * @param message
+ * @returns
+ */
+export function formatLogMessage(message: string): string {
+  const timestamp = new Date().toISOString();
+  return `[${timestamp}]: ${message}`;
+}