From f6a7fa5fe1c5ee6d4bb3d092dc31ab3753ad4b69 Mon Sep 17 00:00:00 2001 From: Generic Bliss account for Control Software <blissadm@scisoft10.esrf.fr> Date: Tue, 12 Nov 2024 17:41:03 +0100 Subject: [PATCH] wip --- src/bes/actors/autoMesh.py | 4 +++- src/bes/actors/prepare_collect_without_strategy.py | 3 ++- src/bes/actors/selectAperture.py | 11 ++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/bes/actors/autoMesh.py b/src/bes/actors/autoMesh.py index 1c643494..79a7e0a6 100644 --- a/src/bes/actors/autoMesh.py +++ b/src/bes/actors/autoMesh.py @@ -137,9 +137,11 @@ def run( # noqa C901, R0913 snapshotDir = directory logger.debug("Snapshot directory: {0}".format(snapshotDir)) + collect.setZoomLevel(beamline, zoomLevel, token=token) if beamline not in ["id23eh1", "id23eh2", "id30a3", "id30b"]: - collect.setBackLightLevel(beamline, backLightLevel, token=token) + #DN 8/11/2024 - don't need set zoom done in pmac script + #collect.setBackLightLevel(beamline, backLightLevel, token=token) collect.setFrontLightLevel(beamline, frontLightLevel, token=token) if beamline in ["id23eh1", "id30a1", "id30a3", "id30b"]: _ = collect.setApertureName(beamline, targetApertureName, token=token) diff --git a/src/bes/actors/prepare_collect_without_strategy.py b/src/bes/actors/prepare_collect_without_strategy.py index 5a28a922..02b721c6 100644 --- a/src/bes/actors/prepare_collect_without_strategy.py +++ b/src/bes/actors/prepare_collect_without_strategy.py @@ -127,7 +127,8 @@ def run( # Round to one decimal down minDetectorResolution = int(minDetectorResolution * 10) / 10.0 logger.debug("minDetectorResolution : {0} A".format(minDetectorResolution)) - resolution = min(minDozorVisibleResolution, minDetectorResolution, 4.0) + # use to be min(minDozorVisibleResolution, minDetectorResolution, 4.0) - DN 05/11/2024 + resolution = min(minDozorVisibleResolution, minDetectorResolution, 2.0) # Max resolution logger.debug("highResolution : {0} A".format(highResolution)) resolution = max(resolution, highResolution) diff --git a/src/bes/actors/selectAperture.py b/src/bes/actors/selectAperture.py index d7c747a7..0243b40a 100644 --- a/src/bes/actors/selectAperture.py +++ b/src/bes/actors/selectAperture.py @@ -101,12 +101,13 @@ def run( if beamline in ["id30a1"]: # Select characterisation exposure time depending on aperture + # DN use to be factor 3 less - 05/11/2024 dictApertureExpTime = { - 10: 0.6, - 20: 0.2, - 30: 0.1, - 50: 0.05, - 100: 0.025, + 10: 1.8, + 20: 0.6, + 30: 0.3, + 50: 0.15, + 100: 0.075, } if newApertureSize in dictApertureExpTime and not doFbest: -- GitLab