Added configurable raster size and logging change

NSLS2 · Apr 17, 2024 · eaff8ad · eaff8ad
1 parent 7a9eff3
commit eaff8ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/config_params.py b/config_params.py
@@ -1,5 +1,6 @@
+import grp
+import os
 from enum import Enum
-import os, grp
 
 # BlConfig parameter variable names
 
@@ -108,6 +109,8 @@ class RasterStatus(Enum):
     "nyx": {"min": 0.001, "max": 0.999, "digits": 3},
 }
 
+MINIMUM_RASTER_SIZE = {"amx": 6, "fmx": 6, "nyx": 2}
+
 LSDC_SERVICE_USERS = ("lsdc-amx", "lsdc-fmx", "lsdc-nyx")
 IS_STAFF = (
     True

diff --git a/gui/control_main.py b/gui/control_main.py
@@ -36,6 +36,7 @@
     VALID_TRANSMISSION,
     RasterStatus,
     cryostreamTempPV,
+    MINIMUM_RASTER_SIZE
 )
 from daq_utils import getBlConfig, setBlConfig
 from element_info import element_info
@@ -2884,8 +2885,8 @@ def drawInteractiveRasterCB(self):  # any polygon for now, interactive or from x
         numsteps_h = raster_h/stepsizeYPix
         stepsize = float(self.rasterStepEdit.text())
 
-        while (numsteps_w < 6 and numsteps_h < 6):
-            print(numsteps_h, numsteps_w, stepsize, stepsizeXPix, stepsizeYPix)
+        while (numsteps_w < MINIMUM_RASTER_SIZE[daq_utils.beamline] and numsteps_h < MINIMUM_RASTER_SIZE[daq_utils.beamline]):
+            logger.info(f"{numsteps_h=}, {numsteps_w=}, {stepsize=}, {stepsizeXPix=}, {stepsizeYPix=}")
             if stepsize == 1:
                 logger.error("Cannot add raster request, stepsize must be 1 micron with a minimum width or height of 5 cells")
                 return