Skip to content

Commit

Permalink
update ophyd async
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Wegmann committed Sep 4, 2024
1 parent 0394b3c commit 79a8c0f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "0.0.1"
description = "An Interface between bluesky and SECoP, using ophyd and frappy-client"

dependencies = [
'ophyd-async == 0.3.4',
'ophyd-async == 0.5.1',
'frappy-core@git+https://github.com/SampleEnvironment/[email protected]'

]
Expand Down
11 changes: 6 additions & 5 deletions src/secop_ophyd/SECoPDevices.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from typing import Any, Dict, Iterator, Optional, Type

import bluesky.plan_stubs as bps

from bluesky.protocols import (
Descriptor,
Flyable,
Expand All @@ -30,14 +31,14 @@
StructOf,
TupleOf,
)
from ophyd_async.core.async_status import AsyncStatus
from ophyd_async.core.signal import Signal, SignalR, SignalRW, SignalX, observe_value
from ophyd_async.core.standard_readable import (
from ophyd_async.core import AsyncStatus
from ophyd_async.core import Signal, SignalR, SignalRW, SignalX, observe_value
from ophyd_async.core import (
ConfigSignal,
HintedSignal,
StandardReadable,
)
from ophyd_async.core.utils import T
from ophyd_async.core import T
from typing_extensions import Self

from secop_ophyd.AsyncFrappyClient import AsyncFrappyClient
Expand Down Expand Up @@ -917,7 +918,7 @@ async def generate_nexus_struct(self) -> str:
{equipment_id}:NXenvironment
\t@NX_class = NXenvironment
\tname:NX_CHAR = "{equipment_id}"
\tshort_name:NX_CHAR = {equipment_id.split('.')[0]}
\tshort_name:NX_CHAR = "{equipment_id.split('.')[0]}"
\ttype:NX_CHAR = "{firmware} ({version})"
\tdescription:NX_CHAR = "{description}"
Expand Down
4 changes: 2 additions & 2 deletions src/secop_ophyd/SECoPSignal.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
ScaledInteger,
StringType,
)
from ophyd_async.core.signal_backend import SignalBackend
from ophyd_async.core.utils import T
from ophyd_async.core import SignalBackend
from ophyd_async.core import T

from secop_ophyd.AsyncFrappyClient import AsyncFrappyClient
from secop_ophyd.util import Path, SECoPdtype, SECoPReading, deep_get
Expand Down
2 changes: 1 addition & 1 deletion tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from bluesky.protocols import Triggerable
from frappy.errors import ImpossibleError
from ophyd_async.core.signal import SignalR, SignalX
from ophyd_async.core import SignalR, SignalX

from secop_ophyd.SECoPDevices import (
SECoPCMDDevice,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_nested.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import numpy as np
from ophyd_async.core.signal import SignalR, SignalRW
from ophyd_async.core import SignalR, SignalRW

from secop_ophyd.AsyncFrappyClient import AsyncFrappyClient
from secop_ophyd.SECoPDevices import SECoPNodeDevice, SECoPReadableDevice
Expand Down

0 comments on commit 79a8c0f

Please sign in to comment.