diff --git a/config/config.properties b/config/config.properties index 2b6c4ef..001d5e0 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Thu Sep 18 12:38:20 CEST 2025 +#Mon Sep 22 08:45:20 CEST 2025 commandQueueSize=-1 commandStatistics=false commandTimeToLive=600000 @@ -31,6 +31,7 @@ scanLazyTableCreation=false scanPreserveTypes=false scanReleaseRecords=false scanSaveLogs=true +scanSaveMeta=true scanSaveOutput=false scanSaveScript=false scanSaveSetpoints=false diff --git a/config/devices.properties b/config/devices.properties index 76beeec..c83c910 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -20,7 +20,7 @@ do8=ch.psi.pshell.modbus.DigitalOutput|et7244 7||5000| Grating_ch=ch.psi.pshell.epics.ChannelString|X11MA-PGM-GRCH:GRATING|||true DiffOrd=ch.psi.pshell.epics.ChannelString|X11MA-PGM:difforder0|||true voltage=ch.psi.pshell.epics.ChannelDouble|X11MA-KEI13:SETVOLTAGE|||true -eiger=ch.psi.pshell.epics.AreaDetector|X11MA-ES1-SD1|||true +eiger=ch.psi.pshell.epics.AreaDetector|X11MA-ES1-EIGER|||true fe_slit_V_ctr=ch.psi.pshell.epics.Motor|X11MA-FE-SV:center|||true fe_slit_H_ctr=ch.psi.pshell.epics.Motor|X11MA-FE-SH:center|||true fe_slit_V_size_offs=ch.psi.pshell.epics.ChannelDouble|X11MA-FE-DSVER.A|||true diff --git a/config/preferences.json b/config/preferences.json index 9259b65..e6865de 100644 --- a/config/preferences.json +++ b/config/preferences.json @@ -57,7 +57,7 @@ "scanTableDisabled" : false, "cachedDataPanel" : false, "dataExtensions" : "log txt xml py png tif tiff mat", - "dataSubFiles" : "*", + "dataSubFiles" : "", "showEmergencyStop" : false, "showHomingButtons" : false, "showJogButtons" : false, diff --git a/config/settings.properties b/config/settings.properties index 267b156..9880927 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Thu Sep 18 13:17:46 CEST 2025 +#Mon Sep 22 17:13:10 CEST 2025 ALPHA_ID_2=0.0 AUTO_SWITCH_BEAMLINE=false AUTO_SWITCH_SHUTTER=true diff --git a/config/variables.properties b/config/variables.properties index 61a6807..92e2677 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Thu Sep 18 13:46:14 CEST 2025 -DaySequentialNumber=12 -FileSequentialNumber=71 -LastRunDate=250918 +#Mon Sep 22 17:17:03 CEST 2025 +DaySequentialNumber=16 +FileSequentialNumber=88 +LastRunDate=250922 diff --git a/devices/scan_1_axis_0000.tiff.properties b/devices/scan_1_axis_0000.tiff.properties deleted file mode 100644 index 25ae954..0000000 --- a/devices/scan_1_axis_0000.tiff.properties +++ /dev/null @@ -1,20 +0,0 @@ -#Thu Sep 18 13:30:22 CEST 2025 -flipHorizontally=false -flipVertically=false -grayscale=false -invert=false -rescaleFactor=1.0 -rescaleOffset=0.0 -roiHeight=-1 -roiWidth=-1 -roiX=0 -roiY=0 -rotation=0.0 -rotationCrop=false -scale=1.0 -spatialCalOffsetX=NaN -spatialCalOffsetY=NaN -spatialCalScaleX=NaN -spatialCalScaleY=NaN -spatialCalUnits=mm -transpose=false diff --git a/script/local.py b/script/local.py index 1d5af2a..4bd9642 100644 --- a/script/local.py +++ b/script/local.py @@ -1,5 +1,4 @@ FormatCSV.setDefaultItemSeparator(", ") -get_data_manager().createLogs=False IMAGING_ROI = None @@ -687,12 +686,12 @@ def on_change_data_path(path): #Sounds ################################################################################################### def on_command_started(info): - if not get_interpreter().isLocalMode(): + if not Setup.isLocal(): if info.script and not info.background: play_sound("start") def on_command_finished(info): - if not get_interpreter().isLocalMode(): + if not Setup.isLocal(): if info.script and not info.background: if (info.isError()): if not info.isAborted(): diff --git a/script/test/tets_scan_tiff_stack.py b/script/test/tets_scan_tiff_stack.py index cc1abc2..bc7b495 100644 --- a/script/test/tets_scan_tiff_stack.py +++ b/script/test/tets_scan_tiff_stack.py @@ -1,4 +1,4 @@ - +""" class Detector(ReadonlyRegisterBase, ReadonlyRegisterMatrix): def doRead(self): return Convert.toUnsigned(axis.dataMatrix.read()) @@ -11,5 +11,8 @@ class Detector(ReadonlyRegisterBase, ReadonlyRegisterMatrix): detector=Detector("detector") detector.initialize() +""" +detector=eiger.dataMatrix +tscan((energy_rbk, detector), 5, 1.0) tscan((energy_rbk, detector), 5, 1.0, stack=True) \ No newline at end of file