Skip to content

Commit

Permalink
Merge pull request #388 from vshekar/Fix-FMX-autocollection
Browse files Browse the repository at this point in the history
Added transition to SA for FMX if no raster max is found
  • Loading branch information
vshekar authored Jun 7, 2024
2 parents 9c38e77 + 6f487a5 commit c765a38
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions daq_macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,8 @@ def autoRasterLoop(currentRequest):

if not face_on_max_coords:
autoRasterFlag = 0
if daq_utils.beamline == 'fmx':
gov_status = gov_lib.setGovRobot(gov_robot, 'SA')
return 0

RE(bps.mv(gonio.gx, sample_detection["center_x"],
Expand All @@ -343,6 +345,8 @@ def autoRasterLoop(currentRequest):
# Now move to the hot cell of the face on raster, then start standard collection
if not ortho_max_coords:
autoRasterFlag = 0
if daq_utils.beamline == 'fmx':
gov_status = gov_lib.setGovRobot(gov_robot, 'SA')
return 0

logger.info(f"AUTORASTER LOOP: {face_on_max_coords=} {ortho_max_coords=}")
Expand Down

0 comments on commit c765a38

Please sign in to comment.