Using DETECTOR_SAFE_DISTANCE instead ot ROBOT_MIN_DISTANCE

NSLS-II · Jul 2, 2024 · 63fb339 · 63fb339
1 parent 8e21202
commit 63fb339
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/config_params.py b/config_params.py
@@ -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

diff --git a/daq_lib.py b/daq_lib.py
@@ -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')