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

Using DETECTOR_SAFE_DISTANCE instead ot ROBOT_MIN_DISTANCE #394

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Using DETECTOR_SAFE_DISTANCE instead ot ROBOT_MIN_DISTANCE #394

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
3 changes: 0 additions & 3 deletions config_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ class OnMountAvailOptions(Enum):
SAMPLE_TIMER_DELAY = 0
SERVER_CHECK_DELAY = 2000

ROBOT_MIN_DISTANCE = 200.0
ROBOT_DISTANCE_TOLERANCE = 0.050

FAST_DP_MIN_NODES = 4
SPOT_MIN_NODES = 8
MOUNT_SUCCESSFUL = 1
Expand Down
2 changes: 1 addition & 1 deletion daq_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def runDCQueue(): #maybe don't run rasters from here???
logger.info("processing request " + str(time.time()))
reqObj = currentRequest["request_obj"]
gov_lib.set_detz_in(gov_robot, reqObj["detDist"])
if (reqObj["detDist"] >= ROBOT_MIN_DISTANCE and getBlConfig("HePath") == 0):
if (reqObj["detDist"] >= DETECTOR_SAFE_DISTANCE[daq_utils.beamline] and getBlConfig("HePath") == 0):
gov_lib.set_detz_out(gov_robot, reqObj["detDist"])
sampleID = currentRequest["sample"]
mountedSampleDict = db_lib.beamlineInfo(daq_utils.beamline, 'mountedSample')
Expand Down