From b658ce0a153ba3bd87b564d52835d882d4ce94a9 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Wed, 17 Dec 2025 09:56:56 +0100 Subject: [PATCH] --- config/variables.properties | 6 +++--- script/templates/EigerAbsSpec.py | 12 +++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/config/variables.properties b/config/variables.properties index 5512bff..4a0ccc2 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Wed Dec 17 09:47:43 CET 2025 -DaySequentialNumber=6 -FileSequentialNumber=633 +#Wed Dec 17 09:55:52 CET 2025 +DaySequentialNumber=8 +FileSequentialNumber=635 LastRunDate=251217 diff --git a/script/templates/EigerAbsSpec.py b/script/templates/EigerAbsSpec.py index 66129bd..9fe57e2 100644 --- a/script/templates/EigerAbsSpec.py +++ b/script/templates/EigerAbsSpec.py @@ -2,12 +2,12 @@ if (get_exec_pars().source == CommandSource.ui) and (get_exec_pars().script == "EigerAbsSpec") : ROI = {"Region1": [10,5,20, 10], "Region2": [20,15,20, 10]} SAVE_SPECTRUM = True - SAVE_IMAGES = False + SAVE_IMAGES = True WITH_I0 = True SWITCH_POL = False EXPOSURE = 1.0 AVERAGE = 1 - NUMBER_SCANS =1 + NUMBER_SCANS = 2 RANGES = [[600.0, 605.0, 1.0]] DRIFT_CORRECTION = True @@ -67,18 +67,12 @@ def grab_image(position, scan): global av av = average_eiger_frames(AVERAGE, roi=None, wait_next=True) if SAVE_IMAGES: - #filename = get_exec_pars().path + "/" + str(scan.currentPass) + "/s" + "{seq}%03d" + "_" + ("%03d.tif" % scan.recordIndex) - #filename = Setup.expandPath(filename) - #print filename metadata = get_diags() if SAVE_DIAGS else {} - #save_as_tiff(av, filename, metadata=metadata) FormatTIFF.setMetadata(metadata) - if DRIFT_CORRECTION and (calc_roi is not None): global ref_image - #filename = get_exec_pars().path + "/" + str(scan.currentPass) + "_corr/cs" + "{seq}%03d" + "_" + ("%03d.tif" % scan.recordIndex) scan_name = get_data_manager().getScanPath(scan) - filename = get_exec_pars().path + "/" + scan_name + "_corr_" + ("%04d.tiff" % (scan.recordIndex-1)) + filename = get_exec_pars().path + "/" + scan_name + "_corr_" + ("%04d.tiff" % (scan.recordIndexInPass-1)) filename = Setup.expandPath(filename) if ref_image is None: ref_image = av