From 6e5f9d301ace1990c0b9322ded745e514c4775b4 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 8 Dec 2020 13:47:05 +0100 Subject: [PATCH] Closedown --- config/config.properties | 4 ++-- config/devices.properties | 8 ++++---- config/settings.properties | 12 ++++++------ config/variables.properties | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/config.properties b/config/config.properties index 96cd91d1..72eb7873 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Tue Nov 24 14:29:41 CET 2020 +#Wed Dec 02 16:26:18 CET 2020 hostName=x03da-cons-1 userManagement=false instanceName=x03da @@ -8,7 +8,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/widmer/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/ilin/pshell-{date}-{time}-{name} serverEnabled=false commandExecutionEvents=false logDaysToLive=50 diff --git a/config/devices.properties b/config/devices.properties index 98cdf479..63ffc00a 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -105,13 +105,13 @@ ManipulatorTempB=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-LAKESHORE:B-TEMP_RBV ManipulatorCoolFlow=ch.psi.pshell.epics.ChannelDouble|X03DA-PC-BRONKHORST:GET-MEASURE|Read||true ManipulatorCoolFlowSet=ch.psi.pshell.epics.Positioner|X03DA-PC-BRONKHORST:SET-SETPOINT X03DA-PC-BRONKHORST:GET-SETPOINT|||true ps1=ch.psi.pshell.epics.AreaDetector|X03DA-ES-PS1:cam1 X03DA-ES-PS1:image1|||true -op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|||true -OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:CentroidX_RBV|Read||true -OpticsCameraSigmaX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:SigmaX_RBV|Read||true +#op-ps1=ch.psi.pshell.epics.AreaDetector|X03DA-OP-PS1:cam1 X03DA-OP-PS1:image1|||true +#OpticsCameraCentroidX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:CentroidX_RBV|Read||true +#OpticsCameraSigmaX=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-PS1:Stats1:SigmaX_RBV|Read||true OpticsFilterZ=ch.psi.pshell.epics.Motor|X03DA-OP-I0:TRZ|||true $dummy=ch.psi.pshell.epics.Motor|XXX|||true img=ch.psi.pshell.imaging.CameraSource|Scienta|||true cam1=ch.psi.pshell.imaging.MjpegSource|http://x03da-cam-1/axis-cgi/mjpg/video.cgi||-200| 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| +#opps1img=ch.psi.pshell.imaging.CameraSource|op-ps1||-500| diff --git a/config/settings.properties b/config/settings.properties index cda00398..e993a26b 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Tue Dec 01 05:43:24 CET 2020 -pgroup=p18432 -proposal=Co-GNRs@Au111 -proposer=widmer +#Wed Dec 02 16:27:54 CET 2020 +pgroup=p18553 +proposal=20200967 +proposer=ilin prefix= -sample=Au111_mica Mo263 -authors=Nestor Samuel +sample=NiBr2/NbSe2 +authors=Carmen Gonzalez Orellana|Djuro Bikaljevic|Maxim Ilyn diff --git a/config/variables.properties b/config/variables.properties index 6dc1f18b..83e226c1 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Dec 01 07:18:53 CET 2020 -FileSequentialNumber=5658 +#Tue Dec 08 08:49:07 CET 2020 +FileSequentialNumber=5777