Beamline test fixes

DiamondLightSource · Dec 10, 2024 · fb09094 · fb09094
1 parent 6e26b21
commit fb09094
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py b/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py
@@ -535,6 +535,7 @@ def start_i24(
         raise ValueError(msg)
 
     # Open the hutch shutter
+    # SSX_LOGGER.warning("TESTING, not opening shutter!")
     yield from bps.abs_set(shutter, ShutterDemand.OPEN, wait=True)
 
     return start_time

diff --git a/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py b/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py
@@ -240,14 +240,16 @@ def save_screen_map() -> MsgGenerator:
 
     SSX_LOGGER.info(f"Saving {litemap_path.as_posix()} currentchip.map")
     with open(litemap_path / "currentchip.map", "w") as f:
+        SSX_LOGGER.debug("File opened for writing")
         SSX_LOGGER.debug("Printing only blocks with block_val == 1")
         for x in range(1, 82):
             block_str = "ME14E-MO-IOC-01:GP%i" % (x + 10)
             block_val = int(caget(block_str))
             if block_val == 1:
-                SSX_LOGGER.info("%s %d" % (block_str, block_val))
+                SSX_LOGGER.info(f"{block_str} {block_val}")
             line = "%02dstatus    P3%02d1 \t%s\n" % (x, x, block_val)
             f.write(line)
+            SSX_LOGGER.debug(f"Should have written line {line}")
     yield from bps.null()
 
 

diff --git a/src/mx_bluesky/beamlines/i24/serial/parameters/constants.py b/src/mx_bluesky/beamlines/i24/serial/parameters/constants.py
@@ -31,6 +31,7 @@ def _params_file_location() -> Path:
     else:
         filepath = INTERNAL_FILES_PATH
 
+    print(f"CREATING PARAM FOLDER IN: {filepath}")
     filepath.mkdir(parents=True, exist_ok=True)
 
     return filepath

diff --git a/src/mx_bluesky/beamlines/i24/serial/write_nexus.py b/src/mx_bluesky/beamlines/i24/serial/write_nexus.py
@@ -13,6 +13,7 @@
     ExtruderParameters,
     FixedTargetParameters,
 )
+from mx_bluesky.beamlines.i24.serial.parameters.constants import LITEMAP_PATH
 from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, caget, cagetstring
 
 
@@ -34,7 +35,8 @@ def call_nexgen(
         ):
             # NOTE Nexgen server is still on nexgen v0.7.2 (fully working for ssx)
             # Will need to be updated, for correctness sake map needs to be None.
-            current_chip_map = "/dls_sw/i24/scripts/fastchips/litemaps/currentchip.map"
+            current_chip_map = (LITEMAP_PATH / "currentchip.map").as_posix()
+            # current_chip_map = "/dls_sw/i24/scripts/fastchips/litemaps/currentchip.map"
         pump_status = bool(parameters.pump_repeat)
         total_numb_imgs = parameters.total_num_images
     elif expt_type == "extruder" and isinstance(parameters, ExtruderParameters):