From e602de9f50fec991fa92ecddef32258ab462e1cd Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 21 Jan 2022 11:02:05 +0100 Subject: [PATCH] Closedown --- config/config.properties | 4 ++-- config/devices_femto.properties | 15 +++++++-------- config/settings.properties | 10 +++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/config/config.properties b/config/config.properties index 05dfd5ab..437f631d 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Thu Dec 16 12:24:46 CET 2021 +#Fri Jan 21 10:49:04 CET 2022 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -26,7 +26,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/devices_femto.properties b/config/devices_femto.properties index 03595f6d..33192fd7 100644 --- a/config/devices_femto.properties +++ b/config/devices_femto.properties @@ -82,13 +82,13 @@ ExitSlit=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-EXS:AP|||false ExitSlitY=ch.psi.pshell.epics.Motor|X03DA-OP-EXS:Y||| FocusWaterTemp=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-HUBER:TEMP-I-RBV|Read||true AuxVoltage=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4|Read||true -SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP1:GainSel|Read||true -RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP2:GainSel|Read||true -AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|||true -SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||true -RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||true -AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||true -AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||true +SampleCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP1:GainSel|||false +RefCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP2:GainSel|||false +AuxCurrentGain=ch.psi.pshell.epics.ChannelString|X03DA-OP-CURAMP3:GainSel|||false +SampleCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC1.N|||false +RefCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC2.N|||false +AuxCurrentAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC3.N|||false +AuxVoltageAveraging=ch.psi.pshell.epics.ChannelDouble|X03DA-OP:CADC4.N|||false SampleCurrentSampling=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-ADC1:Vraw.SCAN|Read||true RefCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC2:Vraw.SCAN|Read||true AuxCurrentSampling=ch.psi.pshell.epics.ChannelString|X03DA-OP-ADC3:Vraw.SCAN|Read||true @@ -110,4 +110,3 @@ cam1=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-1/axis-cgi/mjpg/video.cg cam2=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-2/axis-cgi/mjpg/video.cgi||-1000| ps1img=ch.psi.pshell.imaging.CameraSource|ps1||-500|false #opps1img=ch.psi.pshell.imaging.CameraSource|op-ps1||-500| - diff --git a/config/settings.properties b/config/settings.properties index c55017a7..4b1e5d99 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Mon Dec 20 18:56:12 CET 2021 -pgroup=p19371 +#Fri Jan 21 10:49:04 CET 2022 +pgroup=p17274 proposal= -proposer=heinrich_m +proposer=bl-dev prefix= -sample=VA2665b-evaporated-GeTe -authors=Martin Heinrich +sample= +authors=matthias muntwiler