From d580da1e8cf6180f83c29c0933baa2570e5276ae Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Thu, 15 Jan 2026 14:00:15 +0100 Subject: [PATCH] Rename mxlibs3/ to aaredevices/ --- src/aaredaq/daq.py | 2 +- src/aaredaq/devices.py | 20 +++++++++---------- src/aaredaq/tellupdater.py | 2 +- src/aaredaq/workflows.py | 2 +- src/{mxlibs3 => aaredevices}/__init__.py | 0 src/{mxlibs3 => aaredevices}/aerotech.py | 0 src/{mxlibs3 => aaredevices}/area_detector.py | 0 src/{mxlibs3 => aaredevices}/enum_pv.py | 0 .../experimental_hutch_shutter.py | 0 .../filter_transmission.py | 0 src/{mxlibs3 => aaredevices}/fluorimeter.py | 0 src/{mxlibs3 => aaredevices}/jfjoch.py | 0 src/{mxlibs3 => aaredevices}/mx_lib.py | 0 src/{mxlibs3 => aaredevices}/my_motor.py | 0 src/{mxlibs3 => aaredevices}/non_standard.py | 0 src/{mxlibs3 => aaredevices}/pshell_client.py | 0 src/{mxlibs3 => aaredevices}/smargon.py | 0 src/{mxlibs3 => aaredevices}/tell_client.py | 2 +- .../workflow_tools.py | 0 19 files changed, 14 insertions(+), 14 deletions(-) rename src/{mxlibs3 => aaredevices}/__init__.py (100%) rename src/{mxlibs3 => aaredevices}/aerotech.py (100%) rename src/{mxlibs3 => aaredevices}/area_detector.py (100%) rename src/{mxlibs3 => aaredevices}/enum_pv.py (100%) rename src/{mxlibs3 => aaredevices}/experimental_hutch_shutter.py (100%) rename src/{mxlibs3 => aaredevices}/filter_transmission.py (100%) rename src/{mxlibs3 => aaredevices}/fluorimeter.py (100%) rename src/{mxlibs3 => aaredevices}/jfjoch.py (100%) rename src/{mxlibs3 => aaredevices}/mx_lib.py (100%) rename src/{mxlibs3 => aaredevices}/my_motor.py (100%) rename src/{mxlibs3 => aaredevices}/non_standard.py (100%) rename src/{mxlibs3 => aaredevices}/pshell_client.py (100%) rename src/{mxlibs3 => aaredevices}/smargon.py (100%) rename src/{mxlibs3 => aaredevices}/tell_client.py (99%) rename src/{mxlibs3 => aaredevices}/workflow_tools.py (100%) diff --git a/src/aaredaq/daq.py b/src/aaredaq/daq.py index f9d95831..3e3e3933 100644 --- a/src/aaredaq/daq.py +++ b/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") diff --git a/src/aaredaq/devices.py b/src/aaredaq/devices.py index cdc1afc3..6e6b8fee 100644 --- a/src/aaredaq/devices.py +++ b/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): diff --git a/src/aaredaq/tellupdater.py b/src/aaredaq/tellupdater.py index d901320d..ea19edd0 100644 --- a/src/aaredaq/tellupdater.py +++ b/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 diff --git a/src/aaredaq/workflows.py b/src/aaredaq/workflows.py index a75028ea..2e58e076 100644 --- a/src/aaredaq/workflows.py +++ b/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") diff --git a/src/mxlibs3/__init__.py b/src/aaredevices/__init__.py similarity index 100% rename from src/mxlibs3/__init__.py rename to src/aaredevices/__init__.py diff --git a/src/mxlibs3/aerotech.py b/src/aaredevices/aerotech.py similarity index 100% rename from src/mxlibs3/aerotech.py rename to src/aaredevices/aerotech.py diff --git a/src/mxlibs3/area_detector.py b/src/aaredevices/area_detector.py similarity index 100% rename from src/mxlibs3/area_detector.py rename to src/aaredevices/area_detector.py diff --git a/src/mxlibs3/enum_pv.py b/src/aaredevices/enum_pv.py similarity index 100% rename from src/mxlibs3/enum_pv.py rename to src/aaredevices/enum_pv.py diff --git a/src/mxlibs3/experimental_hutch_shutter.py b/src/aaredevices/experimental_hutch_shutter.py similarity index 100% rename from src/mxlibs3/experimental_hutch_shutter.py rename to src/aaredevices/experimental_hutch_shutter.py diff --git a/src/mxlibs3/filter_transmission.py b/src/aaredevices/filter_transmission.py similarity index 100% rename from src/mxlibs3/filter_transmission.py rename to src/aaredevices/filter_transmission.py diff --git a/src/mxlibs3/fluorimeter.py b/src/aaredevices/fluorimeter.py similarity index 100% rename from src/mxlibs3/fluorimeter.py rename to src/aaredevices/fluorimeter.py diff --git a/src/mxlibs3/jfjoch.py b/src/aaredevices/jfjoch.py similarity index 100% rename from src/mxlibs3/jfjoch.py rename to src/aaredevices/jfjoch.py diff --git a/src/mxlibs3/mx_lib.py b/src/aaredevices/mx_lib.py similarity index 100% rename from src/mxlibs3/mx_lib.py rename to src/aaredevices/mx_lib.py diff --git a/src/mxlibs3/my_motor.py b/src/aaredevices/my_motor.py similarity index 100% rename from src/mxlibs3/my_motor.py rename to src/aaredevices/my_motor.py diff --git a/src/mxlibs3/non_standard.py b/src/aaredevices/non_standard.py similarity index 100% rename from src/mxlibs3/non_standard.py rename to src/aaredevices/non_standard.py diff --git a/src/mxlibs3/pshell_client.py b/src/aaredevices/pshell_client.py similarity index 100% rename from src/mxlibs3/pshell_client.py rename to src/aaredevices/pshell_client.py diff --git a/src/mxlibs3/smargon.py b/src/aaredevices/smargon.py similarity index 100% rename from src/mxlibs3/smargon.py rename to src/aaredevices/smargon.py diff --git a/src/mxlibs3/tell_client.py b/src/aaredevices/tell_client.py similarity index 99% rename from src/mxlibs3/tell_client.py rename to src/aaredevices/tell_client.py index 391a876d..73d29074 100755 --- a/src/mxlibs3/tell_client.py +++ b/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") diff --git a/src/mxlibs3/workflow_tools.py b/src/aaredevices/workflow_tools.py similarity index 100% rename from src/mxlibs3/workflow_tools.py rename to src/aaredevices/workflow_tools.py