Rename mxlibs3/ to aaredevices/

src/aaredaq/daq.py

@@ -33,7 +33,7 @@ from aaredaqlib.models import (
 from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem
 from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan
 from aaredaqlib.sample_geometry import SampleGeometryModel
-from mxlibs3.jfjoch import JFJochWrapper
+from aaredevices.jfjoch import JFJochWrapper
 
 logger = setup_logger("aareDAQ")
 

src/aaredaq/devices.py

@@ -5,16 +5,16 @@ from epics import PV
 from aaredaqlib.beamline import MXBeamline
 from aaredaqlib.coordinate import Coordinate
 from aaredaqlib.models import SampleCameraSettings, StagePositionEnum
-from mxlibs3 import aerotech, smargon
-from mxlibs3.area_detector import epicsAD
-from mxlibs3.enum_pv import EnumPv
-from mxlibs3.filter_transmission import FilterTransmission
-from mxlibs3.fluorimeter import Fluorimeter
-from mxlibs3.experimental_hutch_shutter import ExperimentalHutchShutter
-from mxlibs3.my_motor import MyMotor
-from mxlibs3.non_standard import NonStandard
-from mxlibs3.tell_client import TellClient
-from mxlibs3.workflow_tools import wait_position
+from aaredevices import aerotech, smargon
+from aaredevices.area_detector import epicsAD
+from aaredevices.enum_pv import EnumPv
+from aaredevices.filter_transmission import FilterTransmission
+from aaredevices.fluorimeter import Fluorimeter
+from aaredevices.experimental_hutch_shutter import ExperimentalHutchShutter
+from aaredevices.my_motor import MyMotor
+from aaredevices.non_standard import NonStandard
+from aaredevices.tell_client import TellClient
+from aaredevices.workflow_tools import wait_position
 
 class BeamlineDevices:
     def __init__(self, beamline: MXBeamline):

src/aaredaq/tellupdater.py

@@ -6,7 +6,7 @@ import requests
 import threading
 import time
 from aareDBclient.models import PuckWithTellPosition
-from mxlibs3.tell_client import TellClient
+from aaredevices.tell_client import TellClient
 from aaredb import AareWrapper  # Make sure the import path fits your project
 from aaredaqlib.beamline import MXBeamline
 

src/aaredaq/workflows.py

@@ -8,7 +8,7 @@ from aaredaq.config import BeamlineConfig
 from aaredaqlib.coordinate import Coordinate
 from aaredaqlib.logger_config import setup_logger
 from aaredaqlib.models import StagePositionEnum, SampleCameraSettings, ZoomModeEnum
-from mxlibs3.mx_lib import pv_wait
+from aaredevices.mx_lib import pv_wait
 
 logger = setup_logger("aareDAQ")
 

src/aaredevices/tell_client.py

@@ -20,7 +20,7 @@ from aareDBclient import (
     PuckWithTellPosition,
 )
 from aaredaqlib.beamline import MXBeamline  # noqa: F401
-from mxlibs3.pshell_client import PShellClient
+from aaredevices.pshell_client import PShellClient
 
 logger = setup_logger("aareDAQ")