Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Device support for a spherical bent-crystal analyzer #280

Draft
wants to merge 37 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
cce0b34
Preliminary coding of the SBCA forward transform.
canismarko Apr 30, 2024
c994f8e
Add asymmotron graphic
Cathyhjj Jul 2, 2024
83684d4
add initial draft of asymmotron ui
Jul 2, 2024
b747e97
add asymmtron initial python file template
Cathyhjj Jul 2, 2024
2d5401e
Add files via upload
Cathyhjj Jul 2, 2024
2732ca2
changed graphics for asymmotron
Cathyhjj Jul 2, 2024
b912602
Finished the forward transform for an analyzer crystal.
canismarko Jul 3, 2024
3e26ec4
Fixed some bad values in the analyzer tests.
canismarko Jul 3, 2024
099b8fc
modified assymmotron ui
Jul 9, 2024
d31933a
Partial implementation of the rowland circle inverse transform.
canismarko Jul 10, 2024
5d813d5
Merge branch 'sbca' of github.com:spc-group/haven into sbca
canismarko Jul 10, 2024
c31c5d6
Merge branch 'main' into sbca
canismarko Oct 23, 2024
4826aa7
Finished math for forward/inverse asymmotron calculations.
canismarko Oct 23, 2024
2d3fd66
Converted the analyzer device to use ophyd-async.
canismarko Oct 23, 2024
4bb6059
Renamed signals, and added calculations for α and d-spacing.
canismarko Oct 26, 2024
4dbca66
Asymmetry angle (α) is now calculated from hkl values.
canismarko Nov 5, 2024
755eef4
Updated ophyd-async to 0.8.0a3.
canismarko Nov 11, 2024
c089294
Converted ``ConfigSignal`` and ``HintedSignal`` to their new Standard…
canismarko Nov 11, 2024
98929bf
Updated the signals on the ion chamber to have fewer hints.
canismarko Nov 12, 2024
8491ea5
fix for an ophyd-async bug where device vectors didn't have parents.
canismarko Nov 12, 2024
678ab97
Updated DeviceVectors to match ophyd-async==0.8.0a5.
canismarko Nov 13, 2024
a1eeb66
Updated ophyd-async version requirement in pyproject.
canismarko Nov 13, 2024
1aac5e3
Fixed typing on ophyd-async signals with array types.
canismarko Nov 13, 2024
752e678
Removed DTYP from common EPICS records since it's not common.
yannachen Nov 13, 2024
a427e16
Fixed the asymmotron analyzer support based on beamtime.
Nov 13, 2024
bc700fc
Merge branch 'main' into sbca
Nov 13, 2024
6285fb9
Updated file path handling for (threaded) area detectors.
Nov 13, 2024
5252cd1
Merge branch 'ad_file_saving' into sbca
Nov 13, 2024
fae6a99
Derived signals now subscribe to their dependent signals via brute fo…
yannachen Nov 14, 2024
8ca4141
Black linting.
canismarko Nov 14, 2024
1b474d6
Merge branch 'main' into hints
canismarko Nov 14, 2024
0b2a129
Removed some readable signals from the energy positioner.
Nov 15, 2024
86bbdf4
Moved the asymmotron stuff to its own module.
canismarko Nov 14, 2024
3f2936e
Merge branch 'hints' into sbca
canismarko Nov 15, 2024
297c1a7
Added a quick-and-dirty XDI writer for Jerry's beamtime.
canismarko Nov 15, 2024
615aafb
Turned the hkl signals into an HKL device so we don't put tuples into…
canismarko Nov 15, 2024
48fdce0
Bunch of tweaks from beamtime.
Nov 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ dependencies:
- bluesky-adaptive
- bluesky >=1.8.1
- ophyd >=1.6.3
- ophyd-async >= 0.6.0
# - ophyd-async > 0.8.0a4
- git+https://github.com/bluesky/ophyd-async.git # switch back to pip once a new release (0.8.0a5) is available
- apstools == 1.6.20 # Leave at 1.6.20 until this is fixed: https://github.com/BCDA-APS/apstools/issues/1022
- pcdsdevices # For extra signal types
- pydm >=1.18.0
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ classifiers = [
"Topic :: System :: Hardware",
]
keywords = ["synchrotron", "xray", "bluesky"]
dependencies = ["aioca", "aiokafka", "bluesky", "ophyd", "ophyd-async>=0.7.0", "databroker", "apsbss", "xraydb",
dependencies = ["aioca", "aiokafka", "bluesky", "ophyd", "ophyd-async>=0.8.0a3", "databroker", "apsbss", "xraydb",
"mergedeep", "xrayutilities", "bluesky-queueserver-api", "tomlkit",
"apstools", "databroker", "ophyd-registry", "caproto", "pcdsdevices",
"strenum", "bluesky-adaptive", "tiled[client]"]
Expand Down
44 changes: 44 additions & 0 deletions src/firefly/asymmotron.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import logging
import warnings

import haven
from firefly import display

# from haven.instrument import analyzer

log = logging.getLogger(__name__)


class SlitsDisplay(display.FireflyDisplay):

def customize_device(self):
self.device = haven.registry.find(self.macros()["DEVICE"])

def ui_filename(self):
return "asymmotron.ui"


# -----------------------------------------------------------------------------
# :author: Mark Wolfman
# :email: [email protected]
# :copyright: Copyright © 2023, UChicago Argonne, LLC
#
# Distributed under the terms of the 3-Clause BSD License
#
# The full license is in the file LICENSE, distributed with this software.
#
# DISCLAIMER
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# -----------------------------------------------------------------------------
Loading
Loading