2026 3 production

.gitignore

@@ -84,3 +84,5 @@ target/
 *#*
 *py.*
 runEdna_old_21Jan2020.py
+
+.pixi/

beamline_support.py

@@ -319,14 +319,8 @@ def read_db():
 
 def init_motors():
   global motor_channel_dict
-  md2_motors = ["omega","sampleX","sampleY","sampleZ", "finex", "finey", "finez"]
-
   for key in list(motor_dict.keys()):
-    if beamline_designation == "XF:19ID" and key in md2_motors:
-      from mxbluesky.devices.md2 import MD2Positioner
-      motor_channel_dict[motor_dict[key]] = MD2Positioner(motor_dict[key],name = key)
-    else:
-      motor_channel_dict[motor_dict[key]] = EpicsMotor(motor_dict[key],name = key)
+    motor_channel_dict[motor_dict[key]] = EpicsMotor(motor_dict[key],name = key)
 
 
 def initControlPVs():

bin/amx_env.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+export PROJDIR=/nsls2/software/mx/daq/
+export CONFIGDIR=${PROJDIR}bnlpx_config/
+export LSDCHOME=${PROJDIR}lsdc_amx
+
+export PATH=/usr/local/bin:/usr/bin:/bin
+export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}"
+source ${CONFIGDIR}daq_env_amx.txt

bin/fmx_env.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+export PROJDIR=/nsls2/software/mx/daq/
+export CONFIGDIR=${PROJDIR}bnlpx_config/
+export LSDCHOME=${PROJDIR}lsdc_fmx
+
+export PATH=/usr/local/bin:/usr/bin:/bin
+export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}"
+source ${CONFIGDIR}daq_env.txt

bin/lsdcGui_amx

@@ -5,4 +5,4 @@ export LSDCHOME=${PROJDIR}lsdc_amx
 export PATH=/usr/local/bin:/usr/bin:/bin
 export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}"
 source ${CONFIGDIR}daq_env_amx.txt
-/opt/conda_envs/lsdc-gui-2023-2-latest/bin/python $LSDCHOME/lsdcGui.py&
+pixi run --manifest-path $LSDCHOME/pixi.toml amx-gui

bin/lsdcGui_fmx

@@ -5,4 +5,4 @@ export LSDCHOME=${PROJDIR}lsdc_fmx
 export PATH=/usr/local/bin:/usr/bin:/bin
 export PYTHONPATH=".:${CONFIGDIR}:/opt/dectris/albula/4.0/python:${LSDCHOME}"
 source ${CONFIGDIR}daq_env.txt
-/opt/conda_envs/lsdc-gui-2023-2-latest/bin/python $LSDCHOME/lsdcGui.py&
+pixi run --manifest-path $LSDCHOME/pixi.toml fmx-gui

bin/lsdcRemote_amx.cmd

@@ -9,6 +9,6 @@ export matlab_distrib=${PROJDIR}/software/c3d/matlab_distrib
 export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}mx-processing/
-# below not ideal as environment name also needed by daq_mainAux
-conda activate lsdc-server-2023-2-latest
-$LSDCHOME/daq_mainAux.py
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt
+pixi run --manifest-path $LSDCHOME/pixi.toml amx-remote

bin/lsdcRemote_fmx.cmd

@@ -9,6 +9,6 @@ export matlab_distrib=${PROJDIR}/software/c3d/matlab_distrib
 export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}mx-processing/
-# below not ideal as environment name also needed by daq_mainAux
-conda activate lsdc-server-2023-2-latest
-$LSDCHOME/daq_mainAux.py
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt
+pixi run --manifest-path $LSDCHOME/pixi.toml fmx-remote

bin/lsdcServer_amx.cmd

@@ -9,6 +9,6 @@ export matlab_distrib=${PROJDIR}/software/c3d/matlab_distrib
 export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}lsdc-processing/
-# below not idea as environment name also needed by daq_main2
-conda activate lsdc-server-2023-2-latest
-$LSDCHOME/lsdcServer
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt
+pixi run --manifest-path $LSDCHOME/pixi.toml amx-server

bin/lsdcServer_fmx.cmd

@@ -9,6 +9,6 @@ export matlab_distrib=${PROJDIR}/software/c3d/matlab_distrib
 export LD_LIBRARY_PATH=$matlab_distrib/bin/glnx86:$matlab_distrib/toolbox
 export PINALIGNDIR=${PROJDIR}pinAlign/pin_align-master/
 export MXPROCESSINGSCRIPTSDIR=${PROJDIR}lsdc-processing/
-# below not idea as environment name also needed by daq_main2
-conda activate lsdc-server-2023-2-latest
-$LSDCHOME/lsdcServer
+export REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt
+export SSL_CERT_FILE=/etc/pki/tls/certs/ca-bundle.crt
+pixi run --manifest-path $LSDCHOME/pixi.toml fmx-server

config_params.py

@@ -1,9 +1,13 @@
 import grp
 import os
 from enum import Enum
+import requests
 
 # BlConfig parameter variable names
 
+# Eiger detectors
+EIGER_DETECTORS = ["EIGER2-9M-XE", "EIGER-16"]
+
 # rastering parameters
 RASTER_TUNE_LOW_RES = "rasterTuneLowRes"
 RASTER_TUNE_HIGH_RES = "rasterTuneHighRes"
@@ -65,6 +69,7 @@ class OnMountAvailOptions(Enum):
 
 HUTCH_TIMER_DELAY = 500
 SAMPLE_TIMER_DELAY = 40
