xspress3 support with the community IOC

.ci/bl-specific.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
 
-# The beamline-specific metapackages are not used since 2020-2.0 deployment.
-# conda install -y -c ${CONDA_CHANNEL_NAME} <package>
+sudo mkdir -v -p /nsls2/data/srx/legacy/ \
+                 /nsls2/data/srx/assets/
 
-sudo mkdir -v -p /nsls2/xf05id1/shared/config/ \
-                 /nsls2/xf05id1/experiments/ \
-                 /nsls2/xf05id1/shared/src/bluesky_scripts/
+sudo chmod -Rv go+rw /nsls2/data/srx/
 
-sudo chmod -Rv go+rw /nsls2/xf05id1/
-
-touch /nsls2/xf05id1/shared/src/bluesky_scripts/simple_batch.py
-touch /nsls2/xf05id1/shared/src/bluesky_scripts/fly_batch.py

azure-pipelines.yml

@@ -7,15 +7,15 @@ resources:
       endpoint: github
 
 jobs:
-  - template: 2022-2.3-py39-tiled.yml@templates
+  - template: 2023-3.3-py310-tiled.yml@templates
     parameters:
-      beamline_acronym: HXN
-  - template: 2022-2.3-py39.yml@templates
+      beamline_acronym: SRX
+  - template: 2023-3.3-py310.yml@templates
     parameters:
-      beamline_acronym: HXN
-  - template: 2022-2.4-py39-tiled.yml@templates
+      beamline_acronym: SRX
+  - template: 2023-3.3-py311-tiled.yml@templates
     parameters:
-      beamline_acronym: HXN
-  - template: 2022-2.4-py39.yml@templates
+      beamline_acronym: SRX
+  - template: 2023-3.3-py311.yml@templates
     parameters:
-      beamline_acronym: HXN
+      beamline_acronym: SRX

startup/00-base.py

@@ -50,7 +50,7 @@ def wait_for_connection(self, timeout=DEFAULT_CONNECTION_TIMEOUT):
     going = "Going"
 else:
     # Case of CI:
-    timeout = 10  # seconds
+    timeout = 30  # seconds
     going = "NOT going"
 
 print(f'\nEpicsSignalBase timeout is {timeout} [seconds]. {going} to touch beamline hardware.\n')
@@ -195,7 +195,7 @@ def reload(self):
 
 # Optional: set any metadata that rarely changes.
 RE.md["beamline_id"] = "SRX"
-RE.md["md_version"] = "1.0"
+RE.md["md_version"] = "1.1"
 
 # from bluesky.utils import ts_msg_hook
 # RE.msg_hook = ts_msg_hook

startup/30-scaler.py

@@ -143,7 +143,7 @@ def export_sis_data(ion, filepath, zebra):
         # new = old - (zero_val * (new_t / 50_000_000))
         # might be good to throw a np.amax(new, 0) in there to prevent negative values
         # it would be good to save the "zero" value in the scan metadata as well
-        dset0 = f.create_dataset("time", (correct_length,), dtype="f")
+        dset0 = f.create_dataset("sis_time", (correct_length,), dtype="f")
         dset0[...] = np.array(new_t)
         dset1 = f.create_dataset("i0", (correct_length,), dtype="f")
         dset1[...] = np.array(new_i)