Various small changes from beamline

src/mx_bluesky/beamlines/i24/serial/blueapi_config.yaml

@@ -15,3 +15,7 @@ api:
 stomp:
   enabled: true
   url: tcp://i24-control.diamond.ac.uk:61613
+logging:
+  graylog:
+    url: "tcp://graylog-log-target.diamond.ac.uk:12232"
+    enabled: true

src/mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json

@@ -1,8 +1,8 @@
 {
-    "scalex": 10006.4,
-    "scaley": 10011.9,
+    "scalex": 10009.4,
+    "scaley": 10006.0,
     "scalez": 10000.0,
-    "skew": 0.025,
+    "skew": 0.1,
     "sx_dir": 1,
     "sy_dir": 1,
     "sz_dir": 1

src/mx_bluesky/beamlines/i24/serial/parameters/utils.py

@@ -43,10 +43,10 @@ def get_chip_format(
             defaults["x_blocks"] = defaults["y_blocks"] = 8
             defaults["b2b_horz"] = defaults["b2b_vert"] = 0.800
         case ChipType.OxfordInner:
-            defaults["x_num_steps"] = defaults["y_num_steps"] = 25
-            defaults["x_step_size"] = defaults["y_step_size"] = 0.600
-            defaults["x_blocks"] = defaults["y_blocks"] = 1
-            defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
+            defaults["x_num_steps"] = defaults["y_num_steps"] = 20
+            defaults["x_step_size"] = defaults["y_step_size"] = 0.125
+            defaults["x_blocks"] = defaults["y_blocks"] = 8
+            defaults["b2b_horz"] = defaults["b2b_vert"] = 0.800
         case ChipType.Minichip:
             defaults["x_num_steps"] = defaults["y_num_steps"] = 20
             defaults["x_step_size"] = defaults["y_step_size"] = 0.125

src/mx_bluesky/beamlines/i24/serial/run_fixed_target.sh

@@ -44,7 +44,7 @@ if [[ $NO_PROCESERV_TEST == true ]]; then
 fi
 
 echo "Set up logging configuration"
-blueapi -c "${current}/blueapi_config.yaml" controller run setup_collection_logs '{"expt":"Serial Fixed"}'
+blueapi -c "${current}/blueapi_config.yaml" -i $INSTRUMENT_SESSION controller run setup_collection_logs '{"expt":"Serial Fixed"}'
 
 # Open the edm screen for a fixed target serial collection
 echo "Starting fixed target edm screen."
@@ -53,7 +53,7 @@ edm -x "${edm_path}/FT-gui/DiamondChipI24-py3v1.edl"
 echo "Edm screen closed"
 
 echo "Clean up log configuration"
-blueapi -c "${current}/blueapi_config.yaml" controller run clean_up_log_config_at_end
+blueapi -c "${current}/blueapi_config.yaml" -i $INSTRUMENT_SESSION controller run clean_up_log_config_at_end
 
 if [[ $NO_PROCESERV_TEST == true ]]; then
     # In this case blueapi server needs to be killed.

tests/unit_tests/beamlines/i24/serial/fixed_target/test_chip_manager.py

@@ -242,8 +242,8 @@ async def test_moveto_preset_with_pmac_move(
     [
         ("laser1on", " M712=1 M711=1"),
         ("laser1off", " M712=0 M711=1"),
-        ("laser2on", " M812=1 M811=1"),
-        ("laser2off", " M812=0 M811=1"),
+        ("laser2on", " M612=1 M611=1"),
+        ("laser2off", " M612=0 M611=1"),
     ],
 )
 async def test_laser_control_on_and_off(
@@ -288,8 +288,8 @@ def test_laser_control_burn_2_setting(
     mock_pmac_str = get_mock_put(pmac.pmac_string)
     mock_pmac_str.assert_has_calls(
         [
-            call(" M812=1 M811=1"),
-            call(" M812=0 M811=1"),
+            call(" M612=1 M611=1"),
+            call(" M612=0 M611=1"),
         ]
     )
 

tests/unit_tests/beamlines/i24/serial/parameters/test_utils.py

@@ -9,7 +9,7 @@
 
 @pytest.mark.parametrize(
     "chip_type, expected_num_blocks, expected_step_size, expected_num_steps",
-    [(0, 8, 0.125, 20), (1, 1, 0.6, 25), (3, 1, 0.125, 20)],
+    [(0, 8, 0.125, 20), (1, 8, 0.125, 20), (3, 1, 0.125, 20)],
 )
 def test_get_chip_format_for_oxford_chips(
     chip_type: int,