From b506542b012f496f3e7e401c5c7db82d56212559 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Thu, 15 Jan 2026 14:04:40 +0100 Subject: [PATCH] Change directory/package structure --- src/{aaredaq => aare}/__init__.py | 0 src/{aaredaqlib => aare/common}/__init__.py | 0 src/{aaredaqlib => aare/common}/beamline.py | 0 src/{aaredaqlib => aare/common}/coordinate.py | 0 .../common}/diffraction_geometry.py | 0 .../common}/face_detection.py | 5 +- src/{aaredaqlib => aare/common}/find_xtal.py | 7 ++- .../common}/logger_config.py | 0 src/{aaredaqlib => aare/common}/models.py | 10 ++-- .../common}/raster_grid.py | 4 +- .../common}/rotation_scan.py | 2 +- .../common}/sample_geometry.py | 2 +- src/{aaredevices => aare/daq}/__init__.py | 0 src/{aaredaq => aare/daq}/aaredb.py | 19 +++---- src/{aaredaq => aare/daq}/auth.py | 2 +- src/{aaredaq => aare/daq}/autofocus.py | 0 src/{aaredaq => aare/daq}/beamcenterfit.py | 0 src/{aaredaq => aare/daq}/config.py | 8 +-- src/{aaredaq => aare/daq}/daq.py | 36 ++++++------- src/{aaredaq => aare/daq}/devices.py | 26 +++++----- src/{aaredaq => aare/daq}/mlbox.py | 6 +-- src/{aaredaq => aare/daq}/server.py | 24 ++++----- .../daq}/spreadsheetupdater.py | 7 ++- src/{aaredaq => aare/daq}/tellupdater.py | 4 +- src/{aaredaq => aare/daq}/workflows.py | 14 ++--- src/{aaregui => aare/devices}/__init__.py | 0 src/{aaredevices => aare/devices}/aerotech.py | 2 +- .../devices}/area_detector.py | 0 src/{aaredevices => aare/devices}/enum_pv.py | 0 .../devices}/experimental_hutch_shutter.py | 2 +- .../devices}/filter_transmission.py | 2 +- .../devices}/fluorimeter.py | 6 +-- src/{aaredevices => aare/devices}/jfjoch.py | 9 ++-- src/{aaredevices => aare/devices}/mx_lib.py | 0 src/{aaredevices => aare/devices}/my_motor.py | 0 .../devices}/non_standard.py | 0 .../devices}/pshell_client.py | 0 src/{aaredevices => aare/devices}/smargon.py | 4 +- .../devices}/tell_client.py | 9 ++-- .../devices}/workflow_tools.py | 0 src/{aaregui/models => aare/gui}/__init__.py | 0 src/{aaregui => aare/gui}/auth.py | 4 +- src/{aaregui => aare/gui}/gui.py | 8 +-- src/{aaregui => aare/gui}/main_window.py | 51 +++++++++---------- .../panels => aare/gui/models}/__init__.py | 0 src/{aaregui => aare/gui}/models/bookmark.py | 2 +- .../gui}/models/sample_queue_model.py | 4 +- .../gui}/models/user_sample_model.py | 2 +- src/{aaregui => aare/gui}/panels/LogPanel.py | 4 +- .../gui/panels}/__init__.py | 0 .../gui}/panels/abr_tweak_panel.py | 10 ++-- .../gui}/panels/beam_center_panel.py | 6 +-- .../gui}/panels/beam_mark_panel.py | 4 +- .../gui}/panels/beam_size_panel.py | 6 +-- .../gui}/panels/beamline_controls.py | 21 ++++---- .../gui}/panels/beamline_state_panel.py | 2 +- .../gui}/panels/data_collection_settings.py | 22 ++++---- .../gui}/panels/face_detection_panel.py | 11 ++-- .../gui}/panels/file_path_panel.py | 7 ++- .../panels/fluorescence_data_collection.py | 4 +- .../gui}/panels/fluorescence_panel.py | 6 +-- .../gui}/panels/illumination_panel.py | 4 +- .../gui}/panels/loop_centering_panel.py | 2 +- .../gui}/panels/manual_sample_panel.py | 8 +-- .../gui}/panels/omega_panel.py | 8 +-- .../gui}/panels/raster_data_collection.py | 17 +++---- .../gui}/panels/reference_tools_panel.py | 10 ++-- .../gui}/panels/rotation_data_collection.py | 12 ++--- .../gui}/panels/samcam_panel.py | 6 +-- .../gui}/panels/sample_queue_panel.py | 12 ++--- .../gui}/panels/scan_settings_panel.py | 12 ++--- .../gui}/panels/smargon_panel.py | 12 ++--- .../gui}/panels/smart_rotation_panel.py | 12 ++--- .../gui}/panels/status_panel.py | 8 +-- .../gui}/panels/tell_sample_panel.py | 8 +-- .../gui}/panels/zoom_panel.py | 6 +-- .../gui/scan_logic}/__init__.py | 0 .../gui}/scan_logic/raster_grid_manager.py | 11 ++-- .../gui}/scan_logic/rotation_scan_manager.py | 2 +- .../gui}/scan_logic/sample_mount_logic.py | 2 +- .../widgets => aare/gui/threads}/__init__.py | 0 .../gui}/threads/axis_video_thread.py | 0 .../gui}/threads/camera_thread.py | 0 .../gui}/threads/daq_worker.py | 10 ++-- .../gui}/threads/jfjoch_viewer.py | 0 .../gui}/threads/sse_client.py | 2 - src/aare/gui/widgets/__init__.py | 0 .../gui}/widgets/button_with_payload.py | 0 .../gui}/widgets/camera_image.py | 12 ++--- .../gui}/widgets/clickable_label.py | 0 src/{aaregui => aare/gui}/widgets/login.py | 2 +- .../gui}/widgets/message_box.py | 2 +- .../gui}/widgets/no_wheel_scroll_area.py | 0 .../gui}/widgets/number_line_edit.py | 0 .../gui}/widgets/pgroup_dialog.py | 0 .../gui}/widgets/raster_grid_table.py | 3 +- .../gui}/widgets/status_bar.py | 12 ++--- .../gui}/widgets/status_label.py | 0 .../gui}/widgets/title_label.py | 0 .../gui}/widgets/value_label.py | 0 .../gui}/widgets/video_image.py | 0 101 files changed, 277 insertions(+), 302 deletions(-) rename src/{aaredaq => aare}/__init__.py (100%) rename src/{aaredaqlib => aare/common}/__init__.py (100%) rename src/{aaredaqlib => aare/common}/beamline.py (100%) rename src/{aaredaqlib => aare/common}/coordinate.py (100%) rename src/{aaredaqlib => aare/common}/diffraction_geometry.py (100%) rename src/{aaredaqlib => aare/common}/face_detection.py (97%) rename src/{aaredaqlib => aare/common}/find_xtal.py (98%) rename src/{aaredaqlib => aare/common}/logger_config.py (100%) rename src/{aaredaqlib => aare/common}/models.py (99%) rename src/{aaredaqlib => aare/common}/raster_grid.py (95%) rename src/{aaredaqlib => aare/common}/rotation_scan.py (91%) rename src/{aaredaqlib => aare/common}/sample_geometry.py (97%) rename src/{aaredevices => aare/daq}/__init__.py (100%) rename src/{aaredaq => aare/daq}/aaredb.py (97%) rename src/{aaredaq => aare/daq}/auth.py (98%) rename src/{aaredaq => aare/daq}/autofocus.py (100%) rename src/{aaredaq => aare/daq}/beamcenterfit.py (100%) rename src/{aaredaq => aare/daq}/config.py (99%) rename src/{aaredaq => aare/daq}/daq.py (98%) rename src/{aaredaq => aare/daq}/devices.py (94%) rename src/{aaredaq => aare/daq}/mlbox.py (98%) rename src/{aaredaq => aare/daq}/server.py (96%) rename src/{aaredaq => aare/daq}/spreadsheetupdater.py (95%) rename src/{aaredaq => aare/daq}/tellupdater.py (97%) rename src/{aaredaq => aare/daq}/workflows.py (96%) rename src/{aaregui => aare/devices}/__init__.py (100%) rename src/{aaredevices => aare/devices}/aerotech.py (99%) rename src/{aaredevices => aare/devices}/area_detector.py (100%) rename src/{aaredevices => aare/devices}/enum_pv.py (100%) rename src/{aaredevices => aare/devices}/experimental_hutch_shutter.py (95%) rename src/{aaredevices => aare/devices}/filter_transmission.py (97%) rename src/{aaredevices => aare/devices}/fluorimeter.py (97%) rename src/{aaredevices => aare/devices}/jfjoch.py (94%) rename src/{aaredevices => aare/devices}/mx_lib.py (100%) rename src/{aaredevices => aare/devices}/my_motor.py (100%) rename src/{aaredevices => aare/devices}/non_standard.py (100%) rename src/{aaredevices => aare/devices}/pshell_client.py (100%) rename src/{aaredevices => aare/devices}/smargon.py (97%) rename src/{aaredevices => aare/devices}/tell_client.py (99%) rename src/{aaredevices => aare/devices}/workflow_tools.py (100%) rename src/{aaregui/models => aare/gui}/__init__.py (100%) rename src/{aaregui => aare/gui}/auth.py (91%) rename src/{aaregui => aare/gui}/gui.py (96%) rename src/{aaregui => aare/gui}/main_window.py (93%) rename src/{aaregui/panels => aare/gui/models}/__init__.py (100%) rename src/{aaregui => aare/gui}/models/bookmark.py (92%) rename src/{aaregui => aare/gui}/models/sample_queue_model.py (96%) rename src/{aaregui => aare/gui}/models/user_sample_model.py (99%) rename src/{aaregui => aare/gui}/panels/LogPanel.py (85%) rename src/{aaregui/scan_logic => aare/gui/panels}/__init__.py (100%) rename src/{aaregui => aare/gui}/panels/abr_tweak_panel.py (95%) rename src/{aaregui => aare/gui}/panels/beam_center_panel.py (88%) rename src/{aaregui => aare/gui}/panels/beam_mark_panel.py (91%) rename src/{aaregui => aare/gui}/panels/beam_size_panel.py (88%) rename src/{aaregui => aare/gui}/panels/beamline_controls.py (70%) rename src/{aaregui => aare/gui}/panels/beamline_state_panel.py (93%) rename src/{aaregui => aare/gui}/panels/data_collection_settings.py (80%) rename src/{aaregui => aare/gui}/panels/face_detection_panel.py (93%) rename src/{aaregui => aare/gui}/panels/file_path_panel.py (98%) rename src/{aaregui => aare/gui}/panels/fluorescence_data_collection.py (93%) rename src/{aaregui => aare/gui}/panels/fluorescence_panel.py (98%) rename src/{aaregui => aare/gui}/panels/illumination_panel.py (91%) rename src/{aaregui => aare/gui}/panels/loop_centering_panel.py (93%) rename src/{aaregui => aare/gui}/panels/manual_sample_panel.py (94%) rename src/{aaregui => aare/gui}/panels/omega_panel.py (91%) rename src/{aaregui => aare/gui}/panels/raster_data_collection.py (94%) rename src/{aaregui => aare/gui}/panels/reference_tools_panel.py (97%) rename src/{aaregui => aare/gui}/panels/rotation_data_collection.py (96%) rename src/{aaregui => aare/gui}/panels/samcam_panel.py (92%) rename src/{aaregui => aare/gui}/panels/sample_queue_panel.py (96%) rename src/{aaregui => aare/gui}/panels/scan_settings_panel.py (95%) rename src/{aaregui => aare/gui}/panels/smargon_panel.py (91%) rename src/{aaregui => aare/gui}/panels/smart_rotation_panel.py (97%) rename src/{aaregui => aare/gui}/panels/status_panel.py (93%) rename src/{aaregui => aare/gui}/panels/tell_sample_panel.py (96%) rename src/{aaregui => aare/gui}/panels/zoom_panel.py (90%) rename src/{aaregui/threads => aare/gui/scan_logic}/__init__.py (100%) rename src/{aaregui => aare/gui}/scan_logic/raster_grid_manager.py (98%) rename src/{aaregui => aare/gui}/scan_logic/rotation_scan_manager.py (86%) rename src/{aaregui => aare/gui}/scan_logic/sample_mount_logic.py (87%) rename src/{aaregui/widgets => aare/gui/threads}/__init__.py (100%) rename src/{aaregui => aare/gui}/threads/axis_video_thread.py (100%) rename src/{aaregui => aare/gui}/threads/camera_thread.py (100%) rename src/{aaregui => aare/gui}/threads/daq_worker.py (98%) rename src/{aaregui => aare/gui}/threads/jfjoch_viewer.py (100%) rename src/{aaregui => aare/gui}/threads/sse_client.py (99%) create mode 100644 src/aare/gui/widgets/__init__.py rename src/{aaregui => aare/gui}/widgets/button_with_payload.py (100%) rename src/{aaregui => aare/gui}/widgets/camera_image.py (98%) rename src/{aaregui => aare/gui}/widgets/clickable_label.py (100%) rename src/{aaregui => aare/gui}/widgets/login.py (98%) rename src/{aaregui => aare/gui}/widgets/message_box.py (98%) rename src/{aaregui => aare/gui}/widgets/no_wheel_scroll_area.py (100%) rename src/{aaregui => aare/gui}/widgets/number_line_edit.py (100%) rename src/{aaregui => aare/gui}/widgets/pgroup_dialog.py (100%) rename src/{aaregui => aare/gui}/widgets/raster_grid_table.py (97%) rename src/{aaregui => aare/gui}/widgets/status_bar.py (97%) rename src/{aaregui => aare/gui}/widgets/status_label.py (100%) rename src/{aaregui => aare/gui}/widgets/title_label.py (100%) rename src/{aaregui => aare/gui}/widgets/value_label.py (100%) rename src/{aaregui => aare/gui}/widgets/video_image.py (100%) diff --git a/src/aaredaq/__init__.py b/src/aare/__init__.py similarity index 100% rename from src/aaredaq/__init__.py rename to src/aare/__init__.py diff --git a/src/aaredaqlib/__init__.py b/src/aare/common/__init__.py similarity index 100% rename from src/aaredaqlib/__init__.py rename to src/aare/common/__init__.py diff --git a/src/aaredaqlib/beamline.py b/src/aare/common/beamline.py similarity index 100% rename from src/aaredaqlib/beamline.py rename to src/aare/common/beamline.py diff --git a/src/aaredaqlib/coordinate.py b/src/aare/common/coordinate.py similarity index 100% rename from src/aaredaqlib/coordinate.py rename to src/aare/common/coordinate.py diff --git a/src/aaredaqlib/diffraction_geometry.py b/src/aare/common/diffraction_geometry.py similarity index 100% rename from src/aaredaqlib/diffraction_geometry.py rename to src/aare/common/diffraction_geometry.py diff --git a/src/aaredaqlib/face_detection.py b/src/aare/common/face_detection.py similarity index 97% rename from src/aaredaqlib/face_detection.py rename to src/aare/common/face_detection.py index af36e59d..363977bf 100644 --- a/src/aaredaqlib/face_detection.py +++ b/src/aare/common/face_detection.py @@ -1,12 +1,11 @@ import json import time -from typing import Tuple, Dict, List, Iterable, Optional +from typing import Tuple, Dict, List, Optional import numpy as np from scipy.optimize import curve_fit import statistics import math -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import MLBoxModel, MLOutputModel +from aare.common.logger_config import setup_logger logger = setup_logger("aareDAQ") diff --git a/src/aaredaqlib/find_xtal.py b/src/aare/common/find_xtal.py similarity index 98% rename from src/aaredaqlib/find_xtal.py rename to src/aare/common/find_xtal.py index a3328ac1..23468175 100644 --- a/src/aaredaqlib/find_xtal.py +++ b/src/aare/common/find_xtal.py @@ -3,10 +3,9 @@ from typing import List, Optional, Callable import numpy as np from scipy import ndimage -from aaredaqlib.coordinate import Coordinate -from aaredaqlib.models import CrystalSize -from aaredaqlib.raster_grid import RasterGridRequest, CenterOfMassModel -from aaredaqlib.logger_config import setup_logger +from aare.common.models import CrystalSize +from aare.common.raster_grid import RasterGridRequest, CenterOfMassModel +from aare.common.logger_config import setup_logger logger = setup_logger('aareDAQ') diff --git a/src/aaredaqlib/logger_config.py b/src/aare/common/logger_config.py similarity index 100% rename from src/aaredaqlib/logger_config.py rename to src/aare/common/logger_config.py diff --git a/src/aaredaqlib/models.py b/src/aare/common/models.py similarity index 99% rename from src/aaredaqlib/models.py rename to src/aare/common/models.py index aa10ea66..67a5273e 100644 --- a/src/aaredaqlib/models.py +++ b/src/aare/common/models.py @@ -3,16 +3,14 @@ import re from enum import Enum from typing import Annotated, Literal, Tuple, List, Optional -import numpy as np - from pydantic import BaseModel, Field, field_validator, AfterValidator -from aaredaqlib.coordinate import Coordinate, positive_coords -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.coordinate import Coordinate, positive_coords +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.sample_geometry import SampleGeometryModel from jfjoch_client.models.scan_result import ScanResult -from aaredaqlib.beamline import MXBeamline +from aare.common.beamline import MXBeamline class StagePositionEnum(Enum): MEASURE = 0 diff --git a/src/aaredaqlib/raster_grid.py b/src/aare/common/raster_grid.py similarity index 95% rename from src/aaredaqlib/raster_grid.py rename to src/aare/common/raster_grid.py index 05d32d80..7c4327ff 100644 --- a/src/aaredaqlib/raster_grid.py +++ b/src/aare/common/raster_grid.py @@ -5,8 +5,8 @@ import numpy as np from jfjoch_client.models.scan_result import ScanResult from pydantic import Field, AfterValidator, BaseModel -from aaredaqlib.coordinate import Coordinate, positive_coords, SmargonCoordinate -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.coordinate import Coordinate, positive_coords, SmargonCoordinate +from aare.common.sample_geometry import SampleGeometryModel class RasterGridRequest(BaseModel): diff --git a/src/aaredaqlib/rotation_scan.py b/src/aare/common/rotation_scan.py similarity index 91% rename from src/aaredaqlib/rotation_scan.py rename to src/aare/common/rotation_scan.py index 13885d12..471e7a9a 100644 --- a/src/aaredaqlib/rotation_scan.py +++ b/src/aare/common/rotation_scan.py @@ -1,7 +1,7 @@ from jfjoch_client.models.scan_result import ScanResult from pydantic import BaseModel -from aaredaqlib.coordinate import SmargonCoordinate +from aare.common.coordinate import SmargonCoordinate class RotationScanRequest(BaseModel): diff --git a/src/aaredaqlib/sample_geometry.py b/src/aare/common/sample_geometry.py similarity index 97% rename from src/aaredaqlib/sample_geometry.py rename to src/aare/common/sample_geometry.py index 2e27d56b..c9a4a473 100644 --- a/src/aaredaqlib/sample_geometry.py +++ b/src/aare/common/sample_geometry.py @@ -3,7 +3,7 @@ from typing import Annotated import numpy as np from pydantic import BaseModel, Field, AfterValidator -from aaredaqlib.coordinate import Coordinate, SmargonCoordinate, positive_coords +from aare.common.coordinate import Coordinate, SmargonCoordinate, positive_coords class SampleGeometryModel(BaseModel): diff --git a/src/aaredevices/__init__.py b/src/aare/daq/__init__.py similarity index 100% rename from src/aaredevices/__init__.py rename to src/aare/daq/__init__.py diff --git a/src/aaredaq/aaredb.py b/src/aare/daq/aaredb.py similarity index 97% rename from src/aaredaq/aaredb.py rename to src/aare/daq/aaredb.py index d432e180..295c8f4e 100644 --- a/src/aaredaq/aaredb.py +++ b/src/aare/daq/aaredb.py @@ -21,21 +21,18 @@ from aareDBclient import ( BeamlineParametersInput, ExperimentParametersCreate) -from aaredaqlib.coordinate import Coordinate -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import ( +from aare.common.coordinate import Coordinate +from aare.common.logger_config import setup_logger +from aare.common.models import ( SampleShortInfo, PuckLoadedInfo, - DewarAddress, - SampleShortInfoList, - DAQStatusModel, SessionStatus, ScanResultPayloadModel, + DAQStatusModel, ScanResultPayloadModel, ) -from aaredaqlib.beamline import MXBeamline -from aaredaqlib.raster_grid import RasterGridRequest, RasterPayloadModel, CenterOfMassModel -from aaredaqlib.rotation_scan import RotationScanRequest -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.beamline import MXBeamline +from aare.common.raster_grid import RasterGridRequest, RasterPayloadModel, CenterOfMassModel +from aare.common.rotation_scan import RotationScanRequest +from aare.common.sample_geometry import SampleGeometryModel from jfjoch_client.models import ScanResult diff --git a/src/aaredaq/auth.py b/src/aare/daq/auth.py similarity index 98% rename from src/aaredaq/auth.py rename to src/aare/daq/auth.py index e293f9ae..fa10e467 100644 --- a/src/aaredaq/auth.py +++ b/src/aare/daq/auth.py @@ -9,7 +9,7 @@ from fastapi import HTTPException, status from fastapi.security import OAuth2PasswordRequestForm from pydantic import BaseModel -from aaredaq.config import BeamlineConfig +from aare.aaredaq.config import BeamlineConfig if os.environ.get("JWT_AAREDAQ_KEY") is None: raise Exception("JWT_AAREDAQ_KEY environment variable not set, cannot guarantee safe authentication.") diff --git a/src/aaredaq/autofocus.py b/src/aare/daq/autofocus.py similarity index 100% rename from src/aaredaq/autofocus.py rename to src/aare/daq/autofocus.py diff --git a/src/aaredaq/beamcenterfit.py b/src/aare/daq/beamcenterfit.py similarity index 100% rename from src/aaredaq/beamcenterfit.py rename to src/aare/daq/beamcenterfit.py diff --git a/src/aaredaq/config.py b/src/aare/daq/config.py similarity index 99% rename from src/aaredaq/config.py rename to src/aare/daq/config.py index 8ca1743e..9bae85fd 100644 --- a/src/aaredaq/config.py +++ b/src/aare/daq/config.py @@ -6,8 +6,8 @@ from typing import Tuple, List import numpy as np import redis import redis_lock -from aaredaqlib.coordinate import Coordinate -from aaredaqlib.models import ( +from aare.common.coordinate import Coordinate +from aare.common.models import ( BeamlineSettingsModel, BeamMarkCoeffModel, ZoomModeEnum, @@ -18,8 +18,8 @@ from aaredaqlib.models import ( FluorescenceSpectrumOutputModel, CrystalSize, SimpleStrategyInputModel, SimpleScanParameters ) -from aaredaqlib.beamline import MXBeamline -from aaredaqlib.logger_config import setup_logger +from aare.common.beamline import MXBeamline +from aare.common.logger_config import setup_logger ABR_POS_ALIGN_DEF = Coordinate(x=-18, y=-0.266, z=0) ABR_POS_MOUNT = Coordinate(x=-18, y=0, z=0) diff --git a/src/aaredaq/daq.py b/src/aare/daq/daq.py similarity index 98% rename from src/aaredaq/daq.py rename to src/aare/daq/daq.py index 3e3e3933..b7dd572b 100644 --- a/src/aaredaq/daq.py +++ b/src/aare/daq/daq.py @@ -9,31 +9,31 @@ import cv2 import numpy as np import redis -import aaredaqlib.face_detection as fd -from aaredaq import workflows -from aaredaq.aaredb import AareWrapper -from aaredaq.autofocus import calculate_focus_measure -from aaredaq.config import BeamlineConfig, ABR_POS_MOUNT -from aaredaq.config import BeamlineStateEnum -from aaredaq.devices import BeamlineDevices -from aaredaq.mlbox import MlBox -from aaredaqlib.beamline import MXBeamline -from aaredaqlib.coordinate import Coordinate, SmargonCoordinate -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.find_xtal import raster_centre_of_mass, create_quality_filtered_array, identify_crystal_raster, \ +import aare.common.face_detection as fd +from aare.aaredaq import workflows +from aare.aaredaq.aaredb import AareWrapper +from aare.aaredaq.autofocus import calculate_focus_measure +from aare.aaredaq.config import BeamlineConfig, ABR_POS_MOUNT +from aare.aaredaq.config import BeamlineStateEnum +from aare.aaredaq.devices import BeamlineDevices +from aare.aaredaq.mlbox import MlBox +from aare.common.beamline import MXBeamline +from aare.common.coordinate import Coordinate, SmargonCoordinate +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.find_xtal import raster_centre_of_mass, create_quality_filtered_array, identify_crystal_raster, \ get_result_list_from_com, get_best_b_factor, get_best_res, get_xtal_size -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import ( +from aare.common.logger_config import setup_logger +from aare.common.models import ( SampleShortInfo, PuckLoadedInfo, SampleShortInfoList, DAQStatusModel, BeamlineStatus, SessionStatus, SampleCameraSettings, AutofocusSettings, ZoomModeEnum, CrystalSize, SimpleScanParameters, MLBoxModel, FluorescenceSpectrumParameterModel, FluorescenceSpectrumOutputModel) -from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem -from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan -from aaredaqlib.sample_geometry import SampleGeometryModel -from aaredevices.jfjoch import JFJochWrapper +from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem +from aare.common.rotation_scan import RotationScanRequest, CompletedRotationScan +from aare.common.sample_geometry import SampleGeometryModel +from aare.devices.jfjoch import JFJochWrapper logger = setup_logger("aareDAQ") diff --git a/src/aaredaq/devices.py b/src/aare/daq/devices.py similarity index 94% rename from src/aaredaq/devices.py rename to src/aare/daq/devices.py index 6e6b8fee..31e7420b 100644 --- a/src/aaredaq/devices.py +++ b/src/aare/daq/devices.py @@ -2,19 +2,19 @@ import time from epics import PV -from aaredaqlib.beamline import MXBeamline -from aaredaqlib.coordinate import Coordinate -from aaredaqlib.models import SampleCameraSettings, StagePositionEnum -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 +from aare.common.beamline import MXBeamline +from aare.common.coordinate import Coordinate +from aare.common.models import SampleCameraSettings, StagePositionEnum +from aare.devices import smargon, aerotech +from aare.devices.area_detector import epicsAD +from aare.devices.enum_pv import EnumPv +from aare.devices.filter_transmission import FilterTransmission +from aare.devices.fluorimeter import Fluorimeter +from aare.devices.experimental_hutch_shutter import ExperimentalHutchShutter +from aare.devices.my_motor import MyMotor +from aare.devices.non_standard import NonStandard +from aare.devices.tell_client import TellClient +from aare.devices.workflow_tools import wait_position class BeamlineDevices: def __init__(self, beamline: MXBeamline): diff --git a/src/aaredaq/mlbox.py b/src/aare/daq/mlbox.py similarity index 98% rename from src/aaredaq/mlbox.py rename to src/aare/daq/mlbox.py index 997cfe1f..e7c230f3 100644 --- a/src/aaredaq/mlbox.py +++ b/src/aare/daq/mlbox.py @@ -1,11 +1,11 @@ -from typing import Tuple, Optional, Iterable +from typing import Optional, Iterable import cv2 import requests -from aaredaqlib.models import MLBoxModel, MLOutputModel, MLBoxType, BoundingBoxModel -from aaredaqlib.logger_config import setup_logger +from aare.common.models import MLBoxModel, MLOutputModel, MLBoxType, BoundingBoxModel +from aare.common.logger_config import setup_logger logger=setup_logger("aareDAQ") diff --git a/src/aaredaq/server.py b/src/aare/daq/server.py similarity index 96% rename from src/aaredaq/server.py rename to src/aare/daq/server.py index 20d7fa62..c79061bd 100644 --- a/src/aaredaq/server.py +++ b/src/aare/daq/server.py @@ -6,26 +6,26 @@ import json import cv2 import urllib3 import uvicorn -from aaredaqlib.coordinate import SmargonCoordinate, Coordinate -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import SampleShortInfo, DAQStatusModel, BeamlineStateEnum, BeamlineSettingsModel, \ +from aare.common.coordinate import SmargonCoordinate, Coordinate +from aare.common.logger_config import setup_logger +from aare.common.models import SampleShortInfo, DAQStatusModel, BeamlineStateEnum, BeamlineSettingsModel, \ SampleShortInfoList, SessionStatus, SampleCameraSettings, AutofocusSettings, TokenData, \ CryojetSettingsModel, SimpleScanParameters, CrystalSize, FluorescenceSpectrumParameterModel, \ FluorescenceSpectrumOutputModel -from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid -from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid +from aare.common.rotation_scan import RotationScanRequest, CompletedRotationScan +from aare.common.sample_geometry import SampleGeometryModel from fastapi import FastAPI, Depends from fastapi import HTTPException from fastapi import status as api_status from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from starlette.responses import StreamingResponse -from aaredaq import auth -from aaredaqlib.beamline import mx_beamline -from aaredaq.config import BeamlineConfig -from aaredaq.daq import (AareDAQ, LoopCenteringFailed, TransformationInvalidException, - MountingFailed, WarningTellException, CriticalTellException) +from aare.aaredaq import auth +from aare.common.beamline import mx_beamline +from aare.aaredaq.config import BeamlineConfig +from aare.aaredaq.daq import (AareDAQ, LoopCenteringFailed, TransformationInvalidException, + MountingFailed, WarningTellException, CriticalTellException) app = FastAPI() @@ -713,7 +713,7 @@ def main(): urllib3.disable_warnings() # Run the application using uvicorn - uvicorn.run("aaredaq.server:app", host="0.0.0.0", port=5210, workers=4, log_config=LOGGING_CONFIG) + uvicorn.run("aare.daq.server:app", host="0.0.0.0", port=5210, workers=4, log_config=LOGGING_CONFIG) if __name__ == "__main__": diff --git a/src/aaredaq/spreadsheetupdater.py b/src/aare/daq/spreadsheetupdater.py similarity index 95% rename from src/aaredaq/spreadsheetupdater.py rename to src/aare/daq/spreadsheetupdater.py index 1303c2d9..380e97f1 100644 --- a/src/aaredaq/spreadsheetupdater.py +++ b/src/aare/daq/spreadsheetupdater.py @@ -2,11 +2,10 @@ import os import json import websocket import time -import signal -from aareDBclient.models import PuckWithTellPosition, DataCollectionParameters -from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, DewarAddress +from aareDBclient.models import PuckWithTellPosition +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 = "X06DA" WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/tell_runner/ws/samples-spreadsheet/{SLOT_IDENTIFIER}" diff --git a/src/aaredaq/tellupdater.py b/src/aare/daq/tellupdater.py similarity index 97% rename from src/aaredaq/tellupdater.py rename to src/aare/daq/tellupdater.py index ea19edd0..0653973e 100644 --- a/src/aaredaq/tellupdater.py +++ b/src/aare/daq/tellupdater.py @@ -6,9 +6,9 @@ import requests import threading import time from aareDBclient.models import PuckWithTellPosition -from aaredevices.tell_client import TellClient +from aare.devices.tell_client import TellClient from aaredb import AareWrapper # Make sure the import path fits your project -from aaredaqlib.beamline import MXBeamline +from aare.common.beamline import MXBeamline # Configuration SLOT_IDENTIFIER = "X06DA" diff --git a/src/aaredaq/workflows.py b/src/aare/daq/workflows.py similarity index 96% rename from src/aaredaq/workflows.py rename to src/aare/daq/workflows.py index 2e58e076..8e740cd3 100644 --- a/src/aaredaq/workflows.py +++ b/src/aare/daq/workflows.py @@ -2,13 +2,13 @@ import time from epics import poll -from aaredaq.config import ABR_POS_MOUNT, ABR_OMEGA_MOUNT -from aaredaq.devices import BeamlineDevices -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 aaredevices.mx_lib import pv_wait +from aare.aaredaq.config import ABR_POS_MOUNT, ABR_OMEGA_MOUNT +from aare.aaredaq.devices import BeamlineDevices +from aare.aaredaq.config import BeamlineConfig +from aare.common.coordinate import Coordinate +from aare.common.logger_config import setup_logger +from aare.common.models import StagePositionEnum, ZoomModeEnum +from aare.devices.mx_lib import pv_wait logger = setup_logger("aareDAQ") diff --git a/src/aaregui/__init__.py b/src/aare/devices/__init__.py similarity index 100% rename from src/aaregui/__init__.py rename to src/aare/devices/__init__.py diff --git a/src/aaredevices/aerotech.py b/src/aare/devices/aerotech.py similarity index 99% rename from src/aaredevices/aerotech.py rename to src/aare/devices/aerotech.py index 69291d2d..67e08190 100644 --- a/src/aaredevices/aerotech.py +++ b/src/aare/devices/aerotech.py @@ -108,7 +108,7 @@ import time from epics import PV, poll from epics.ca import pend_io -from aaredaqlib.beamline import MXBeamline +from aare.common.beamline import MXBeamline ABR_DONE = 0 ABR_READY = 1 diff --git a/src/aaredevices/area_detector.py b/src/aare/devices/area_detector.py similarity index 100% rename from src/aaredevices/area_detector.py rename to src/aare/devices/area_detector.py diff --git a/src/aaredevices/enum_pv.py b/src/aare/devices/enum_pv.py similarity index 100% rename from src/aaredevices/enum_pv.py rename to src/aare/devices/enum_pv.py diff --git a/src/aaredevices/experimental_hutch_shutter.py b/src/aare/devices/experimental_hutch_shutter.py similarity index 95% rename from src/aaredevices/experimental_hutch_shutter.py rename to src/aare/devices/experimental_hutch_shutter.py index 8800fc14..83526763 100644 --- a/src/aaredevices/experimental_hutch_shutter.py +++ b/src/aare/devices/experimental_hutch_shutter.py @@ -1,4 +1,4 @@ -from aaredaqlib.beamline import MXBeamline +from aare.common.beamline import MXBeamline from epics import PV class ExperimentalHutchShutter: diff --git a/src/aaredevices/filter_transmission.py b/src/aare/devices/filter_transmission.py similarity index 97% rename from src/aaredevices/filter_transmission.py rename to src/aare/devices/filter_transmission.py index 3c9c9e17..46dee47f 100644 --- a/src/aaredevices/filter_transmission.py +++ b/src/aare/devices/filter_transmission.py @@ -2,7 +2,7 @@ import time from epics import PV, poll -from aaredaqlib.beamline import MXBeamline +from aare.common.beamline import MXBeamline class FilterTransmission: diff --git a/src/aaredevices/fluorimeter.py b/src/aare/devices/fluorimeter.py similarity index 97% rename from src/aaredevices/fluorimeter.py rename to src/aare/devices/fluorimeter.py index 7b664729..ca5b298c 100644 --- a/src/aaredevices/fluorimeter.py +++ b/src/aare/devices/fluorimeter.py @@ -1,12 +1,10 @@ import time -from typing import Callable, cast from epics import PV, poll -from epics.ca import pend_io -from aaredaqlib.beamline import MXBeamline +from aare.common.beamline import MXBeamline -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareaDAQ") diff --git a/src/aaredevices/jfjoch.py b/src/aare/devices/jfjoch.py similarity index 94% rename from src/aaredevices/jfjoch.py rename to src/aare/devices/jfjoch.py index 6d106d19..a0fa1934 100644 --- a/src/aaredevices/jfjoch.py +++ b/src/aare/devices/jfjoch.py @@ -2,11 +2,10 @@ import math import jfjoch_client -from aaredaqlib.beamline import MXBeamline -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.models import SampleShortInfo, DAQStatusModel, FluorescenceSpectrumOutputModel -from aaredaqlib.raster_grid import RasterGridRequest -from aaredaqlib.rotation_scan import RotationScanRequest +from aare.common.beamline import MXBeamline +from aare.common.models import DAQStatusModel, FluorescenceSpectrumOutputModel +from aare.common.raster_grid import RasterGridRequest +from aare.common.rotation_scan import RotationScanRequest class JFJochWrapper: diff --git a/src/aaredevices/mx_lib.py b/src/aare/devices/mx_lib.py similarity index 100% rename from src/aaredevices/mx_lib.py rename to src/aare/devices/mx_lib.py diff --git a/src/aaredevices/my_motor.py b/src/aare/devices/my_motor.py similarity index 100% rename from src/aaredevices/my_motor.py rename to src/aare/devices/my_motor.py diff --git a/src/aaredevices/non_standard.py b/src/aare/devices/non_standard.py similarity index 100% rename from src/aaredevices/non_standard.py rename to src/aare/devices/non_standard.py diff --git a/src/aaredevices/pshell_client.py b/src/aare/devices/pshell_client.py similarity index 100% rename from src/aaredevices/pshell_client.py rename to src/aare/devices/pshell_client.py diff --git a/src/aaredevices/smargon.py b/src/aare/devices/smargon.py similarity index 97% rename from src/aaredevices/smargon.py rename to src/aare/devices/smargon.py index f40789e6..9d484f9e 100644 --- a/src/aaredevices/smargon.py +++ b/src/aare/devices/smargon.py @@ -3,8 +3,8 @@ from time import sleep, time import requests -from aaredaqlib.beamline import MXBeamline -from aaredaqlib.coordinate import SmargonCoordinate, Coordinate +from aare.common.beamline import MXBeamline +from aare.common.coordinate import SmargonCoordinate, Coordinate class SmargonMode(Enum): diff --git a/src/aaredevices/tell_client.py b/src/aare/devices/tell_client.py similarity index 99% rename from src/aaredevices/tell_client.py rename to src/aare/devices/tell_client.py index 73d29074..7abfeec2 100755 --- a/src/aaredevices/tell_client.py +++ b/src/aare/devices/tell_client.py @@ -1,5 +1,4 @@ import json -import logging import random import re import time @@ -8,8 +7,8 @@ from urllib.parse import urlparse import requests -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import ( +from aare.common.logger_config import setup_logger +from aare.common.models import ( PuckLoadedInfo, SampleShortInfo, DewarAddress, @@ -19,8 +18,8 @@ from aaredaqlib.models import ( from aareDBclient import ( PuckWithTellPosition, ) -from aaredaqlib.beamline import MXBeamline # noqa: F401 -from aaredevices.pshell_client import PShellClient +from aare.common.beamline import MXBeamline # noqa: F401 +from aare.devices.pshell_client import PShellClient logger = setup_logger("aareDAQ") diff --git a/src/aaredevices/workflow_tools.py b/src/aare/devices/workflow_tools.py similarity index 100% rename from src/aaredevices/workflow_tools.py rename to src/aare/devices/workflow_tools.py diff --git a/src/aaregui/models/__init__.py b/src/aare/gui/__init__.py similarity index 100% rename from src/aaregui/models/__init__.py rename to src/aare/gui/__init__.py diff --git a/src/aaregui/auth.py b/src/aare/gui/auth.py similarity index 91% rename from src/aaregui/auth.py rename to src/aare/gui/auth.py index b02bdea6..9b6cb104 100644 --- a/src/aaregui/auth.py +++ b/src/aare/gui/auth.py @@ -2,9 +2,9 @@ import os import jwt import requests -from aaredaqlib.models import TokenData +from aare.common.models import TokenData -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger('aareGUI') diff --git a/src/aaregui/gui.py b/src/aare/gui/gui.py similarity index 96% rename from src/aaregui/gui.py rename to src/aare/gui/gui.py index 8a0f4ad7..6a519555 100644 --- a/src/aaregui/gui.py +++ b/src/aare/gui/gui.py @@ -5,11 +5,11 @@ from PySide6.QtCore import QCommandLineParser, QCommandLineOption from PySide6.QtWidgets import QApplication, QMessageBox -from aaredaqlib.logger_config import setup_logger -from aaregui.main_window import MainWindow +from aare.common.logger_config import setup_logger +from aare.gui.main_window import MainWindow #from aaregui.widgets.login import LoginDialog -from aaredaqlib.beamline import MXBeamline, mx_beamline -from aaregui.auth import auth +from aare.common.beamline import MXBeamline, mx_beamline +from aare.gui.auth import auth logger = setup_logger("aareGUI") diff --git a/src/aaregui/main_window.py b/src/aare/gui/main_window.py similarity index 93% rename from src/aaregui/main_window.py rename to src/aare/gui/main_window.py index 4edf83ee..5b8202aa 100644 --- a/src/aaregui/main_window.py +++ b/src/aare/gui/main_window.py @@ -4,39 +4,38 @@ from PySide6.QtGui import QAction from PySide6.QtWidgets import ( QMainWindow, QWidget, - QSplitter, QHBoxLayout, QVBoxLayout, QMessageBox, QApplication, QDockWidget, QTabWidget) -from aaredaqlib.coordinate import Coordinate, SmargonCoordinate -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import SampleShortInfoList, TokenData, DAQStatusModel, BeamlineStateEnum -from aaredaqlib.sample_geometry import SampleGeometryModel -from aaregui.panels.LogPanel import LogDock +from aare.common.coordinate import Coordinate, SmargonCoordinate +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.logger_config import setup_logger +from aare.common.models import SampleShortInfoList, TokenData, DAQStatusModel, BeamlineStateEnum +from aare.common.sample_geometry import SampleGeometryModel +from aare.gui.panels.LogPanel import LogDock -from aaregui.panels.beamline_controls import BeamlineControls -from aaregui.panels.data_collection_settings import DataCollectionSettings -from aaregui.panels.manual_sample_panel import ManualSamplePanel -from aaregui.panels.reference_tools_panel import ReferenceToolsPanel -from aaregui.panels.sample_queue_panel import SampleQueuePanel -from aaregui.panels.tell_sample_panel import TellSamplePanel -from aaregui.panels.face_detection_panel import FaceDetectionPanel -from aaregui.scan_logic.raster_grid_manager import RasterGridManager -from aaregui.scan_logic.rotation_scan_manager import RotationScanManager -from aaregui.scan_logic.sample_mount_logic import SampleMountLogic -from aaregui.threads.axis_video_thread import VideoThread -from aaregui.threads.camera_thread import SampleCameraThread, PredictionSubscriber -from aaregui.threads.daq_worker import DAQWorker -from aaregui.threads.jfjoch_viewer import JFJochDBusClient -from aaregui.widgets.camera_image import SampleCameraImageLabel -from aaregui.widgets.no_wheel_scroll_area import NoWheelScrollArea -from aaregui.widgets.status_bar import StatusBar -from aaregui.widgets.video_image import VideoGraphicsView -from aaregui.panels.fluorescence_panel import FluorescencePanel +from aare.gui.panels import BeamlineControls +from aare.gui.panels import DataCollectionSettings +from aare.gui.panels.manual_sample_panel import ManualSamplePanel +from aare.gui.panels.reference_tools_panel import ReferenceToolsPanel +from aare.gui.panels import SampleQueuePanel +from aare.gui.panels.tell_sample_panel import TellSamplePanel +from aare.gui.panels.face_detection_panel import FaceDetectionPanel +from aare.gui.scan_logic import RasterGridManager +from aare.gui.scan_logic import RotationScanManager +from aare.gui.scan_logic import SampleMountLogic +from aare.gui.threads.axis_video_thread import VideoThread +from aare.gui.threads import SampleCameraThread, PredictionSubscriber +from aare.gui.threads import DAQWorker +from aare.gui.threads import JFJochDBusClient +from aare.gui.widgets.camera_image import SampleCameraImageLabel +from aare.gui.widgets.no_wheel_scroll_area import NoWheelScrollArea +from aare.gui.widgets.status_bar import StatusBar +from aare.gui.widgets import VideoGraphicsView +from aare.gui.panels.fluorescence_panel import FluorescencePanel logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/__init__.py b/src/aare/gui/models/__init__.py similarity index 100% rename from src/aaregui/panels/__init__.py rename to src/aare/gui/models/__init__.py diff --git a/src/aaregui/models/bookmark.py b/src/aare/gui/models/bookmark.py similarity index 92% rename from src/aaregui/models/bookmark.py rename to src/aare/gui/models/bookmark.py index eff95c59..39e265aa 100644 --- a/src/aaregui/models/bookmark.py +++ b/src/aare/gui/models/bookmark.py @@ -2,7 +2,7 @@ from typing import Literal from PySide6.QtGui import QColor -from aaredaqlib.coordinate import SmargonCoordinate +from aare.common.coordinate import SmargonCoordinate class SmargonBookmark: diff --git a/src/aaregui/models/sample_queue_model.py b/src/aare/gui/models/sample_queue_model.py similarity index 96% rename from src/aaregui/models/sample_queue_model.py rename to src/aare/gui/models/sample_queue_model.py index 58030236..2721e29f 100644 --- a/src/aaregui/models/sample_queue_model.py +++ b/src/aare/gui/models/sample_queue_model.py @@ -1,7 +1,7 @@ -from PySide6.QtCore import QAbstractTableModel, Qt, Slot +from PySide6.QtCore import QAbstractTableModel, Qt from PySide6.QtGui import QBrush, QColor -from aaredaqlib.models import SampleShortInfo, SampleShortInfoList +from aare.common.models import SampleShortInfo, SampleShortInfoList def get_entry(sample: SampleShortInfo, column: int): diff --git a/src/aaregui/models/user_sample_model.py b/src/aare/gui/models/user_sample_model.py similarity index 99% rename from src/aaregui/models/user_sample_model.py rename to src/aare/gui/models/user_sample_model.py index 71ebd782..7e6cef80 100644 --- a/src/aaregui/models/user_sample_model.py +++ b/src/aare/gui/models/user_sample_model.py @@ -3,7 +3,7 @@ import re from PySide6.QtCore import QAbstractTableModel, Qt, QMimeData from PySide6.QtGui import QBrush, QColor -from aaredaqlib.models import SampleShortInfo, SampleShortInfoList +from aare.common.models import SampleShortInfo, SampleShortInfoList def get_entry(sample: SampleShortInfo, column: int): diff --git a/src/aaregui/panels/LogPanel.py b/src/aare/gui/panels/LogPanel.py similarity index 85% rename from src/aaregui/panels/LogPanel.py rename to src/aare/gui/panels/LogPanel.py index 1a93ae77..9af0e920 100644 --- a/src/aaregui/panels/LogPanel.py +++ b/src/aare/gui/panels/LogPanel.py @@ -1,9 +1,9 @@ # Python -from PySide6.QtCore import Qt, Signal, QObject +from PySide6.QtCore import Qt from PySide6.QtWidgets import QDockWidget, QPlainTextEdit -from aaredaqlib.logger_config import QtLogEmitter, QtLogHandler, find_existing_formatter, attach_to_logger +from aare.common.logger_config import QtLogEmitter, QtLogHandler, find_existing_formatter, attach_to_logger class LogDock(QDockWidget): diff --git a/src/aaregui/scan_logic/__init__.py b/src/aare/gui/panels/__init__.py similarity index 100% rename from src/aaregui/scan_logic/__init__.py rename to src/aare/gui/panels/__init__.py diff --git a/src/aaregui/panels/abr_tweak_panel.py b/src/aare/gui/panels/abr_tweak_panel.py similarity index 95% rename from src/aaregui/panels/abr_tweak_panel.py rename to src/aare/gui/panels/abr_tweak_panel.py index e1434aa2..0654f7bb 100644 --- a/src/aaregui/panels/abr_tweak_panel.py +++ b/src/aare/gui/panels/abr_tweak_panel.py @@ -1,12 +1,12 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtGui import Qt from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton -from aaredaqlib.coordinate import Coordinate -from aaredaqlib.models import DAQStatusModel +from aare.common.coordinate import Coordinate +from aare.common.models import DAQStatusModel -from aaregui.widgets.button_with_payload import ButtonWithPayload -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets import ButtonWithPayload +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel DEFAULT_ABR_STEP_UM = 5 diff --git a/src/aaregui/panels/beam_center_panel.py b/src/aare/gui/panels/beam_center_panel.py similarity index 88% rename from src/aaregui/panels/beam_center_panel.py rename to src/aare/gui/panels/beam_center_panel.py index 3fd7c385..8309036d 100644 --- a/src/aaregui/panels/beam_center_panel.py +++ b/src/aare/gui/panels/beam_center_panel.py @@ -1,9 +1,9 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QLabel -from aaredaqlib.models import DAQStatusModel -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import DAQStatusModel +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel class BeamCenterWidget(QWidget): diff --git a/src/aaregui/panels/beam_mark_panel.py b/src/aare/gui/panels/beam_mark_panel.py similarity index 91% rename from src/aaregui/panels/beam_mark_panel.py rename to src/aare/gui/panels/beam_mark_panel.py index aeb4ef46..0d064db9 100644 --- a/src/aaregui/panels/beam_mark_panel.py +++ b/src/aare/gui/panels/beam_mark_panel.py @@ -1,8 +1,8 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton, QLabel -from aaredaqlib.models import DAQStatusModel -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import DAQStatusModel +from aare.gui.widgets.title_label import TitleLabel class BeamMarkWidget(QWidget): diff --git a/src/aaregui/panels/beam_size_panel.py b/src/aare/gui/panels/beam_size_panel.py similarity index 88% rename from src/aaregui/panels/beam_size_panel.py rename to src/aare/gui/panels/beam_size_panel.py index 59fd54cd..330cf66d 100644 --- a/src/aaregui/panels/beam_size_panel.py +++ b/src/aare/gui/panels/beam_size_panel.py @@ -1,9 +1,9 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QLabel -from aaredaqlib.models import DAQStatusModel -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import DAQStatusModel +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel class BeamSizeWidget(QWidget): diff --git a/src/aaregui/panels/beamline_controls.py b/src/aare/gui/panels/beamline_controls.py similarity index 70% rename from src/aaregui/panels/beamline_controls.py rename to src/aare/gui/panels/beamline_controls.py index 187f33f8..ec79a0e7 100644 --- a/src/aaregui/panels/beamline_controls.py +++ b/src/aare/gui/panels/beamline_controls.py @@ -1,16 +1,15 @@ from PySide6.QtWidgets import QFrame, QVBoxLayout -from aaregui.panels.abr_tweak_panel import AbrTweakWidget -from aaregui.panels.beam_center_panel import BeamCenterWidget -from aaregui.panels.beam_mark_panel import BeamMarkWidget -from aaregui.panels.beam_size_panel import BeamSizeWidget -from aaregui.panels.beamline_state_panel import BeamlineStatePanel -from aaregui.panels.illumination_panel import IlluminationPanel -from aaregui.panels.loop_centering_panel import LoopCenteringPanel -from aaregui.panels.omega_panel import OmegaPanel -from aaregui.panels.samcam_panel import SamcamPanel -from aaregui.panels.smargon_panel import SmargonPanel -from aaregui.panels.zoom_panel import ZoomPanel +from aare.gui.panels import AbrTweakWidget +from aare.gui.panels import BeamCenterWidget +from aare.gui.panels import BeamMarkWidget +from aare.gui.panels import BeamSizeWidget +from aare.gui.panels import IlluminationPanel +from aare.gui.panels.loop_centering_panel import LoopCenteringPanel +from aare.gui.panels.omega_panel import OmegaPanel +from aare.gui.panels.samcam_panel import SamcamPanel +from aare.gui.panels.smargon_panel import SmargonPanel +from aare.gui.panels.zoom_panel import ZoomPanel class BeamlineControls(QFrame): diff --git a/src/aaregui/panels/beamline_state_panel.py b/src/aare/gui/panels/beamline_state_panel.py similarity index 93% rename from src/aaregui/panels/beamline_state_panel.py rename to src/aare/gui/panels/beamline_state_panel.py index 12064bff..1928f630 100644 --- a/src/aaregui/panels/beamline_state_panel.py +++ b/src/aare/gui/panels/beamline_state_panel.py @@ -1,6 +1,6 @@ from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets.title_label import TitleLabel class BeamlineStatePanel(QWidget): diff --git a/src/aaregui/panels/data_collection_settings.py b/src/aare/gui/panels/data_collection_settings.py similarity index 80% rename from src/aaregui/panels/data_collection_settings.py rename to src/aare/gui/panels/data_collection_settings.py index b89d695c..59ee2ad8 100644 --- a/src/aaregui/panels/data_collection_settings.py +++ b/src/aare/gui/panels/data_collection_settings.py @@ -3,23 +3,19 @@ from PySide6.QtWidgets import ( QFrame, QVBoxLayout, QTabWidget, - QGridLayout, QPushButton, - QWidget, ) -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.models import DAQStatusModel -from aaredaqlib.rotation_scan import RotationScanRequest -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.models import DAQStatusModel +from aare.common.sample_geometry import SampleGeometryModel -from aaregui.panels.file_path_panel import FilePathPanel -from aaregui.panels.fluorescence_data_collection import FluorescenceDataCollectionPanel -from aaregui.panels.raster_data_collection import RasterDataCollectionPanel -from aaregui.panels.rotation_data_collection import RotationDataCollectionPanel -from aaregui.panels.smart_rotation_panel import SimpleRotationSettingsPanel -from aaregui.scan_logic.raster_grid_manager import RasterGridManager -from aaregui.widgets.title_label import TitleLabel +from aare.gui.panels.file_path_panel import FilePathPanel +from aare.gui.panels.fluorescence_data_collection import FluorescenceDataCollectionPanel +from aare.gui.panels.raster_data_collection import RasterDataCollectionPanel +from aare.gui.panels.rotation_data_collection import RotationDataCollectionPanel +from aare.gui.panels import SimpleRotationSettingsPanel +from aare.gui.scan_logic import RasterGridManager class DataCollectionSettings(QFrame): diff --git a/src/aaregui/panels/face_detection_panel.py b/src/aare/gui/panels/face_detection_panel.py similarity index 93% rename from src/aaregui/panels/face_detection_panel.py rename to src/aare/gui/panels/face_detection_panel.py index 9721e83c..be7eba7b 100644 --- a/src/aaregui/panels/face_detection_panel.py +++ b/src/aare/gui/panels/face_detection_panel.py @@ -1,15 +1,14 @@ # Python -from PySide6.QtCore import Slot, Qt, Signal -from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QFrame, QPushButton, QSpacerItem, QSizePolicy, QVBoxLayout, \ - QHBoxLayout +from PySide6.QtCore import Signal +from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QVBoxLayout from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas from matplotlib.figure import Figure import numpy as np -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/file_path_panel.py b/src/aare/gui/panels/file_path_panel.py similarity index 98% rename from src/aaregui/panels/file_path_panel.py rename to src/aare/gui/panels/file_path_panel.py index 89c69eae..8af17c42 100644 --- a/src/aaregui/panels/file_path_panel.py +++ b/src/aare/gui/panels/file_path_panel.py @@ -1,13 +1,12 @@ -import copy import os from datetime import datetime from pathlib import Path from PySide6.QtCore import Signal, Slot, Qt -from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QLineEdit, QSpinBox, QCheckBox, QMessageBox +from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QLineEdit, QSpinBox, QMessageBox -from aaredaqlib.models import SampleShortInfo, DAQStatusModel -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import SampleShortInfo, DAQStatusModel +from aare.gui.widgets.title_label import TitleLabel ## Logic for filenames: ## 1. For rasters 'raster/' subfolder is added at the top level of the path (managed by DAQ) - e.g. raster/20250101/PX-456/01/dataset diff --git a/src/aaregui/panels/fluorescence_data_collection.py b/src/aare/gui/panels/fluorescence_data_collection.py similarity index 93% rename from src/aaregui/panels/fluorescence_data_collection.py rename to src/aare/gui/panels/fluorescence_data_collection.py index bf112e50..b7180b33 100644 --- a/src/aaregui/panels/fluorescence_data_collection.py +++ b/src/aare/gui/panels/fluorescence_data_collection.py @@ -1,8 +1,8 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QCheckBox -from aaredaqlib.models import FluorescenceSpectrumParameterModel -from aaregui.widgets.number_line_edit import NumberLineEdit +from aare.common.models import FluorescenceSpectrumParameterModel +from aare.gui.widgets import NumberLineEdit class FluorescenceDataCollectionPanel(QWidget): diff --git a/src/aaregui/panels/fluorescence_panel.py b/src/aare/gui/panels/fluorescence_panel.py similarity index 98% rename from src/aaregui/panels/fluorescence_panel.py rename to src/aare/gui/panels/fluorescence_panel.py index d977543a..a5849ee5 100644 --- a/src/aaregui/panels/fluorescence_panel.py +++ b/src/aare/gui/panels/fluorescence_panel.py @@ -1,11 +1,11 @@ import numpy as np from PySide6.QtCharts import QChart, QChartView, QLineSeries, QValueAxis -from PySide6.QtCore import QPointF, Qt, Slot, Signal, QEvent +from PySide6.QtCore import QPointF, Qt, Slot, QEvent from PySide6.QtGui import QPainter, QColor, QPen from PySide6.QtWidgets import QWidget, QGridLayout, QGraphicsSimpleTextItem, QLabel -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import FluorescenceSpectrumOutputModel, DAQStatusModel +from aare.common.logger_config import setup_logger +from aare.common.models import FluorescenceSpectrumOutputModel, DAQStatusModel logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/illumination_panel.py b/src/aare/gui/panels/illumination_panel.py similarity index 91% rename from src/aaregui/panels/illumination_panel.py rename to src/aare/gui/panels/illumination_panel.py index ce441fad..2fb84eee 100644 --- a/src/aaregui/panels/illumination_panel.py +++ b/src/aare/gui/panels/illumination_panel.py @@ -1,8 +1,8 @@ from PySide6.QtCore import Qt, Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QSlider -from aaredaqlib.models import DAQStatusModel +from aare.common.models import DAQStatusModel -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets.title_label import TitleLabel class IlluminationPanel(QWidget): diff --git a/src/aaregui/panels/loop_centering_panel.py b/src/aare/gui/panels/loop_centering_panel.py similarity index 93% rename from src/aaregui/panels/loop_centering_panel.py rename to src/aare/gui/panels/loop_centering_panel.py index 18199693..41de4548 100644 --- a/src/aaregui/panels/loop_centering_panel.py +++ b/src/aare/gui/panels/loop_centering_panel.py @@ -1,6 +1,6 @@ from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets.title_label import TitleLabel class LoopCenteringPanel(QWidget): diff --git a/src/aaregui/panels/manual_sample_panel.py b/src/aare/gui/panels/manual_sample_panel.py similarity index 94% rename from src/aaregui/panels/manual_sample_panel.py rename to src/aare/gui/panels/manual_sample_panel.py index 5dce6884..6b669f74 100644 --- a/src/aaregui/panels/manual_sample_panel.py +++ b/src/aare/gui/panels/manual_sample_panel.py @@ -1,10 +1,10 @@ from PySide6.QtCore import Signal, Slot -from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QTextEdit, QPushButton, QCheckBox, QLineEdit +from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QCheckBox, QLineEdit from aareDBclient import DataCollectionParameters -from aaredaqlib.models import SampleShortInfo, DAQStatusModel -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import SampleShortInfo, DAQStatusModel +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel class ManualSamplePanel(QWidget): diff --git a/src/aaregui/panels/omega_panel.py b/src/aare/gui/panels/omega_panel.py similarity index 91% rename from src/aaregui/panels/omega_panel.py rename to src/aare/gui/panels/omega_panel.py index 566770b0..38a8a8d2 100644 --- a/src/aaregui/panels/omega_panel.py +++ b/src/aare/gui/panels/omega_panel.py @@ -1,10 +1,10 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QHBoxLayout -from aaredaqlib.models import DAQStatusModel +from aare.common.models import DAQStatusModel -from aaregui.widgets.button_with_payload import ButtonWithPayload -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets import ButtonWithPayload +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel class OmegaEntryWidget(QWidget): diff --git a/src/aaregui/panels/raster_data_collection.py b/src/aare/gui/panels/raster_data_collection.py similarity index 94% rename from src/aaregui/panels/raster_data_collection.py rename to src/aare/gui/panels/raster_data_collection.py index 0e083f62..40bdda9b 100644 --- a/src/aaregui/panels/raster_data_collection.py +++ b/src/aare/gui/panels/raster_data_collection.py @@ -1,14 +1,13 @@ from PySide6.QtCore import Signal, Slot, Qt -from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QSizePolicy, QSpacerItem, QPushButton, QHBoxLayout, \ - QComboBox, QSlider, QMessageBox +from PySide6.QtWidgets import QLabel, QSizePolicy, QSpacerItem, QPushButton, QComboBox, QSlider, QMessageBox -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.models import DAQStatusModel, BeamlineStateEnum -from aaregui.panels.scan_settings_panel import ScanSettingsPanel -from aaregui.scan_logic.raster_grid_manager import RasterGridManager, RasterGridMetric -from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit -from aaregui.widgets.raster_grid_table import RasterGridTable -from aaredaqlib.logger_config import setup_logger +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.models import DAQStatusModel, BeamlineStateEnum +from aare.gui.panels import ScanSettingsPanel +from aare.gui.scan_logic import RasterGridManager, RasterGridMetric +from aare.gui.widgets import CheckedLineEdit +from aare.gui.widgets.raster_grid_table import RasterGridTable +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/reference_tools_panel.py b/src/aare/gui/panels/reference_tools_panel.py similarity index 97% rename from src/aaregui/panels/reference_tools_panel.py rename to src/aare/gui/panels/reference_tools_panel.py index 59fd5c80..b21807b4 100644 --- a/src/aaregui/panels/reference_tools_panel.py +++ b/src/aare/gui/panels/reference_tools_panel.py @@ -1,7 +1,7 @@ # reference_tools_panel.py -from typing import Callable, List, Dict, Optional +from typing import Optional -from PySide6.QtCore import Qt, QAbstractTableModel, QModelIndex, QTimer, Slot, Signal +from PySide6.QtCore import Qt, QAbstractTableModel, QModelIndex, Slot, Signal from PySide6.QtGui import QBrush, QColor from PySide6.QtWidgets import ( QFrame, @@ -14,9 +14,9 @@ from PySide6.QtWidgets import ( QAbstractItemView, ) -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, BeamlineStateEnum, DAQStatusModel -from aaregui.widgets.title_label import TitleLabel +from aare.common.logger_config import setup_logger +from aare.common.models import SampleShortInfoList, SampleShortInfo, DAQStatusModel +from aare.gui.widgets.title_label import TitleLabel logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/rotation_data_collection.py b/src/aare/gui/panels/rotation_data_collection.py similarity index 96% rename from src/aaregui/panels/rotation_data_collection.py rename to src/aare/gui/panels/rotation_data_collection.py index 5e951ad9..c0ecd232 100644 --- a/src/aaregui/panels/rotation_data_collection.py +++ b/src/aare/gui/panels/rotation_data_collection.py @@ -3,12 +3,12 @@ from pathlib import Path from PySide6.QtCore import Slot, Signal, Qt from PySide6.QtWidgets import QLabel, QComboBox, QPushButton, QMessageBox -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import DAQStatusModel, BeamlineStateEnum -from aaredaqlib.rotation_scan import RotationScanRequest -from aaregui.panels.scan_settings_panel import ScanSettingsPanel -from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.logger_config import setup_logger +from aare.common.models import DAQStatusModel, BeamlineStateEnum +from aare.common.rotation_scan import RotationScanRequest +from aare.gui.panels import ScanSettingsPanel +from aare.gui.widgets import NumberLineEdit, CheckedLineEdit logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/samcam_panel.py b/src/aare/gui/panels/samcam_panel.py similarity index 92% rename from src/aaregui/panels/samcam_panel.py rename to src/aare/gui/panels/samcam_panel.py index abeebc78..174f911d 100644 --- a/src/aaregui/panels/samcam_panel.py +++ b/src/aare/gui/panels/samcam_panel.py @@ -1,8 +1,8 @@ -from PySide6.QtWidgets import QWidget, QSpinBox, QVBoxLayout, QHBoxLayout, QLabel, QDoubleSpinBox, QCheckBox +from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, QDoubleSpinBox, QCheckBox from PySide6.QtCore import Signal, Slot -from aaredaqlib.models import SampleCameraSettings, DAQStatusModel -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import SampleCameraSettings, DAQStatusModel +from aare.gui.widgets.title_label import TitleLabel class SamcamPanel(QWidget): diff --git a/src/aaregui/panels/sample_queue_panel.py b/src/aare/gui/panels/sample_queue_panel.py similarity index 96% rename from src/aaregui/panels/sample_queue_panel.py rename to src/aare/gui/panels/sample_queue_panel.py index b52b4157..3bfab65e 100644 --- a/src/aaregui/panels/sample_queue_panel.py +++ b/src/aare/gui/panels/sample_queue_panel.py @@ -2,15 +2,15 @@ from PySide6.QtCore import Signal, Slot, Qt, QTimer from PySide6.QtWidgets import QFrame, QVBoxLayout, QHBoxLayout, QPushButton, QHeaderView, QSizePolicy, \ QTableView, QMessageBox from PySide6.QtGui import QKeySequence, QShortcut -from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, BeamlineStateEnum +from aare.common.models import SampleShortInfoList, SampleShortInfo, BeamlineStateEnum -from aaregui.models.sample_queue_model import SampleQueueSpreadsheet -from aaregui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check, LOW_CURRENT_THRESHOLD, \ +from aare.gui.models import SampleQueueSpreadsheet +from aare.gui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check, LOW_CURRENT_THRESHOLD, \ ring_current_auto_check -from aaregui.widgets.title_label import TitleLabel -from aaredaqlib.models import DAQStatusModel +from aare.gui.widgets.title_label import TitleLabel +from aare.common.models import DAQStatusModel -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/scan_settings_panel.py b/src/aare/gui/panels/scan_settings_panel.py similarity index 95% rename from src/aaregui/panels/scan_settings_panel.py rename to src/aare/gui/panels/scan_settings_panel.py index 4816ee5a..f67235e3 100644 --- a/src/aaregui/panels/scan_settings_panel.py +++ b/src/aare/gui/panels/scan_settings_panel.py @@ -1,11 +1,11 @@ from PySide6.QtCore import Slot, Signal -from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QFrame, QPushButton, QMessageBox +from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton -from aaredaqlib.diffraction_geometry import DiffractionGeometry -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import DAQStatusModel -from aaregui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check -from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit +from aare.common.diffraction_geometry import DiffractionGeometry +from aare.common.logger_config import setup_logger +from aare.common.models import DAQStatusModel +from aare.gui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check +from aare.gui.widgets import CheckedLineEdit logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/smargon_panel.py b/src/aare/gui/panels/smargon_panel.py similarity index 91% rename from src/aaregui/panels/smargon_panel.py rename to src/aare/gui/panels/smargon_panel.py index 571a9cef..0bf70a79 100644 --- a/src/aaregui/panels/smargon_panel.py +++ b/src/aare/gui/panels/smargon_panel.py @@ -1,12 +1,12 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton -from aaredaqlib.models import DAQStatusModel -from aaregui.widgets.button_with_payload import ButtonWithPayload -from aaregui.widgets.number_line_edit import NumberLineEdit -from aaregui.widgets.title_label import TitleLabel -from aaredaqlib.coordinate import SmargonCoordinate, Coordinate -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.models import DAQStatusModel +from aare.gui.widgets import ButtonWithPayload +from aare.gui.widgets import NumberLineEdit +from aare.gui.widgets.title_label import TitleLabel +from aare.common.coordinate import SmargonCoordinate, Coordinate +from aare.common.sample_geometry import SampleGeometryModel class SmargonMoveWidget(QWidget): diff --git a/src/aaregui/panels/smart_rotation_panel.py b/src/aare/gui/panels/smart_rotation_panel.py similarity index 97% rename from src/aaregui/panels/smart_rotation_panel.py rename to src/aare/gui/panels/smart_rotation_panel.py index 08c0c90d..4b6222c2 100644 --- a/src/aaregui/panels/smart_rotation_panel.py +++ b/src/aare/gui/panels/smart_rotation_panel.py @@ -1,13 +1,13 @@ import math from PySide6.QtCore import Slot, Qt, Signal -from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QFrame, QPushButton, QSpacerItem, QSizePolicy +from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QSpacerItem, QSizePolicy -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import DAQStatusModel, SimpleScanParameters, CrystalSize -from aaredaqlib.rotation_scan import RotationScanRequest -from aaregui.panels.rotation_data_collection import add_data_to_path -from aaregui.widgets.number_line_edit import NumberLineEdit +from aare.common.logger_config import setup_logger +from aare.common.models import DAQStatusModel, SimpleScanParameters, CrystalSize +from aare.common.rotation_scan import RotationScanRequest +from aare.gui.panels.rotation_data_collection import add_data_to_path +from aare.gui.widgets import NumberLineEdit logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/status_panel.py b/src/aare/gui/panels/status_panel.py similarity index 93% rename from src/aaregui/panels/status_panel.py rename to src/aare/gui/panels/status_panel.py index f37c3906..67051080 100644 --- a/src/aaregui/panels/status_panel.py +++ b/src/aare/gui/panels/status_panel.py @@ -1,11 +1,11 @@ from PySide6.QtCore import Qt, Slot from PySide6.QtGui import QPixmap from PySide6.QtWidgets import QFrame, QGridLayout, QLabel, QSpacerItem, QSizePolicy -from aaredaqlib.models import DAQStatusModel -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.models import DAQStatusModel +from aare.common.sample_geometry import SampleGeometryModel -from aaregui.widgets.status_label import StatusLabel -from aaregui.widgets.title_label import TitleLabel +from aare.gui.widgets.status_label import StatusLabel +from aare.gui.widgets.title_label import TitleLabel class StatusPanel(QFrame): diff --git a/src/aaregui/panels/tell_sample_panel.py b/src/aare/gui/panels/tell_sample_panel.py similarity index 96% rename from src/aaregui/panels/tell_sample_panel.py rename to src/aare/gui/panels/tell_sample_panel.py index 9984bcf7..fce011fd 100644 --- a/src/aaregui/panels/tell_sample_panel.py +++ b/src/aare/gui/panels/tell_sample_panel.py @@ -10,11 +10,11 @@ from PySide6.QtWidgets import ( QAbstractItemView, ) -from aaredaqlib.logger_config import setup_logger -from aaredaqlib.models import BeamlineStateEnum, SampleShortInfo, SampleShortInfoList, DAQStatusModel +from aare.common.logger_config import setup_logger +from aare.common.models import BeamlineStateEnum, SampleShortInfo, SampleShortInfoList, DAQStatusModel -from aaregui.models.user_sample_model import UserSampleSpreadsheet -from aaregui.widgets.title_label import TitleLabel +from aare.gui.models.user_sample_model import UserSampleSpreadsheet +from aare.gui.widgets.title_label import TitleLabel logger = setup_logger("aareGUI") diff --git a/src/aaregui/panels/zoom_panel.py b/src/aare/gui/panels/zoom_panel.py similarity index 90% rename from src/aaregui/panels/zoom_panel.py rename to src/aare/gui/panels/zoom_panel.py index f5009049..0fbae60d 100644 --- a/src/aaregui/panels/zoom_panel.py +++ b/src/aare/gui/panels/zoom_panel.py @@ -1,9 +1,9 @@ from PySide6.QtCore import Slot, Signal from PySide6.QtWidgets import QWidget, QGridLayout -from aaredaqlib.models import DAQStatusModel -from aaregui.widgets.button_with_payload import ButtonWithPayload -from aaregui.widgets.title_label import TitleLabel +from aare.common.models import DAQStatusModel +from aare.gui.widgets import ButtonWithPayload +from aare.gui.widgets.title_label import TitleLabel class ZoomPanel(QWidget): diff --git a/src/aaregui/threads/__init__.py b/src/aare/gui/scan_logic/__init__.py similarity index 100% rename from src/aaregui/threads/__init__.py rename to src/aare/gui/scan_logic/__init__.py diff --git a/src/aaregui/scan_logic/raster_grid_manager.py b/src/aare/gui/scan_logic/raster_grid_manager.py similarity index 98% rename from src/aaregui/scan_logic/raster_grid_manager.py rename to src/aare/gui/scan_logic/raster_grid_manager.py index 73271c63..3ce894a9 100644 --- a/src/aaregui/scan_logic/raster_grid_manager.py +++ b/src/aare/gui/scan_logic/raster_grid_manager.py @@ -1,4 +1,3 @@ -import copy import math from enum import Enum @@ -7,12 +6,12 @@ from PySide6.QtGui import QPainter, QPen, QColor, QBrush from PySide6.QtCore import Qt, QRect from typing import List, Tuple -from aaredaqlib.coordinate import Coordinate, SmargonCoordinate -from aaredaqlib.models import DAQStatusModel -from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem -from aaredaqlib.sample_geometry import SampleGeometryModel +from aare.common.coordinate import Coordinate, SmargonCoordinate +from aare.common.models import DAQStatusModel +from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem +from aare.common.sample_geometry import SampleGeometryModel -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/scan_logic/rotation_scan_manager.py b/src/aare/gui/scan_logic/rotation_scan_manager.py similarity index 86% rename from src/aaregui/scan_logic/rotation_scan_manager.py rename to src/aare/gui/scan_logic/rotation_scan_manager.py index 29907bab..16922e51 100644 --- a/src/aaregui/scan_logic/rotation_scan_manager.py +++ b/src/aare/gui/scan_logic/rotation_scan_manager.py @@ -1,6 +1,6 @@ from PySide6.QtCore import QObject, Signal, Slot -from aaredaqlib.rotation_scan import CompletedRotationScan +from aare.common.rotation_scan import CompletedRotationScan class RotationScanManager(QObject): diff --git a/src/aaregui/scan_logic/sample_mount_logic.py b/src/aare/gui/scan_logic/sample_mount_logic.py similarity index 87% rename from src/aaregui/scan_logic/sample_mount_logic.py rename to src/aare/gui/scan_logic/sample_mount_logic.py index 03ecaa88..60bdccb3 100644 --- a/src/aaregui/scan_logic/sample_mount_logic.py +++ b/src/aare/gui/scan_logic/sample_mount_logic.py @@ -1,6 +1,6 @@ from PySide6.QtCore import QObject, Slot, Signal -from aaredaqlib.models import DAQStatusModel, SampleShortInfo +from aare.common.models import DAQStatusModel, SampleShortInfo class SampleMountLogic(QObject): diff --git a/src/aaregui/widgets/__init__.py b/src/aare/gui/threads/__init__.py similarity index 100% rename from src/aaregui/widgets/__init__.py rename to src/aare/gui/threads/__init__.py diff --git a/src/aaregui/threads/axis_video_thread.py b/src/aare/gui/threads/axis_video_thread.py similarity index 100% rename from src/aaregui/threads/axis_video_thread.py rename to src/aare/gui/threads/axis_video_thread.py diff --git a/src/aaregui/threads/camera_thread.py b/src/aare/gui/threads/camera_thread.py similarity index 100% rename from src/aaregui/threads/camera_thread.py rename to src/aare/gui/threads/camera_thread.py diff --git a/src/aaregui/threads/daq_worker.py b/src/aare/gui/threads/daq_worker.py similarity index 98% rename from src/aaregui/threads/daq_worker.py rename to src/aare/gui/threads/daq_worker.py index c69a6fff..5cbbf222 100644 --- a/src/aaregui/threads/daq_worker.py +++ b/src/aare/gui/threads/daq_worker.py @@ -7,13 +7,13 @@ from PySide6.QtCore import Signal, QUrl, Slot, QTimer, QObject, QByteArray from PySide6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply from jfjoch_client import ScanResult, ScanResultImagesInner -from aaredaqlib.coordinate import SmargonCoordinate, Coordinate -from aaredaqlib.models import DAQStatusModel, SampleShortInfoList, SampleShortInfo, SampleCameraSettings, \ +from aare.common.coordinate import SmargonCoordinate, Coordinate +from aare.common.models import DAQStatusModel, SampleShortInfoList, SampleShortInfo, SampleCameraSettings, \ AutofocusSettings, SimpleScanParameters, FluorescenceSpectrumParameterModel, FluorescenceSpectrumOutputModel -from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid -from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan +from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid +from aare.common.rotation_scan import RotationScanRequest, CompletedRotationScan -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/threads/jfjoch_viewer.py b/src/aare/gui/threads/jfjoch_viewer.py similarity index 100% rename from src/aaregui/threads/jfjoch_viewer.py rename to src/aare/gui/threads/jfjoch_viewer.py diff --git a/src/aaregui/threads/sse_client.py b/src/aare/gui/threads/sse_client.py similarity index 99% rename from src/aaregui/threads/sse_client.py rename to src/aare/gui/threads/sse_client.py index 50d9124f..86906fae 100644 --- a/src/aaregui/threads/sse_client.py +++ b/src/aare/gui/threads/sse_client.py @@ -1,7 +1,5 @@ from PySide6.QtCore import QObject, Signal, Slot -from aaredaqlib.models import SampleShortInfoList - class SSEClient(QObject): # Signals diff --git a/src/aare/gui/widgets/__init__.py b/src/aare/gui/widgets/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/aaregui/widgets/button_with_payload.py b/src/aare/gui/widgets/button_with_payload.py similarity index 100% rename from src/aaregui/widgets/button_with_payload.py rename to src/aare/gui/widgets/button_with_payload.py diff --git a/src/aaregui/widgets/camera_image.py b/src/aare/gui/widgets/camera_image.py similarity index 98% rename from src/aaregui/widgets/camera_image.py rename to src/aare/gui/widgets/camera_image.py index 54342405..f312d665 100644 --- a/src/aaregui/widgets/camera_image.py +++ b/src/aare/gui/widgets/camera_image.py @@ -22,13 +22,13 @@ from PySide6.QtWidgets import ( QFrame, ) -from aaredaqlib.models import DAQStatusModel, AutofocusSettings, SampleCameraSettings, BeamlineStateEnum, \ +from aare.common.models import DAQStatusModel, AutofocusSettings, SampleCameraSettings, BeamlineStateEnum, \ SessionsStateEnum -from aaregui.models.bookmark import SmargonBookmarkList -from aaredaqlib.coordinate import Coordinate, SmargonCoordinate -from aaredaqlib.sample_geometry import SampleGeometryModel -from aaregui.scan_logic.raster_grid_manager import RasterGridManager -from aaredaqlib.logger_config import setup_logger +from aare.gui.models.bookmark import SmargonBookmarkList +from aare.common.coordinate import Coordinate, SmargonCoordinate +from aare.common.sample_geometry import SampleGeometryModel +from aare.gui.scan_logic import RasterGridManager +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/widgets/clickable_label.py b/src/aare/gui/widgets/clickable_label.py similarity index 100% rename from src/aaregui/widgets/clickable_label.py rename to src/aare/gui/widgets/clickable_label.py diff --git a/src/aaregui/widgets/login.py b/src/aare/gui/widgets/login.py similarity index 98% rename from src/aaregui/widgets/login.py rename to src/aare/gui/widgets/login.py index 4712f5a2..d75d983a 100644 --- a/src/aaregui/widgets/login.py +++ b/src/aare/gui/widgets/login.py @@ -8,7 +8,7 @@ from PySide6.QtWidgets import ( QDialog, QVBoxLayout, QLineEdit, QPushButton, QLabel, QHBoxLayout ) -from aaredaqlib.models import TokenData +from aare.common.models import TokenData class LoginDialog(QDialog): diff --git a/src/aaregui/widgets/message_box.py b/src/aare/gui/widgets/message_box.py similarity index 98% rename from src/aaregui/widgets/message_box.py rename to src/aare/gui/widgets/message_box.py index a8134a20..02d8ae01 100644 --- a/src/aaregui/widgets/message_box.py +++ b/src/aare/gui/widgets/message_box.py @@ -1,6 +1,6 @@ from PySide6.QtCore import QTimer, QEventLoop from PySide6.QtWidgets import QMessageBox -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/widgets/no_wheel_scroll_area.py b/src/aare/gui/widgets/no_wheel_scroll_area.py similarity index 100% rename from src/aaregui/widgets/no_wheel_scroll_area.py rename to src/aare/gui/widgets/no_wheel_scroll_area.py diff --git a/src/aaregui/widgets/number_line_edit.py b/src/aare/gui/widgets/number_line_edit.py similarity index 100% rename from src/aaregui/widgets/number_line_edit.py rename to src/aare/gui/widgets/number_line_edit.py diff --git a/src/aaregui/widgets/pgroup_dialog.py b/src/aare/gui/widgets/pgroup_dialog.py similarity index 100% rename from src/aaregui/widgets/pgroup_dialog.py rename to src/aare/gui/widgets/pgroup_dialog.py diff --git a/src/aaregui/widgets/raster_grid_table.py b/src/aare/gui/widgets/raster_grid_table.py similarity index 97% rename from src/aaregui/widgets/raster_grid_table.py rename to src/aare/gui/widgets/raster_grid_table.py index 3f12ce66..f24909de 100644 --- a/src/aaregui/widgets/raster_grid_table.py +++ b/src/aare/gui/widgets/raster_grid_table.py @@ -1,8 +1,7 @@ from PySide6.QtCore import Signal, Slot from PySide6.QtWidgets import QTableWidget, QHeaderView, QTableWidgetItem, QWidget, QHBoxLayout, QPushButton -from aaredaqlib.raster_grid import RasterGridRequest -from aaregui.scan_logic.raster_grid_manager import RasterGridManager +from aare.gui.scan_logic import RasterGridManager class RasterGridTable(QTableWidget): diff --git a/src/aaregui/widgets/status_bar.py b/src/aare/gui/widgets/status_bar.py similarity index 97% rename from src/aaregui/widgets/status_bar.py rename to src/aare/gui/widgets/status_bar.py index 4fc1ca07..2075de40 100644 --- a/src/aaregui/widgets/status_bar.py +++ b/src/aare/gui/widgets/status_bar.py @@ -1,13 +1,13 @@ from PySide6.QtCore import Signal, Slot, QPoint, QTimer from PySide6.QtGui import QFont -from PySide6.QtWidgets import QStatusBar, QDialog, QMenu, QLabel, QMessageBox +from PySide6.QtWidgets import QStatusBar, QDialog, QMenu, QMessageBox -from aaredaqlib.models import TokenData, BeamlineStateEnum, DAQStatusModel, SessionsStateEnum -from aaregui.widgets.clickable_label import ClickableLabel -from aaregui.widgets.pgroup_dialog import PGroupDialog -from aaregui.widgets.value_label import ValueLabel +from aare.common.models import TokenData, BeamlineStateEnum, DAQStatusModel, SessionsStateEnum +from aare.gui.widgets.clickable_label import ClickableLabel +from aare.gui.widgets.pgroup_dialog import PGroupDialog +from aare.gui.widgets.value_label import ValueLabel -from aaredaqlib.logger_config import setup_logger +from aare.common.logger_config import setup_logger logger = setup_logger("aareGUI") diff --git a/src/aaregui/widgets/status_label.py b/src/aare/gui/widgets/status_label.py similarity index 100% rename from src/aaregui/widgets/status_label.py rename to src/aare/gui/widgets/status_label.py diff --git a/src/aaregui/widgets/title_label.py b/src/aare/gui/widgets/title_label.py similarity index 100% rename from src/aaregui/widgets/title_label.py rename to src/aare/gui/widgets/title_label.py diff --git a/src/aaregui/widgets/value_label.py b/src/aare/gui/widgets/value_label.py similarity index 100% rename from src/aaregui/widgets/value_label.py rename to src/aare/gui/widgets/value_label.py diff --git a/src/aaregui/widgets/video_image.py b/src/aare/gui/widgets/video_image.py similarity index 100% rename from src/aaregui/widgets/video_image.py rename to src/aare/gui/widgets/video_image.py