+SAMPLE_CAM_SNAPSHOT_DELAY = 100  # 10 fps for single-image snapshot polling
 SERVER_CHECK_DELAY = 2000
 
 FAST_DP_MIN_NODES = 4
@@ -85,50 +90,60 @@ class OnMountAvailOptions(Enum):
 DETECTOR_OBJECT_TYPE_OPHYD = "ophyd"  # instantiated in start_bs, using Bluesky scans
 DETECTOR_OBJECT_TYPE = "detectorObjectType"
 
-DETECTOR_SAFE_DISTANCE = {"fmx": 200.0, "amx": 180.0, "nyx": 200.0}
+DETECTOR_SAFE_DISTANCE = {"fmx": 200.0, "amx": 180.0}
 GOVERNOR_TIMEOUT = 120  # seconds for a governor move
 
-DEWAR_SECTORS = {'amx':8, 'fmx':8, 'nyx':8}
-PUCKS_PER_DEWAR_SECTOR = {'amx':3, 'fmx':3, 'nyx':3}
+DEWAR_SECTORS = {'amx':8, 'fmx':8}
+PUCKS_PER_DEWAR_SECTOR = {'amx':3, 'fmx':3}
 
-cryostreamTempPV = {"amx": "XF:17ID1:CS700:TEMP", "fmx": "XF:17ID2:CS700:TEMP", "nyx":"XF:19ID2:CS700:TEMP"}
+cryostreamTempPV = {"amx": "XF:17IDB-ES:AMX{CS:1}SAMPLE_TEMP_RBV", "fmx": "XF:17IDC-ES:FMX{CS:1}SAMPLE_TEMP_RBV"}
 
 VALID_EXP_TIMES = {
     "amx": {"min": 0.005, "max": 1, "digits": 3},
-    "fmx": {"min": 0.01, "max": 10, "digits": 3},
-    "nyx": {"min": 0.002, "max": 10, "digits": 4},
+    "fmx": {"min": 0.002, "max": 10, "digits": 3},
 }
 VALID_DET_DIST = {
     "amx": {"min": 100, "max": 500, "digits": 3},
-    "fmx": {"min": 137, "max": 2000, "digits": 2},
-    "nyx": {"min": 100, "max": 500, "digits": 3},
+    "fmx": {"min": 100, "max": 2000, "digits": 2},
 }
 VALID_TOTAL_EXP_TIMES = {
     "amx": {"min": 0.005, "max": 300, "digits": 3},
-    "fmx": {"min": 0.01, "max": 300, "digits": 3},
-    "nyx": {"min": 0.01, "max": 1000, "digits": 3},
+    "fmx": {"min": 0.002, "max": 300, "digits": 3},
 }
 VALID_PREFIX_LENGTH = 25  # TODO centralize with spreadsheet validation?
 VALID_PREFIX_NAME = "[0-9a-zA-Z-_]{0,%s}" % VALID_PREFIX_LENGTH
 VALID_TRANSMISSION = {
     "amx": {"min": 0.001, "max": 1.0, "digits": 3},
     "fmx": {"min": 0.001, "max": 1.0, "digits": 3},
-    "nyx": {"min": 0.001, "max": 0.999, "digits": 3},
 }
 
-MINIMUM_RASTER_SIZE = {"amx": 6, "fmx": 6, "nyx": 2}
+MINIMUM_RASTER_SIZE = {"amx": 6, "fmx": 6}
 
-LSDC_SERVICE_USERS = ("lsdc-amx", "lsdc-fmx", "lsdc-nyx")
+LSDC_SERVICE_USERS = ("lsdc-amx", "lsdc-fmx")
 IS_STAFF = (
     True
     if os.environ.get("STAFF_GROUP") is not None and os.environ["STAFF_GROUP"] in [grp.getgrgid(g).gr_name for g in os.getgroups()]
     else False
 )
 
-EMBL_SERVER_PV_BASE = {
-    "amx": "XF:17IDB-ES:AMX{EMBL}",
-    "fmx": "XF:17IDC-ES:FMX{EMBL}"
-}
+def get_current_cycle():
+    try:
+        cycle_r = requests.get(
+            f"{os.environ['NSLS2_API_URL']}/v1/facility/nsls2/cycles/current"
+        )
+        cycle_r.raise_for_status()
+        cycle = cycle_r.json().get("cycle")
+    except requests.exceptions.HTTPError:
+        return None
+    except KeyError:
+        return None
+    if cycle is None:
+        return None
+    return cycle
+
+CURRENT_CYCLE = get_current_cycle()
+
+EMBL_SERVER_PV_BASE = {"amx": "XF:17IDB-ES:AMX{EMBL}", "fmx": "XF:17IDC-ES:FMX{EMBL}"}
 
 BEAMSIZE_OPTIONS = {
     "S": ["V0", "H0"],
@@ -154,8 +169,6 @@ def get_text(cls, enum_value):
         }
         return text_values.get(enum_value, "\n(Unknown State)")
 
-OPHYD_COLLECTIONS = {"amx": False, "fmx": False, "nyx": True}
-
 class CollectionProtocols(str, Enum):
     STANDARD = "standard"
     RASTER = "raster"
@@ -176,7 +189,6 @@ def get_beamline_options(cls, beamline):
                          cls.STEP_RASTER, cls.STEP_VECTOR, cls.MULTI_COL, cls.CHARACTERIZE,
                          cls.EDNA_COL)
         beamline_options = {
-            "nyx": (cls.STANDARD, cls.RASTER, cls.VECTOR),
             "amx": all_protocols,
             "fmx": all_protocols
         }