Merge pull request #379 from vshekar/bug-fixes-2024-1

Removed logging statement and import setenergy at fmx
NSLS-II · May 23, 2024 · da86bb1 · da86bb1
2 parents 0754ebf + 4d6ad93
commit da86bb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/daq_macros.py b/daq_macros.py
@@ -42,7 +42,8 @@
 from config_params import ON_MOUNT_OPTION, OnMountAvailOptions
 from mxbluesky.plans import detect_loop, topview_optimized
 
-from setenergy_lsdc import setELsdc
+if daq_utils.beamline == 'fmx':
+  from setenergy_lsdc import setELsdc
 
 
 try:

diff --git a/gui/control_main.py b/gui/control_main.py
@@ -2051,9 +2051,7 @@ def displayXrecRaster(self, xrecRasterFlag):
             if rasterDef["status"] == RasterStatus.DRAWN.value:
                 self.drawPolyRaster(rasterReq)
             elif rasterDef["status"] == RasterStatus.READY_FOR_FILL.value:
-                self.fillPolyRaster(
-                    rasterReq, waitTime=getBlConfig(RASTER_GUI_XREC_FILL_DELAY)
-                )
+                self.fillPolyRaster(rasterReq)
                 logger.info("polyraster filled by displayXrecRaster")
             elif rasterDef["status"] == RasterStatus.READY_FOR_SNAPSHOT.value:
                 if self.controlEnabled():
@@ -2917,7 +2915,6 @@ def drawInteractiveRasterCB(self):  # any polygon for now, interactive or from x
         stepsize = float(self.rasterStepEdit.text())
 
         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