diff --git a/src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py b/src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py index 7d1a0f631..f4542ed69 100755 --- a/src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py +++ b/src/mx_bluesky/I24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py @@ -634,9 +634,9 @@ def main_fixed_target_plan( logger.info("Opening fast shutter.") yield from open_fast_shutter(zebra) - logger.info(f"Run PMAC with program number {prog_num}") - yield from bps.abs_set(pmac.pmac_string, f"&2b{prog_num}r", wait=True) - sleep(1.0) + # logger.info(f"Run PMAC with program number {prog_num}") + # yield from bps.abs_set(pmac.pmac_string, f"&2b{prog_num}r", wait=True) + # sleep(1.0) # Kick off the StartOfCollect script logger.debug("Notify DCID of the start of the collection.") @@ -652,6 +652,9 @@ def main_fixed_target_plan( parameters, ) + logger.info(f"Run PMAC with program number {prog_num}") + yield from bps.abs_set(pmac.run_program, prog_num, wait=True) + # TODO Not sure bit before will even work with this? logger.info("Data Collection running") timeout_time = ( diff --git a/src/mx_bluesky/I24/serial/write_nexus.py b/src/mx_bluesky/I24/serial/write_nexus.py index f9b25f102..003c3fd8a 100644 --- a/src/mx_bluesky/I24/serial/write_nexus.py +++ b/src/mx_bluesky/I24/serial/write_nexus.py @@ -66,6 +66,7 @@ def call_nexgen( wavelength = float(caget(pv.dcm_lambda)) if det_type == Eiger.name: + bit_depth = int(caget(pv.eiger_bitdepthrbv)) # noqa: F841 logger.debug( f"Call to nexgen server with the following chip definition: \n{chip_prog_dict}" ) @@ -90,6 +91,7 @@ def call_nexgen( "transmission": transmission[0], "visitpath": os.fspath(meta_h5.parent), "wavelength": wavelength, + # TODO add bit_depth to payload } logger.info(f"Sending POST request to {url} with payload:") logger.info(pprint.pformat(payload))