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

Mnt prep for demo #23

Draft
wants to merge 25 commits into
base: deprecated-master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
21c7868
MNT: avoid bare except
tacaswell Feb 26, 2021
669832d
MNT: lift missing value from _py file
tacaswell Feb 26, 2021
ad96016
MNT: add missing import to keep the linter happy
tacaswell Feb 26, 2021
172036d
MNT: put back in an RE API compatibly wrapper of xrun
tacaswell Feb 26, 2021
da32e93
MNT: files for queueserver startup
tacaswell Feb 26, 2021
ace7731
ENH: add plan that looks up sample metadata from xpdacq
tacaswell Feb 27, 2021
fbabb22
ENH: update and curate published plans
tacaswell Feb 27, 2021
0ae9e28
rapid development of sorensen power supply
tacaswell Mar 1, 2021
64dfab5
ENH: add caproto IOC for ramp plan
tacaswell Mar 1, 2021
b50c7d4
tweak controlled ramp plan
tacaswell Mar 2, 2021
cf77222
MNT: make writing the CSV optional
tacaswell Mar 2, 2021
bb6a421
FIX: the grid objects are in globals not locals
tacaswell Mar 2, 2021
4b937bf
BUG: add ability to optionally write out a CSV of temperatures
tacaswell Mar 2, 2021
5daa121
Collection of on-the-fly changes to thermo control
tacaswell Mar 10, 2021
db73d88
formatting + changes db insertion
tacaswell Mar 10, 2021
ff3ac6b
add flag to IOC to control xrd collection
tacaswell Mar 10, 2021
21860b9
HACK: overnight script to stop experiment after it melts
tacaswell Mar 10, 2021
2934cd8
ignore vscode files
tacaswell Mar 10, 2021
7473d51
remove suspenders
tacaswell Apr 7, 2021
b3fff96
Add plans for demo
tacaswell Apr 7, 2021
d8ebcde
Regenerate list of known plans + use existing filtering
tacaswell Apr 7, 2021
bc08329
STY: fix indentation of comments
tacaswell Apr 7, 2021
e30ad53
ENH: skeletons of the plans we need for the demo
tacaswell Apr 7, 2021
daa3f2c
FIX: make positions actually optional
tacaswell Apr 7, 2021
755714f
MNT: simplify signature of sample_aware_count
tacaswell Apr 9, 2021
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
Prev Previous commit
Next Next commit
Add plans for demo
tacaswell committed Apr 7, 2021
commit b3fff96e86918b62169c59f7c9500c348225f578
23 changes: 23 additions & 0 deletions startup/99-demo_plans.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from dataclasses import dataclass
import bluesky.plan_stubs as bps


def move_det(x: float, y: float, z: float):
yield from bps.mv(Det_1_X, x, Det_2_y, y, Det_1_Z, z)


@dataclass
class SamplePos:
x: float
y: float


SAMPLE_POSITONS = {
# 'a': SamplePos(0, 0),
}


def move_to_sample(name: str):
target_pos = SAMPLE_POSITONS[name]
yield from bps.mv(Grid_X, target_pos.x, Grid_Y, target_pos.y)