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.

Sign up for GitHub

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

Jump to bottom

enabled shutters for use with beam #52

Closed
wants to merge 1 commit into from
Closed

enabled shutters for use with beam #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions profile_2bmb/startup/20-signals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ class ExperimentInfo(Device):

if aps.inUserOperations:
# no scans until A_shutter is open
##fdc suspend_A_shutter = bluesky.suspenders.SuspendFloor(A_shutter.pss_state, 1)
suspend_A_shutter = bluesky.suspenders.SuspendFloor(A_shutter.pss_state, 1)
#suspend_A_shutter.install(RE)
##fdc RE.install_suspender(suspend_A_shutter)
RE.install_suspender(suspend_A_shutter)

# no scans if aps.current is too low
##fdc suspend_APS_current = bluesky.suspenders.SuspendFloor(aps_current, 2, resume_thresh=10)
##fdc RE.install_suspender(suspend_APS_current)
suspend_APS_current = bluesky.suspenders.SuspendFloor(aps_current, 2, resume_thresh=10)
RE.install_suspender(suspend_APS_current)
pass

#pf4 = APS_devices.DualPf4FilterBox("2bmb:pf4:", name="pf4")
Expand Down
8 changes: 3 additions & 5 deletions profile_2bmb/startup/30-busy_fly_scan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ def measure_flats(det, shutter, quantity, expected, samStage, samPos):
priorPosition = samStage.position
yield from bps.sleep(1) # arbitrary, shutter won't move without it
yield from bps.mv(
##fdc shutter, "open",
shutter, "close",
shutter, "open",
samStage, samPos,
det.cam.trigger_mode, "Internal",
det.cam.frame_type, 2, # white
Expand Down Expand Up @@ -129,8 +128,7 @@ def tomo_scan(*, start=0, stop=180, numProjPerSweep=1500, slewSpeed=5, accl=1, s
# assigns darks, whites, images to proper datasets in HDF5 file
det = pg3_det
try:
# APS_devices.AD_setup_FrameType(
AD_setup_FrameType(
APS_devices.AD_setup_FrameType(
EPICS_PV_prefix["PG3 PointGrey Grasshopper3"],
scheme="DataExchange"
)
Expand Down Expand Up @@ -264,7 +262,7 @@ def _internal_tomo():
)

# !!! moves the shutter !!!
##fdc yield from bps.abs_set(shutter, "open", group="shutter")
yield from bps.abs_set(shutter, "open", group="shutter")

yield from bps.stop(rotStage)
yield from motor_set_modulo(rotStage, 360.0)
Expand Down