From 6410c2b947c6eac9a60d65489f1599f79852100b Mon Sep 17 00:00:00 2001 From: Mathias Guijarro Date: Tue, 3 Dec 2024 14:38:34 +0100 Subject: [PATCH 1/7] REL: v1.10.0 From 27a3fea6382c7bef170295dd05199b954e40f302 Mon Sep 17 00:00:00 2001 From: Daniel Henriksen Date: Fri, 17 Oct 2025 14:03:37 -0400 Subject: [PATCH 2/7] Fixed grammar in Signals documentation --- docs/user/reference/signals.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/user/reference/signals.rst b/docs/user/reference/signals.rst index d8f07bfc0..c3e92faa8 100644 --- a/docs/user/reference/signals.rst +++ b/docs/user/reference/signals.rst @@ -3,14 +3,14 @@ Signals ******* -In EPICS, **Signal** maybe backed by a read-only PV, a single -read-write PV, or a pair of read and write PVs, grouped together. In +In EPICS, a **Signal** may be backed by a read-only PV, a single +read-write PV, or a pair of read-write PVs grouped together. In any of those cases, a single value is exposed to `bluesky `_. For more complex hardware, for example a `motor record `_, the relationships -between the individual process variables needs to be encoded in a -:class:`~device.Device` (a :class:`~epics_motor.EpicsMotor` class +among the individual PVs needs to be encoded in a +:class:`~device.Device` (an :class:`~epics_motor.EpicsMotor` class ships with ophyd for this case). This includes both what **Signals** are grouped together, but also how to manipulate them a coordinated fashion to achieve the high-level action (moving a motor, changing a From ab0469f77cea637e9e1a8c0cb356b154e7c97cc2 Mon Sep 17 00:00:00 2001 From: Daniel Henriksen Date: Fri, 17 Oct 2025 14:19:40 -0400 Subject: [PATCH 3/7] Fix typo in signals documentation --- docs/user/reference/signals.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/reference/signals.rst b/docs/user/reference/signals.rst index c3e92faa8..13c8df66a 100644 --- a/docs/user/reference/signals.rst +++ b/docs/user/reference/signals.rst @@ -12,7 +12,7 @@ example a `motor record among the individual PVs needs to be encoded in a :class:`~device.Device` (an :class:`~epics_motor.EpicsMotor` class ships with ophyd for this case). This includes both what **Signals** -are grouped together, but also how to manipulate them a coordinated +are grouped together, but also how to manipulate them in a coordinated fashion to achieve the high-level action (moving a motor, changing a temperature, opening a valve, or taking data). More complex devices, like a diffractometer or a Area Detector, can be assembled out of From a587280e10dfc26e190c3c4b659feb2fcaa1d006 Mon Sep 17 00:00:00 2001 From: Daniel Henriksen Date: Tue, 28 Oct 2025 11:46:21 -0400 Subject: [PATCH 4/7] fix import statement in code snippet --- docs/user/explanations/status.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/explanations/status.rst b/docs/user/explanations/status.rst index 9593973bb..136b357bf 100644 --- a/docs/user/explanations/status.rst +++ b/docs/user/explanations/status.rst @@ -26,7 +26,7 @@ default, ``None`` means it will wait forever to be marked completed.) .. code:: python - from ophyd import Status + from ophyd.status import Status status = Status(timeout=60) From 71e14f706087e0755e58f82fd1b90fe3533c2fbd Mon Sep 17 00:00:00 2001 From: Daniel Henriksen Date: Tue, 21 Oct 2025 13:54:21 -0400 Subject: [PATCH 5/7] Fix typos in comments in device.py --- ophyd/device.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ophyd/device.py b/ophyd/device.py index 9d2927355..b54228f4e 100644 --- a/ophyd/device.py +++ b/ophyd/device.py @@ -44,7 +44,7 @@ A, B = TypeVar("A"), TypeVar("B") ALL_COMPONENTS = object() -# This attrs are defined at instanitation time and must not +# These attrs are defined at instantiation time and must not # collide with class attributes. DEVICE_INSTANCE_ATTRS = { "name", @@ -412,7 +412,7 @@ def maybe_add_prefix(self, instance, kw, suffix): class DynamicDeviceComponent(Component["Device"]): - """An Device component that dynamically creates an ophyd Device + """A Device component that dynamically creates an ophyd Device Parameters ---------- @@ -516,8 +516,8 @@ def subscriptions(self, event_type): ) -# These stub 'Interface' classes are the apex of the mro heirarchy for -# their respective methods. They make multiple interitance more +# These stub 'Interface' classes are the apex of the mro hierarchy for +# their respective methods. They make multiple inheritance more # forgiving, and let us define classes that customize these methods # but are not full Devices. @@ -575,7 +575,7 @@ def read(self) -> OrderedDictType[str, Dict[str, Any]]: :meth:`~BlueskyInterface.describe()`. By convention, the first key in the return is the 'primary' key - and maybe used by heuristics in :mod:`bluesky`. + and may be used by heuristics in :mod:`bluesky`. The values in the ordered dictionary must be dict (-likes) with the keys ``{'value', 'timestamp'}``. The ``'value'`` may have any type, @@ -593,7 +593,7 @@ def read(self) -> OrderedDictType[str, Dict[str, Any]]: def describe(self) -> OrderedDictType[str, Dict[str, Any]]: """Provide schema and meta-data for :meth:`~BlueskyInterface.read`. - This keys in the `OrderedDict` this method returns must match the + The keys in the `OrderedDict` this method returns must match the keys in the `OrderedDict` return by :meth:`~BlueskyInterface.read`. This provides schema related information, (ex shape, dtype), the @@ -747,11 +747,11 @@ def pause(self) -> None: This is called when ever the :obj:`~bluesky.run_engine.RunEngine` is interrupted. - A device may have internal state that means plans can not + A device may have internal state that means plans cannot safely be re-wound. This method may: put the device in a 'paused' state and/or raise :obj:`~bluesky.run_engine.NoReplayAllowed` to indicate that - the plan can not be rewound. + the plan cannot be rewound. Raises ------ @@ -957,7 +957,7 @@ def _initialize_device(cls): # this is so that the _sig_attrs class attribute includes the sigattrs # from all of its class-inheritance-parents so we do not have to do - # this look up everytime we look at it. + # this look up every time we look at it. base_devices = [ base for base in reversed(cls.__bases__) if hasattr(base, "_sig_attrs") ] @@ -1271,7 +1271,7 @@ def __set_kinds_according_to_list( lambda x: x[0], ) - # we are into grand-children, can not be lazy! + # we are into grand-children, cannot be lazy! for child, cf_list in group: cpt = getattr(self, child) cpt.kind |= set_kind From 7415fb49a60127bac829e9741120ede9752ba828 Mon Sep 17 00:00:00 2001 From: Daniel Henriksen Date: Fri, 24 Oct 2025 16:08:02 -0400 Subject: [PATCH 6/7] Fix typos in pseudopositioner example --- docs/user/how-to/pseudopositioner.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user/how-to/pseudopositioner.md b/docs/user/how-to/pseudopositioner.md index 58f687cd0..118cc3c88 100644 --- a/docs/user/how-to/pseudopositioner.md +++ b/docs/user/how-to/pseudopositioner.md @@ -16,7 +16,7 @@ from ophyd.pseudopos import ( from ophyd import Component, SoftPositioner -class SPseudo3x3(PseudoPositioner): +class Pseudo3x3(PseudoPositioner): """ Interface to three positioners in a coordinate system that flips the sign. """ @@ -30,7 +30,7 @@ class SPseudo3x3(PseudoPositioner): @pseudo_position_argument def forward(self, pseudo_pos): - "Given a position in the psuedo coordinate system, transform to the real coordinate system." + "Given a position in the pseudo coordinate system, transform to the real coordinate system." return self.RealPosition( real1=-pseudo_pos.pseudo1, real2=-pseudo_pos.pseudo2, From 4d19f0a8127a55a5c9aaeff546e635aee3d28ce5 Mon Sep 17 00:00:00 2001 From: Daniel Henriksen Date: Tue, 28 Oct 2025 12:00:45 -0400 Subject: [PATCH 7/7] fix grammar in stage documentation --- docs/user/explanations/staging.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user/explanations/staging.rst b/docs/user/explanations/staging.rst index 86c6ff982..1671defc9 100644 --- a/docs/user/explanations/staging.rst +++ b/docs/user/explanations/staging.rst @@ -33,7 +33,7 @@ back off (or back to its original setting, whatever that was) at the end. For this, ophyd provides a convenience, ``stage_sigs`` --- a dictionary mapping signals to desired values. The device reads the initial values of these signals, stashes them, changes them to the desired value, and then -restore the initial value when the device is unstaged. It is best to +restores the initial value when the device is unstaged. It is best to customize ``stage_sigs`` in the device's ``__init__`` method, like so: .. code:: python