Skip to content

Commit

Permalink
rename I24 to i24
Browse files Browse the repository at this point in the history
  • Loading branch information
dperl-dls committed Aug 7, 2024
1 parent 94c9d9e commit 94017f3
Show file tree
Hide file tree
Showing 70 changed files with 209 additions and 209 deletions.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ dev = [

[project.scripts]
mx_bluesky = "mx_bluesky.__main__:main"
run_extruder = "mx_bluesky.I24.serial.run_serial:run_extruder"
run_fixed_target = "mx_bluesky.I24.serial.run_serial:run_fixed_target"
run_extruder = "mx_bluesky.i24.serial.run_serial:run_extruder"
run_fixed_target = "mx_bluesky.i24.serial.run_serial:run_fixed_target"

[project.urls]
GitHub = "https://github.com/DiamondLightSource/mx_bluesky"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ env:
- kind: dodal
module: dodal.beamlines.i24
- kind: planFunctions
module: mx_bluesky.I24.serial
module: mx_bluesky.i24.serial
events:
broadcast_status_events: False
api:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import requests

from mx_bluesky.I24.serial.parameters import SSXType
from mx_bluesky.I24.serial.setup_beamline import (
from mx_bluesky.i24.serial.parameters import SSXType
from mx_bluesky.i24.serial.setup_beamline import (
Detector,
Eiger,
Pilatus,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
from dodal.devices.i24.I24_detector_motion import DetectorMotion
from dodal.devices.zebra import DISCONNECT, SOFT_IN3, Zebra

from mx_bluesky.I24.serial import log
from mx_bluesky.I24.serial.dcid import DCID
from mx_bluesky.I24.serial.parameters import ExtruderParameters, SSXType
from mx_bluesky.I24.serial.parameters.constants import PARAM_FILE_NAME, PARAM_FILE_PATH
from mx_bluesky.I24.serial.setup_beamline import Pilatus, caget, caput, pv
from mx_bluesky.I24.serial.setup_beamline import setup_beamline as sup
from mx_bluesky.I24.serial.setup_beamline.setup_detector import (
from mx_bluesky.i24.serial import log
from mx_bluesky.i24.serial.dcid import DCID
from mx_bluesky.i24.serial.parameters import ExtruderParameters, SSXType
from mx_bluesky.i24.serial.parameters.constants import PARAM_FILE_NAME, PARAM_FILE_PATH
from mx_bluesky.i24.serial.setup_beamline import Pilatus, caget, caput, pv
from mx_bluesky.i24.serial.setup_beamline import setup_beamline as sup
from mx_bluesky.i24.serial.setup_beamline.setup_detector import (
UnknownDetectorType,
get_detector_type,
)
from mx_bluesky.I24.serial.setup_beamline.setup_zebra_plans import (
from mx_bluesky.i24.serial.setup_beamline.setup_zebra_plans import (
GATE_START,
TTL_EIGER,
TTL_PILATUS,
Expand All @@ -49,7 +49,7 @@
setup_zebra_for_extruder_with_pump_probe_plan,
setup_zebra_for_quickshot_plan,
)
from mx_bluesky.I24.serial.write_nexus import call_nexgen
from mx_bluesky.i24.serial.write_nexus import call_nexgen

usage = "%(prog)s command [options]"
logger = logging.getLogger("I24ssx.extruder")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,26 @@
from dodal.devices.i24.pmac import PMAC
from dodal.devices.zebra import Zebra

from mx_bluesky.I24.serial import log
from mx_bluesky.I24.serial.dcid import DCID
from mx_bluesky.I24.serial.fixed_target.ft_utils import (
from mx_bluesky.i24.serial import log
from mx_bluesky.i24.serial.dcid import DCID
from mx_bluesky.i24.serial.fixed_target.ft_utils import (
ChipType,
MappingType,
PumpProbeSetting,
)
from mx_bluesky.I24.serial.parameters import (
from mx_bluesky.i24.serial.parameters import (
ChipDescription,
FixedTargetParameters,
SSXType,
)
from mx_bluesky.I24.serial.parameters.constants import (
from mx_bluesky.i24.serial.parameters.constants import (
LITEMAP_PATH,
PARAM_FILE_NAME,
PARAM_FILE_PATH_FT,
)
from mx_bluesky.I24.serial.setup_beamline import caget, cagetstring, caput, pv
from mx_bluesky.I24.serial.setup_beamline import setup_beamline as sup
from mx_bluesky.I24.serial.setup_beamline.setup_zebra_plans import (
from mx_bluesky.i24.serial.setup_beamline import caget, cagetstring, caput, pv
from mx_bluesky.i24.serial.setup_beamline import setup_beamline as sup
from mx_bluesky.i24.serial.setup_beamline.setup_zebra_plans import (
SHUTTER_OPEN_TIME,
arm_zebra,
close_fast_shutter,
Expand All @@ -52,7 +52,7 @@
reset_zebra_when_collection_done_plan,
setup_zebra_for_fastchip_plan,
)
from mx_bluesky.I24.serial.write_nexus import call_nexgen
from mx_bluesky.i24.serial.write_nexus import call_nexgen

ABORTED = False

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@
from dodal.devices.i24.I24_detector_motion import DetectorMotion
from dodal.devices.i24.pmac import PMAC, EncReset, LaserSettings

from mx_bluesky.I24.serial import log
from mx_bluesky.I24.serial.fixed_target import i24ssx_Chip_Mapping_py3v1 as mapping
from mx_bluesky.I24.serial.fixed_target import i24ssx_Chip_StartUp_py3v1 as startup
from mx_bluesky.I24.serial.fixed_target.ft_utils import (
from mx_bluesky.i24.serial import log
from mx_bluesky.i24.serial.fixed_target import i24ssx_Chip_Mapping_py3v1 as mapping
from mx_bluesky.i24.serial.fixed_target import i24ssx_Chip_StartUp_py3v1 as startup
from mx_bluesky.i24.serial.fixed_target.ft_utils import (
ChipType,
Fiducials,
MappingType,
)
from mx_bluesky.I24.serial.parameters import get_chip_format
from mx_bluesky.I24.serial.parameters.constants import (
from mx_bluesky.i24.serial.parameters import get_chip_format
from mx_bluesky.i24.serial.parameters.constants import (
CS_FILES_PATH,
FULLMAP_PATH,
LITEMAP_PATH,
PARAM_FILE_NAME,
PARAM_FILE_PATH_FT,
PVAR_FILE_PATH,
)
from mx_bluesky.I24.serial.setup_beamline import Pilatus, caget, caput, pv
from mx_bluesky.I24.serial.setup_beamline.setup_detector import get_detector_type
from mx_bluesky.i24.serial.setup_beamline import Pilatus, caget, caput, pv
from mx_bluesky.i24.serial.setup_beamline.setup_detector import get_detector_type

logger = logging.getLogger("I24ssx.chip_manager")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
import numpy as np
from matplotlib import pyplot as plt

from mx_bluesky.I24.serial import log
from mx_bluesky.I24.serial.fixed_target.ft_utils import ChipType
from mx_bluesky.I24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 import (
from mx_bluesky.i24.serial import log
from mx_bluesky.i24.serial.fixed_target.ft_utils import ChipType
from mx_bluesky.i24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 import (
check_files,
get_shot_order,
get_xy,
read_parameter_file,
write_file,
)
from mx_bluesky.I24.serial.parameters import get_chip_format
from mx_bluesky.I24.serial.parameters.constants import PARAM_FILE_PATH_FT
from mx_bluesky.i24.serial.parameters import get_chip_format
from mx_bluesky.i24.serial.parameters.constants import PARAM_FILE_PATH_FT

logger = logging.getLogger("I24ssx.chip_mapping")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

import numpy as np

from mx_bluesky.I24.serial import log
from mx_bluesky.I24.serial.fixed_target.ft_utils import ChipType
from mx_bluesky.I24.serial.parameters import FixedTargetParameters, get_chip_format
from mx_bluesky.I24.serial.parameters.constants import (
from mx_bluesky.i24.serial import log
from mx_bluesky.i24.serial.fixed_target.ft_utils import ChipType
from mx_bluesky.i24.serial.parameters import FixedTargetParameters, get_chip_format
from mx_bluesky.i24.serial.parameters.constants import (
HEADER_FILES_PATH,
PARAM_FILE_NAME,
PARAM_FILE_PATH_FT,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
from dodal.devices.i24.pmac import PMAC
from dodal.devices.oav.oav_detector import OAV

from mx_bluesky.I24.serial.fixed_target import i24ssx_Chip_Manager_py3v1 as manager
from mx_bluesky.I24.serial.fixed_target.ft_utils import Fiducials
from mx_bluesky.I24.serial.parameters.constants import OAV1_CAM
from mx_bluesky.i24.serial.fixed_target import i24ssx_Chip_Manager_py3v1 as manager
from mx_bluesky.i24.serial.fixed_target.ft_utils import Fiducials
from mx_bluesky.i24.serial.parameters.constants import OAV1_CAM

logger = logging.getLogger("I24ssx.moveonclick")

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from mx_bluesky.I24.serial.parameters.constants import SSXType
from mx_bluesky.I24.serial.parameters.experiment_parameters import (
from mx_bluesky.i24.serial.parameters.constants import SSXType
from mx_bluesky.i24.serial.parameters.experiment_parameters import (
ChipDescription,
ExtruderParameters,
FixedTargetParameters,
)
from mx_bluesky.I24.serial.parameters.utils import get_chip_format
from mx_bluesky.i24.serial.parameters.utils import get_chip_format

__all__ = [
"SSXType",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from pathlib import Path
from typing import Optional

from mx_bluesky.I24.serial.log import _read_visit_directory_from_file
from mx_bluesky.i24.serial.log import _read_visit_directory_from_file


class SSXType(Enum):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from pydantic import BaseModel, ConfigDict, validator

from mx_bluesky.I24.serial.fixed_target.ft_utils import (
from mx_bluesky.i24.serial.fixed_target.ft_utils import (
ChipType,
MappingType,
PumpProbeSetting,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Any, Dict

from mx_bluesky.I24.serial.fixed_target.ft_utils import ChipType
from mx_bluesky.I24.serial.parameters.experiment_parameters import ChipDescription
from mx_bluesky.I24.serial.setup_beamline import caget, pv
from mx_bluesky.i24.serial.fixed_target.ft_utils import ChipType
from mx_bluesky.i24.serial.parameters.experiment_parameters import ChipDescription
from mx_bluesky.i24.serial.setup_beamline import caget, pv


def get_chip_format(chip_type: ChipType) -> ChipDescription:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from typing import Union

from mx_bluesky.I24.serial.setup_beamline import pv
from mx_bluesky.i24.serial.setup_beamline import pv


class Pilatus:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
from dodal.devices.i24.I24_detector_motion import DetectorMotion

from mx_bluesky.I24.serial.setup_beamline import pv
from mx_bluesky.I24.serial.setup_beamline.ca import caget, caput
from mx_bluesky.i24.serial.setup_beamline import pv
from mx_bluesky.i24.serial.setup_beamline.ca import caget, caput

logger = logging.getLogger("I24ssx.sup")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
from dodal.common import inject
from dodal.devices.i24.I24_detector_motion import DetectorMotion

from mx_bluesky.I24.serial import log
from mx_bluesky.I24.serial.parameters import SSXType
from mx_bluesky.I24.serial.setup_beamline import pv
from mx_bluesky.I24.serial.setup_beamline.ca import caget
from mx_bluesky.I24.serial.setup_beamline.pv_abstract import (
from mx_bluesky.i24.serial import log
from mx_bluesky.i24.serial.parameters import SSXType
from mx_bluesky.i24.serial.setup_beamline import pv
from mx_bluesky.i24.serial.setup_beamline.ca import caget
from mx_bluesky.i24.serial.setup_beamline.pv_abstract import (
Detector,
Eiger,
Pilatus,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

import requests

from mx_bluesky.I24.serial.fixed_target.ft_utils import ChipType, MappingType
from mx_bluesky.I24.serial.parameters import ExtruderParameters, FixedTargetParameters
from mx_bluesky.I24.serial.setup_beamline import Eiger, caget, cagetstring
from mx_bluesky.i24.serial.fixed_target.ft_utils import ChipType, MappingType
from mx_bluesky.i24.serial.parameters import ExtruderParameters, FixedTargetParameters
from mx_bluesky.i24.serial.setup_beamline import Eiger, caget, cagetstring

logger = logging.getLogger("I24ssx.nexus_writer")

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 94017f3

Please sign in to comment.