mx/AareDAQ
0
1
Fork 0
Code Issues 49 Pull Requests Actions Packages Projects Releases 83 Wiki Activity

DAQ: updates to spreadhseet and tell updater

Browse Source
This commit is contained in:
appleb_m
2026-01-22 11:50:23 +01:00
parent 029c5eb1ee
commit 4fd81855a5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/daq/spreadsheetupdater.py
+2 -2
View File
@@ -3,9 +3,9 @@ import json
import websocket
import time
from aareDBclient.models import PuckWithTellPosition
from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, DewarAddress
from aare.common.models import SampleShortInfoList, SampleShortInfo, DewarAddress
from config import BeamlineConfig
from aaredaqlib.beamline import MXBeamline
from aare.common.beamline import MXBeamline
SLOT_IDENTIFIER = "X10SA"
WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/tell_runner/ws/samples-spreadsheet/{SLOT_IDENTIFIER}"
src/aare/daq/tellupdater.py
+11 -8
View File
@@ -5,21 +5,24 @@ import sseclient
import requests
import time
from aareDBclient.models import PuckWithTellPosition
#from mxlibs3.tell_client import TellClient
#from aaredb import AareWrapper # Make sure the import path fits your project
#from aaredaqlib.beamline import MXBeamline
#from aare.daq.spreadsheetupdater import SLOT_IDENTIFIER
from aare.devices.tell_client import TellClient
from aaredb import AareWrapper # Make sure the import path fits your project
from aare.common.beamline import MXBeamline, mx_beamline
# Configuration
#SLOT_IDENTIFIER = mx_beamline().value.upper()
SLOT_IDENTIFIER = "X10SA"
#WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
WS_URL = f"wss://localhost:8001/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
#WS_URL = f"wss://localhost:8001/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
WS_HEADERS = [f"X-Shared-Password: {os.getenv('AAREDB_SHARED_PASSWORD')}"]
print(WS_HEADERS)
# Initialize TELL client and DB wrapper
beamline = None #MXBeamline.X06DA # Use your beamline enum/value
tell_client = None #TellClient(bl=beamline)
aare_db = None #AareWrapper(bl=beamline)
beamline = mx_beamline() # Use your beamline enum/value
tell_client = TellClient(bl=beamline)
aare_db = AareWrapper(bl=beamline)
# Track current state
current_pucks = []