From 6f88c7ef7e11386ec1ca13ff00c09715a8dfd79b Mon Sep 17 00:00:00 2001 From: Shekar V Date: Tue, 30 Apr 2024 17:08:54 -0400 Subject: [PATCH 1/2] Removed logging statement and import setenergy at fmx --- daq_macros.py | 3 ++- gui/control_main.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daq_macros.py b/daq_macros.py index c8fa56ef..f231a7b9 100644 --- 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 index fb47c0b5..34ff4a97 100644 --- a/gui/control_main.py +++ b/gui/control_main.py @@ -2917,7 +2917,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 From 4d6ad9316ae8f3efeda808662602da98a3f50166 Mon Sep 17 00:00:00 2001 From: Shekar V Date: Mon, 20 May 2024 15:26:39 -0400 Subject: [PATCH 2/2] Removed extra parameter in fillPolyRaster --- gui/control_main.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gui/control_main.py b/gui/control_main.py index 34ff4a97..85f20961 100644 --- 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():