2022-08-08 09:46:49 +02:00
parent 7aff507f60
commit 9fe9b50fe8
33 changed files with 427 additions and 208 deletions
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,56 +1,57 @@
-#Tue Aug 31 09:45:29 CEST 2021
+#Fri Jun 17 09:18:11 CEST 2022
+imageSourcesFile={config}/imaging.properties
 autoSaveScanData=true
 simulation=false
+commandExecutionEvents=false
+logDaysToLive=50
 dataScanSaveOutput=false
 userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
+logLevelConsole=Off
+filePermissionsConfig=Public
+scanStreamerPort=-1
 dataScanSaveScript=false
+dataScanSaveSetpoints=false
 notifiedTasks=null
 parallelInitialization=false
+fdaSerialization=false
 dataTransferPath=
 scanStreamingPort=-1
 saveConsoleSessionFiles=false
 devicePoolFile={config}/devices.properties
+versionTrackingManual=true
+dataTransferMode=Off
 hostName=null
+userManagement=false
 disableEmbeddedAttributes=false
+instanceName=X07MA
+dataServerPort=-1
 serverPort=8080
+hideServerMessages=false
 versionTrackingEnabled=true
 dataPath={data}/{year}_{month}/{date}
 serverEnabled=false
 depthDimension=0
+dataScanReleaseRecords=false
+dataScanPreserveTypes=false
 logLevel=Fine
+dataScanFlushRecords=true
+logPath={logs}/{date}_{time}
+filePermissionsLogs=Default
 dataLayout=fda
 disableDataFileLogs=false
 sessionHandling=Files
 deviceUpdateStrategyFile={config}/update.properties
 terminalEnabled=true
 notificationLevel=Off
+filePermissionsScripts=Public
 terminalPort=3579
+tasksFile={config}/tasks.properties
 dataTransferUser=
+filePermissionsData=Default
+createSessionFiles=false
 versionTrackingLogin={context}/svcusr-hlapp_robot
 scriptType=py
 noBytecodeFiles=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x07ma.git
-imageSourcesFile={config}/imaging.properties
-commandExecutionEvents=false
-logDaysToLive=50
-logLevelConsole=Off
-filePermissionsConfig=Public
-scanStreamerPort=-1
-dataScanSaveSetpoints=false
-versionTrackingManual=true
-dataTransferMode=Off
-userManagement=false
-instanceName=X07MA
-dataServerPort=-1
-hideServerMessages=false
-dataScanReleaseRecords=false
-dataScanPreserveTypes=false
-dataScanFlushRecords=true
-logPath={logs}/{date}_{time}
-filePermissionsLogs=Default
-filePermissionsScripts=Public
-tasksFile={config}/tasks.properties
-filePermissionsData=Default
-createSessionFiles=false
 dataProvider=fda
 saveCommandStatistics=false
--- a/config/harmonic_scan_energies.properties
+++ b/config/harmonic_scan_energies.properties
@@ -1,5 +1,4 @@
-Nd=1003.3
-Mg=1310.0
+Na=1075.0
 F=695.0
 Gd=1189.0
 Ba=790.0
@@ -15,10 +14,14 @@ Fe=705.0
 Ge=1230.0
 Ho=1360.0
 La=840.0
+Lu=1610.0
+Mg=1310.0
 Mn=641.0
 N=410.0
+Nd=1003.3
 Ni=852.0
 O=543.0
+Ru=475.0
 Sm=1110.0
 V=520.0
 Tb=1250.0
--- a/config/harmonic_scan_offsets.properties
+++ b/config/harmonic_scan_offsets.properties
@@ -1,92 +1,101 @@
-#Mon Feb 28 11:55:31 CET 2022
-Ni-C+=1.0 06.02.22 15\:42
-W_M45-C-=1.0 26.04.21 15\:51
-N-C+=-0.5 28.11.21 22\:28
+#Thu Jun 30 19:05:46 CEST 2022
+Ni-C+=0.75 17.06.22 14\:26
 Mg-LH=6.5 21.10.21 14\:15
-Cu-C-=3.0 24.01.22 11\:16
-Zn-LV=3.0 28.02.22 11\:55
-Cu-C+=3.5 28.02.22 11\:36
-V-C-=1.0 23.02.22 09\:10
-Ni-C-=2.0 06.02.22 15\:47
+N-C+=4.4 28.04.22 05\:59
+V-C-=1.5 11.05.22 09\:35
+Ni-C-=2.75 17.06.22 14\:29
+Gd-C-=-1.5 22.04.22 08\:35
+N-C-=5.9 28.04.22 06\:04
+Gd-C+=-5.0 22.04.22 10\:32
+Mg-LV=6.5 20.10.21 20\:27
+Ti-LV=1.7999999999999998 03.05.22 16\:09
+Fe-LH=3.0 02.02.22 09\:48
+Tb-C-=0.5 19.09.21 04\:59
+Tb-C+=-7.75 22.06.22 14\:07
+Fe-LV=3.0 02.02.22 09\:50
+V-C+=-0.5 11.05.22 09\:33
+Cu-LV=4.0 09.05.22 21\:03
+Zn-C-=10.0 19.04.21 10\:02
+V-LV=2.0 23.02.22 19\:29
+Zn-C+=7.5 19.04.21 09\:59
+Er-C+=-6.0 25.04.22 23\:36
+Er-C-=-1.0 25.04.22 23\:37
+C-LV=2.5 06.05.21 03\:41
+Ru-C+=-0.7 04.05.22 12\:48
+Gd-LV=7.5 22.04.22 09\:09
+N-LV=1.5 17.06.22 12\:32
+Ru-C-=0.8 04.05.22 12\:50
+Ti-C+=-0.5 24.02.22 10\:21
+Ti-C-=0.5 24.02.22 10\:22
+W-C+=-0.5 22.04.21 09\:53
+Dy-LV=6.0 22.04.22 15\:41
+C-LH=2.0 06.05.21 03\:39
+Gd-LH=6.0 22.04.22 08\:38
+Ge-C+=-5.0 09.09.20 14\:23
+Dy-LH=5.5 22.04.22 15\:39
+Ti-LH=1.8 03.05.22 16\:07
+Ba-LH=5.0 07.12.21 22\:25
+Eu-C-=-2.0 24.02.22 10\:25
+Mn-LH=3.0 13.05.22 10\:40
+Eu-C+=-5.5 24.02.22 10\:27
+Ce-LV=4.0 20.08.21 14\:27
+Sm-LH=4.0 20.08.21 10\:55
+Cr-LV=2.5 03.11.21 02\:10
+Ge-C-=0.0 09.09.20 14\:24
+Cu-LH=4.0 09.05.22 21\:01
+V-LH=2.0 23.02.22 19\:27
+Ba-LV=5.5 07.12.21 22\:23
+Ce-LH=4.5 20.08.21 14\:25
+Mn-LV=3.0 13.05.22 10\:42
+Er-LH=6.0 24.04.21 13\:43
+Sm-LV=4.0 20.08.21 10\:57
+N-LH=1.5 09.05.22 21\:11
+W_M45-C-=1.0 26.04.21 15\:51
+Cu-C-=-2.1 27.04.22 18\:15
+Zn-LV=3.5 09.05.22 20\:54
+Cu-C+=-4.6 27.04.22 18\:13
 Ho-C+=-5.0 08.03.21 00\:56
 Co-LV=3.5 14.12.21 17\:47
 Al-LV=-10.0 19.04.21 09\:56
 Er-LV=6.0 24.04.21 13\:44
-Gd-C-=-1.0 17.12.21 09\:23
-N-C-=-1.0 03.02.22 16\:33
-Gd-C+=-3.5 17.12.21 17\:23
-Mg-LV=6.5 20.10.21 20\:27
-Ti-LV=2.0 24.02.22 10\:19
-Dy-C+=-3.0 07.12.21 22\:56
-Dy-C-=-1.0 27.01.21 02\:56
+Dy-C+=-6.6 27.04.22 08\:38
+Dy-C-=-1.6 27.04.22 08\:39
 Ho-C-=0.0 08.03.21 00\:57
 Eu-LH=4.0 24.02.22 10\:28
-O-LH=3.0 07.12.21 22\:27
-Cr-LH=2.5 03.11.21 02\:09
+O-LH=2.3 04.05.22 12\:55
+Cr-LH=2.5 27.06.22 15\:35
 W_M45-C+=-1.0 26.04.21 15\:49
-Cr-C+=-0.5 04.11.21 11\:54
+Cr-C+=-0.5 27.06.22 15\:38
 O-C+=3.0 20.09.21 01\:51
-Fe-LH=3.0 02.02.22 09\:48
 Eu-LV=4.5 24.02.22 10\:30
-Tb-C-=0.5 19.09.21 04\:59
 W-C-=1.0 22.04.21 09\:51
-Tb-C+=-3.5 19.09.21 05\:00
+Nd-LH=4.0 13.05.22 11\:06
 Ce-C-=3.5 20.08.21 14\:20
-Cr-C-=1.0 04.11.21 11\:52
+Cr-C-=2.0 30.06.22 19\:05
 O-C-=4.5 20.09.21 01\:49
 Ce-C+=2.5 20.08.21 14\:23
 Ge-LV=6.0 09.09.20 14\:22
-Fe-LV=3.0 02.02.22 09\:50
-Zn-LH=3.0 28.02.22 11\:54
-V-C+=-1.0 24.01.22 11\:24
+Zn-LH=3.5 09.05.22 20\:52
 Sm-C+=-5.0 20.08.21 14\:29
-Mn-C-=1.0 23.01.22 11\:26
-Mn-C+=-1.5 23.01.22 11\:24
+Mn-C-=2.0 11.05.22 21\:05
+Mn-C+=-0.7 04.05.22 12\:53
 Ge-LH=6.0 09.09.20 14\:19
 Sm-C-=-1.5 08.09.20 21\:19
 Co-LH=3.5 14.12.21 17\:46
-Cu-LV=4.5 28.02.22 11\:39
-Zn-C-=10.0 19.04.21 10\:02
-V-LV=2.0 23.02.22 19\:29
-Ni-LV=4.0 02.11.21 19\:47
-Zn-C+=7.5 19.04.21 09\:59
-Er-C+=-4.0 18.10.20 10\:34
-Co-C-=2.5 14.12.21 17\:44
-Er-C-=3.0 17.10.20 10\:50
-Co-C+=1.0 14.12.21 17\:43
+Ni-LV=3.5 17.06.22 11\:03
+Co-C-=1.5 25.06.22 10\:21
+Co-C+=-0.5 25.06.22 10\:24
 Ho-LH=7.0 11.03.21 02\:17
-C-LV=2.5 06.05.21 03\:41
-N-LV=1.5 28.02.22 11\:50
-Ti-C+=-0.5 24.02.22 10\:21
-Ti-C-=0.5 24.02.22 10\:22
-Ni-LH=4.0 02.11.21 19\:46
-W-C+=-0.5 22.04.21 09\:53
-Dy-LV=6.5 07.12.21 22\:52
-Nd-C-=-2.5 24.09.21 15\:05
+Ni-LH=3.5 17.06.22 11\:01
+Nd-C-=-1.0 13.05.22 11\:04
 Ho-LV=7.0 11.03.21 02\:19
-C-LH=2.0 06.05.21 03\:39
-Ge-C+=-5.0 09.09.20 14\:23
-Dy-LH=6.5 07.12.21 22\:54
-Ti-LH=2.0 24.02.22 10\:17
-Ba-LH=5.0 07.12.21 22\:25
-Eu-C-=-2.0 24.02.22 10\:25
-Nd-C+=-4.5 03.11.21 04\:46
-Mn-LH=1.5 23.01.22 11\:20
-Eu-C+=-5.5 24.02.22 10\:27
-Ce-LV=4.0 20.08.21 14\:27
-Sm-LH=4.0 20.08.21 10\:55
-O-LV=3.0 07.12.21 22\:29
-Cr-LV=2.5 03.11.21 02\:10
-Ge-C-=0.0 09.09.20 14\:24
+La-C-=4.0 13.05.22 10\:51
+La-C+=1.0 13.05.22 10\:53
+Nd-C+=-5.0 13.05.22 11\:00
+O-LV=2.3 04.05.22 13\:00
 Fe-C-=2.0 02.02.22 09\:47
-Cu-LH=4.5 28.02.22 11\:37
-V-LH=2.0 23.02.22 19\:27
-Ba-LV=5.5 07.12.21 22\:23
-Ce-LH=4.5 20.08.21 14\:25
-Mn-LV=1.5 23.01.22 11\:22
+Na-C-=-2.0 30.06.22 12\:29
+Na-C+=-6.0 30.06.22 12\:27
 Er_C+=-4.3 30.06.20 21\:58
 Al-LH=10.0 19.04.21 09\:55
-Er-LH=6.0 24.04.21 13\:43
-Sm-LV=4.0 20.08.21 10\:57
 Fe-C+=0.0 02.02.22 09\:43
-N-LH=1.5 28.02.22 11\:52
--- a/config/preferences.bin
+++ b/config/preferences.bin
--- a/config/preferences.json
+++ b/config/preferences.json
@@ -0,0 +1,117 @@
+{
+  "fontShellPanel" : {
+    "name" : "Monospaced",
+    "style" : 0,
+    "size" : 13
+  },
+  "fontShellCommand" : {
+    "name" : "SansSerif",
+    "style" : 0,
+    "size" : 13
+  },
+  "fontOutput" : {
+    "name" : "Monospaced",
+    "style" : 0,
+    "size" : 13
+  },
+  "fontEditor" : {
+    "name" : "Monospaced",
+    "style" : 0,
+    "size" : 13
+  },
+  "fontPlotLabel" : {
+    "name" : "SansSerif",
+    "style" : 0,
+    "size" : 11
+  },
+  "fontPlotTick" : {
+    "name" : "SansSerif",
+    "style" : 0,
+    "size" : 10
+  },
+  "fontPlotTitle" : {
+    "name" : "SansSerif",
+    "style" : 1,
+    "size" : 13
+  },
+  "fontTerminal" : {
+    "name" : "Monospaced",
+    "style" : 0,
+    "size" : 14
+  },
+  "tabSize" : 4,
+  "contentWidth" : 0,
+  "editorBackground" : -1,
+  "editorForeground" : -1,
+  "simpleEditor" : false,
+  "hideEditorLineNumbers" : false,
+  "hideEditorContextMenu" : false,
+  "consoleLocation" : "Status",
+  "dataPanelLocation" : null,
+  "openDataFilesInDocTab" : false,
+  "noVariableEvaluationPropagation" : false,
+  "processingScripts" : [ ],
+  "asyncViewersUpdate" : false,
+  "scanPlotDisabled" : false,
+  "scanTableDisabled" : false,
+  "cachedDataPanel" : false,
+  "dataExtensions" : null,
+  "hideFileName" : false,
+  "showEmergencyStop" : false,
+  "showHomingButtons" : false,
+  "showJogButtons" : false,
+  "hideScanPanel" : false,
+  "hideOutputPanel" : false,
+  "showXScanFileBrowser" : false,
+  "showXScanDataViewer" : false,
+  "showQueueBrowser" : false,
+  "backgroundRendering" : false,
+  "showImageStatusBar" : false,
+  "persistRendererWindows" : false,
+  "defaultRendererColormap" : "Grayscale",
+  "linePlot" : "ch.psi.pshell.plot.LinePlotJFree",
+  "matrixPlot" : "ch.psi.pshell.plot.MatrixPlotJFree",
+  "surfacePlot" : "null",
+  "timePlot" : "ch.psi.pshell.plot.TimePlotJFree",
+  "plotsDetached" : false,
+  "plotLayout" : "Vertical",
+  "quality" : "High",
+  "defaultPlotColormap" : "Temperature",
+  "markerSize" : 1,
+  "plotBackground" : -1,
+  "gridColor" : null,
+  "outlineColor" : null,
+  "disableOffscreenBuffer" : false,
+  "defaultPanels" : [ {
+    "deviceClassName" : "ch.psi.pshell.epics.Scaler",
+    "panelClassName" : "ch.psi.pshell.swing.ScalerPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.epics.Scienta",
+    "panelClassName" : "ch.psi.pshell.swing.ScientaPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.Motor",
+    "panelClassName" : "ch.psi.pshell.swing.MotorPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.ProcessVariable",
+    "panelClassName" : "ch.psi.pshell.swing.ProcessVariablePanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.MotorGroup",
+    "panelClassName" : "ch.psi.pshell.swing.MotorGroupPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.DiscretePositioner",
+    "panelClassName" : "ch.psi.pshell.swing.DiscretePositionerPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.Camera",
+    "panelClassName" : "ch.psi.pshell.swing.CameraPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.Slit",
+    "panelClassName" : "ch.psi.pshell.swing.SlitPanel"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterArray",
+    "panelClassName" : "ch.psi.pshell.swing.DeviceValueChart"
+  }, {
+    "deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterMatrix",
+    "panelClassName" : "ch.psi.pshell.swing.DeviceValueChart"
+  } ],
+  "scriptPopupDialog" : "None"
+}
--- a/config/scicat.properties
+++ b/config/scicat.properties
@@ -1,11 +1,11 @@
-#Tue Oct 19 11:57:18 CEST 2021
+#Tue May 03 10:59:30 CEST 2022
 environment=prod
 testParameters=-testenv -user slsxtreme\:kyzWxAfqu6
-sourceFolder=/sls/X07MA/Data1/e19389
+sourceFolder=/sls/X07MA/Data1/x07maop
 prodParameters=\ -user slsxtreme\:kyzWxAfqu6
 devParameters=-devenv -user slsxtreme\:kyzWxAfqu6
-ownerGroup=
+ownerGroup=p19648
 type=raw
 parameters=-ingest -allowexistingsource -noninteractive -autoarchive
 creationLocation=/PSI/SLS/XTREME
-principalInvestigator=
+principalInvestigator=Maciej Bazarnik
--- a/config/session_metadata.properties
+++ b/config/session_metadata.properties
@@ -1,6 +1,6 @@
-#Tue Aug 31 11:08:32 CEST 2021
-Sample=String
+#Sat Apr 09 11:12:55 CEST 2022
+Sample=String;SrMnO3
 keywords=List;[]
-owner=String;Cinthia Piamonteze
-ownerEmail=String;cinthia.piamonteze@psi.ch
-contactEmail=String;cinthia.piamonteze@psi.ch
+owner=String;Eric Langenberg
+ownerEmail=String;eric.langenberg@ub.edu
+contactEmail=String;eric.langenberg@ub.edu
--- a/config/sessions.properties
+++ b/config/sessions.properties
@@ -1,2 +1,3 @@
-#Tue Oct 19 11:55:58 CEST 2021
-SessionCounter=6
+#Sat Jul 02 12:09:34 CEST 2022
+SessionCounter=11
+CurrentSession=11
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -1,7 +1,9 @@
-#Tue Apr 06 11:52:39 CEST 2021
+#Fri Jun 17 09:18:11 CEST 2022
 scriptPath={home}/script
 sessionsPath={outp}/sessions
 configFileDevices={config}/devices.properties
+xscanPath={script}
+queuePath={script}
 extensionsPath={home}/extensions
 configFileUpdateStrategy={config}/update.properties
 configPath={home}/config
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,5 +1,5 @@
-#Mon Feb 28 18:57:33 CET 2022
-LastRunDate=220228
+#Mon Jul 04 18:15:57 CEST 2022
+LastRunDate=220704
 SessionCounter=0
-FileSequentialNumber=17477
-DaySequentialNumber=98
+FileSequentialNumber=19363
+DaySequentialNumber=11
--- a/devices/au_mesh.properties
+++ b/devices/au_mesh.properties
@@ -1,9 +1,10 @@
-#Fri Sep 20 16:53:49 CEST 2019
+#Fri Jun 17 09:18:15 CEST 2022
 offset=0.0
 maxValue=250.0
 precision=6
 rotation=false
 scale=1.0
+description=null
 estbilizationDelay=0
 maxSpeed=NaN
 resolution=3.0E-4
--- a/devices/exit_slit.properties
+++ b/devices/exit_slit.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=NaN
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=NaN
-offset=0.0
-precision=6
-resolution=NaN
-scale=1.0
-sign_bit=0
 unit=um
+offset=0.0
+maxValue=NaN
+precision=6
+sign_bit=0
+scale=1.0
+description=null
+resolution=NaN
--- a/devices/field_x.properties
+++ b/devices/field_x.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=20.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=-20.0
-offset=0.0
-precision=-6
-resolution=NaN
-scale=1.0
-sign_bit=0
 unit=T
+offset=0.0
+maxValue=20.0
+precision=-6
+sign_bit=0
+scale=1.0
+description=null
+resolution=NaN
--- a/devices/field_x_ips.properties
+++ b/devices/field_x_ips.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=6.85
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=-6.85
-offset=0.0
-precision=4
-resolution=0.005
-scale=1.0
-sign_bit=0
 unit=T
+offset=0.0
+maxValue=6.85
+precision=4
+sign_bit=0
+scale=1.0
+description=null
+resolution=0.005
--- a/devices/field_z.properties
+++ b/devices/field_z.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=20.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=-20.0
-offset=0.0
-precision=-6
-resolution=NaN
-scale=1.0
-sign_bit=0
 unit=T
+offset=0.0
+maxValue=20.0
+precision=-6
+sign_bit=0
+scale=1.0
+description=null
+resolution=NaN
--- a/devices/gold_mesh.properties
+++ b/devices/gold_mesh.properties
@@ -1,9 +1,10 @@
-#Fri Sep 20 16:53:49 CEST 2019
+#Fri Jun 17 09:18:15 CEST 2022
 offset=0.0
 maxValue=250.0
 precision=6
 rotation=false
 scale=1.0
+description=null
 estbilizationDelay=0
 maxSpeed=NaN
 resolution=3.0E-4
--- a/devices/gold_mesh2.properties
+++ b/devices/gold_mesh2.properties
@@ -1,9 +1,10 @@
-#Fri Sep 20 16:53:49 CEST 2019
+#Fri Jun 17 09:18:15 CEST 2022
 offset=0.0
 maxValue=250.0
 precision=6
 rotation=false
 scale=1.0
+description=null
 estbilizationDelay=0
 maxSpeed=NaN
 resolution=3.0E-4
--- a/devices/needle.properties
+++ b/devices/needle.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=100.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=0.0
-offset=0.0
-precision=3
-resolution=NaN
-scale=1.0
-sign_bit=0
 unit=%
+offset=0.0
+maxValue=100.0
+precision=3
+sign_bit=0
+scale=1.0
+description=null
+resolution=NaN
--- a/devices/ramp_rate_x.properties
+++ b/devices/ramp_rate_x.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=2.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=0.0
-offset=0.0
-precision=6
-resolution=0.1
-scale=1.0
-sign_bit=0
 unit=T/min
+offset=0.0
+maxValue=2.0
+precision=6
+sign_bit=0
+scale=1.0
+description=null
+resolution=0.1
--- a/devices/ramp_rate_x_ips.properties
+++ b/devices/ramp_rate_x_ips.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=2.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=0.0
-offset=0.0
-precision=4
-resolution=NaN
-scale=1.0
-sign_bit=0
 unit=T/min
+offset=0.0
+maxValue=2.0
+precision=4
+sign_bit=0
+scale=1.0
+description=null
+resolution=NaN
--- a/devices/ramp_rate_z.properties
+++ b/devices/ramp_rate_z.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=2.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=0.0
-offset=0.0
-precision=6
-resolution=0.1
-scale=1.0
-sign_bit=0
 unit=T/min
+offset=0.0
+maxValue=2.0
+precision=6
+sign_bit=0
+scale=1.0
+description=null
+resolution=0.1
--- a/devices/sample_hor.properties
+++ b/devices/sample_hor.properties
@@ -1,10 +1,11 @@
-#Thu Jul 15 14:09:19 CEST 2021
+#Fri Jun 17 09:18:15 CEST 2022
+minValue=93.0
+unit=mm
 offset=0.0
 maxValue=170.0
 rotation=false
 precision=6
-scale=1.0
-resolution=0.001
-minValue=93.0
-unit=mm
 sign_bit=0
+scale=1.0
+description=null
+resolution=0.001
--- a/devices/sample_rot.properties
+++ b/devices/sample_rot.properties
@@ -1,9 +1,10 @@
-#Fri Sep 20 16:53:49 CEST 2019
+#Fri Jun 17 09:18:15 CEST 2022
 offset=0.0
 maxValue=121.08000000000001
 precision=6
 rotation=false
 scale=1.0
+description=null
 estbilizationDelay=0
 maxSpeed=NaN
 resolution=0.0018
--- a/devices/sample_vert.properties
+++ b/devices/sample_vert.properties
@@ -1,9 +1,10 @@
-#Fri Sep 20 16:53:49 CEST 2019
+#Fri Jun 17 09:18:15 CEST 2022
 offset=0.0
 maxValue=45.0
 precision=6
 rotation=false
 scale=1.0
+description=null
 estbilizationDelay=0
 maxSpeed=NaN
 resolution=1.3E-4
--- a/devices/temperature.properties
+++ b/devices/temperature.properties
@@ -1,9 +1,10 @@
-#Wed Mar 06 10:06:34 CET 2019
-maxValue=380.0
+#Fri Jun 17 09:18:15 CEST 2022
 minValue=1.0
-offset=0.0
-precision=3
-resolution=0.5
-scale=1.0
-sign_bit=0
 unit=
+offset=0.0
+maxValue=380.0
+precision=3
+sign_bit=0
+scale=1.0
+description=null
+resolution=0.5
--- a/script/FSSTO_03052022_overnight.py
+++ b/script/FSSTO_03052022_overnight.py
@@ -0,0 +1,59 @@
+off_LH=1.3
+off_LV=0.8
+
+
+
+Estart=450    
+Eend=485
+
+j = 0
+
+
+for T in (50, 100, 150, 300):
+
+    thickness = (40, 15, 80, 30, 20)
+    Y_rt = (10, 11, 18.5, 19.5, 27)
+    Z_rt = (111.5, 107, 111.5, 108.5, 110.5)
+
+    
+    if T != 50:
+        set_temp(T)
+        time.sleep(600)
+
+    if T == 150:
+        set_range('k1', 9)      
+        
+    for i in range(5):
+
+        if T == 50 and i ==0:
+            continue
+
+        else:
+            set_vert(Y_rt[i]-(3-j))
+            set_hor(Z_rt[i])
+        
+            name = str(thickness[i])
+            temp = str(T)
+            
+            open_valve()     
+            
+            sample_name = 'STO_'+ name +'nm_' + temp + 'K'
+            
+            nr_loops=3
+            
+            loop_count = 0
+            while loop_count < nr_loops:
+                otf(start=Estart, end=Eend, time=3, delay=5,  mode = "LINEAR", alpha=90.0, offset = off_LV, name = sample_name)
+                otf(start=Estart, end=Eend, time=3, delay=5, mode = "LINEAR", alpha=0.0, offset = off_LH, name = sample_name)
+                otf(start=Estart, end=Eend, time=3, delay=5, mode = "LINEAR", alpha=0.0, offset = off_LH, name = sample_name)
+                otf(start=Estart, end=Eend, time=3, delay=5, mode = "LINEAR", alpha=90.0, offset = off_LV, name = sample_name)
+            
+                loop_count = loop_count + 1
+        
+            close_valve()
+    j += 1
+
+
+        
+
+    
--- a/script/HarmonicScan.py
+++ b/script/HarmonicScan.py
@@ -22,7 +22,10 @@ try:
        if MODE == "LH":
            set_pol_lin(0.0)                 
        elif MODE == "LV":
-            set_pol_lin(90.0)    
+            set_pol_lin(90.0)  
+        
+        wait_pol_done(1.0) # new script to wait for polarization. Wait_device does not work for this channel
+          
        current_offset = pol_offset.take()             
       
    else: 
--- a/script/HorizontalScan_infocus.py
+++ b/script/HorizontalScan_infocus.py
@@ -1,9 +1,9 @@
 open_valve()
 #####################
 ## INPUT PARAMETERS##
-POS_START = 157.5 #Minn = 150.0
+POS_START = 155 #Minn = 150.0
 POS_END = 165 #Max = 170.0
-POS_STEP = 0.25
+POS_STEP = 0.1

 SETTLING_TIME = 0.1

@@ -11,7 +11,7 @@ SETTLING_TIME = 0.1
 #ENERGIES = [461] # Ti
 #ENERGIES = [1611] # Tb
 #ENERGIES = [1190] # Gd
-#ENERGIES = [570.0]#, 577.0] # Cr
+ENERGIES = [570.0, 577.0] # Cr
 #ENERGIES = [461] #Ti
 #ENERGIES = [363.2, 356.0]# Nb
 #ENERGIES = [778.0,778.3] # Co
@@ -25,9 +25,10 @@ SETTLING_TIME = 0.1
 #ENERGIES = [851.2,848.0] # Ni
 #ENERGIES = [280,292] #C
 #ENERGIES = [776.7,774] # Co
-#ENERGIES = [639.5,630.0] # Mn
-ENERGIES = [459.7,456] #Ti
+#ENERGIES = [640.5,637] # Mn
+#ENERGIES = [459.7,456] #Ti
 #ENERGIES = [1067, 1076.4 ] # Sm
+#ENERGIES = [1289.5, 1280] # Dy edge, pre-edge
 #ENERGIES = [870, 880.3 ] # Ce
 #ENERGIES = [516.0, 503.0] # V
 #ENERGIES = [510.0] # V
@@ -36,6 +37,7 @@ ENERGIES = [459.7,456] #Ti
 #ENERGIES = [706.6,706.6] 
 #ENERGIES = [1067, 1076.4 ] # Sm
 #ENERGIES = [870, 880.3 ] # Ce
+#ENERGIES = [987, 997.8 ] # Nd



--- a/script/HorizontalScan_out_of_focus.py
+++ b/script/HorizontalScan_out_of_focus.py
@@ -5,10 +5,11 @@

 #POS_END = POS_START + 6 #Max = 118.0
 #caput("X07MA-ES1-SHUTTER:TRZ1.VAL", POS_START - 108.0 + 40.5)
+open_valve()

-POS_START = 98 #Min = 98.0
-POS_END = 114 #Max = 118.0
-POS_STEP = 0.2
+POS_START = 102 #Min = 98.0
+POS_END = 115 #Max = 118.0
+POS_STEP = 0.25

 SETTLING_TIME = 0.0

@@ -30,13 +31,14 @@ SETTLING_TIME = 0.0
 #Max = 118.0
 #POS_STEP = 0.1
 #"""
-ENERGIES = [929.2,920] # test
+#ENERGIES = [1035]
+#ENERGIES = [929.2,920] # test
 #ENERGIES = [774.0,779.5] # Co
 #ENERGIES = [776.0,778.0] # Co
 #ENERGIES = [459.7,456] #Ti
 #ENERGIES = [1128, 1120 ]# Eu
 #ENERGIES = [285.3, 280.0]# C
-#ENERGIES = [1030,1015] #Zn
+#ENERGIES = [1015,1030] #Zn
 #ENERGIES = [485.0,490.0] # Ru
 #ENERGIES = [1030] #Zn
 #ENERGIES = [1344.5, 1338] # Ho edge, pre-edge
@@ -49,7 +51,7 @@ ENERGIES = [929.2,920] # test
 #ENERGIES = [397.8, 395.0] # N
 #ENERGIES = [410] # N
 #ENERGIES = [385.0]# C
-#ENERGIES = [570.0,576.3] #Cr
+ENERGIES = [570.0,576.3] #Cr
 #ENERGIES = [1850, 1820]# Si
 #ENERGIES = [532.3, 525.0]  #O 
 #ENERGIES = [397.7,392]  # Pc
@@ -58,10 +60,12 @@ ENERGIES = [929.2,920] # test
 #ENERGIES = [639.0] # Mn
 #ENERGIES = [848.5, 842.0] # La
 #ENERGIES = [463,457]
+#ENERGIES = [639.5, 630.0] # Mn
 #ENERGIES = [639.1,636.6] # Mn
 #ENERGIES = [707.0, 704.0] # Fe
 #ENERGIES = [708.3]
 #ENERGIES = [928.4] #CuO
+#ENERGIES = [929.0] #Cu
 #ENERGIES = [929.0, 925.0] #Cu
 #ENERGIES = [927, 929] #Cu
 #ENERGIES = [402, 397] # Ta
@@ -95,10 +99,11 @@ ENERGIES = [929.2,920] # test
 #ENERGIES = [782.50, 775.0] # Ba
 #ENERGIES = [782.50] # Ba
 #ENERGIES = [1289.4] # Dy
+#ENERGIES = [1589, 1580] # Lu
 #ENERGIES = [660.0, 665.0] # In
 #ENERGIES = [1850, 1820]# Si
 #ENERGIES = [1125.6]# Eu
-#ENERGIES = [850.9, 842] # Ni
+#ENERGIES = [850.7, 842] # Ni
 #ENERGIES = [514.1, 510] # V
 #ENERGIES = [1455,1420] # Se
 #ENERGIES = [1181.0,1173.0] 
--- a/script/I01_scan.py
+++ b/script/I01_scan.py
@@ -6,7 +6,7 @@ POS_STEP = 0.5


 #ENERGIES = [704.0,708.7] # Fe
-ENERGIES = [460] # 
+ENERGIES = [530] # 

 #####################

--- a/script/VerticalScan.py
+++ b/script/VerticalScan.py
@@ -2,10 +2,8 @@

 #####################
 ## INPUT PARAMETERS##
-POS_START = 0.5
-POS_END = 32
-#POS_START = 22.5
-#POS_END = 24.5
+POS_START = 2.0
+POS_END = 27.0


 POS_STEP =0.25
@@ -18,9 +16,10 @@ POS_STEP =0.25
 #POS_END = 15
 #POS_STEP = 0.25
 #"""
+#ENERGIES = [1035]
 #ENERGIES = [774.0,779.5] # Co
 #ENERGIES = [532.3, 525.0] # O
-#ENERGIES = [570.0]#, 577.5] # Cr
+#ENERGIES = [570.0, 577.5] # Cr
 #ENERGIES = [1241] # Tb
 #ENERGIES = [1241] # Tb
 #ENERGIES = [1190] # Gd
@@ -28,7 +27,7 @@ POS_STEP =0.25
 #ENERGIES = [461] #Ti
 #ENERGIES = [459.7,456] #Ti
 #ENERGIES = [1128, 1120 ]# Eu
-#ENERGIES = [1030, 1015]# Zn
+#ENERGIES = [1015, 1030]# Zn
 #ENERGIES = [532, 523]# 
 #ENERGIES = [363.2, 356]# Nb
 #ENERGIES = [782.50, 775.0]
@@ -48,14 +47,16 @@ POS_STEP =0.25
 #ENERGIES = [708.3]
 #ENERGIES = [931.7]#, 925] #Cu
 #ENERGIES = [928.4, 925] #CuO
-#ENERGIES = [928.4] #Cu
+#ENERGIES = [929.0] #Cu
 #ENERGIES = [928.4, 707.5] #Cu, Fe special
 #ENERGIES = [929.0, 925.0] #Cu
 #ENERGIES = [774.0] # Co
 #ENERGIES = [776.7, 774.0] # Co  
-#ENERGIES = [851.3,842.0] # Ni
+ENERGIES = [850.7,842.0] # Ni
 #ENERGIES = [639.5, 630.0] # Mn
+#ENERGIES = [639.1,636.6] # Mn
 #ENERGIES = [848.5, 842.0] # La
+#ENERGIES = [1589, 1580] # Lu
 #ENERGIES = [576.4, 560.0] #Cr
 #ENERGIES = [573.0,576.3] #Cr
 #ENERGIES = [485.0,490.0] # Ru
@@ -70,7 +71,7 @@ POS_STEP =0.25
 #ENERGIES = [1400.6,1395.0] #Er
 #ENERGIES = [1395.0] #Er
 #ENERGIES = [1300, 1312 ] # Mg
-#ENERGIES = [1289.5, 1282.5] # Dy
+#ENERGIES = [1289.5, 1280.0] # Dy
 #ENERGIES = [1344.2, 1338 ] # Ho
 #ENERGIES = [1456.9, 1450 ] # Tm
 #ENERGIES = [1566.0,1554.0] # Al
@@ -78,7 +79,7 @@ POS_STEP =0.25
 #ENERGIES = [928.5, 925] # Cu metal
 #ENERGIES = [402, 397] # Ta
 #ENERGIES = [395,390] #Mo
-#ENERGIES = [928.6,925]# Cu1
+#sENERGIES = [928.6,925]# Cu1
 #ENERGIES = [782.50, 775.0] # Ba
 #ENERGIES = [782.50] # Ba
 #ENERGIES = [1234.5, 1225] # Tb
@@ -96,7 +97,7 @@ POS_STEP =0.25
 #ENERGIES = [285.3, 280.0]# C
 #ENERGIES = [368, 367] # Ag

-ENERGIES = [920] 
+#ENERGIES = [920] 
 #####################


@@ -140,4 +141,4 @@ ret70= lscan(sample_vert,sensors, POS_START, POS_END, POS_STEP, latency = 0.25,
 #    name=get_scan_filename()
 #    print "Created data file: " + str(name)

-close_valve()
+#close_valve()
--- a/script/magnet_x_init_ramp.py
+++ b/script/magnet_x_init_ramp.py
@@ -3,7 +3,7 @@
 # then 6 -> 6.9 T at 0.075 T/min

 # list of pairs [ [target field1, ramp rate1] , [target field2, ramp rate2] , [target field3, ramp rate3] ,... ]
-field_rate = [ [6.0,0.36], [6.9, 0.075], [6.0, 0.075], [0.0, 1.0] ]
+field_rate = [ [6.0,0.36], [6.85, 0.075], [6.0, 0.075], [0.0, 1.0] ]
 #field_rate = [ [0.1,0.25], [0.0, 2.0] ]  test

 for fr in field_rate:
--- a/script/testxx.py
+++ b/script/testxx.py
@@ -0,0 +1 @@
+set_hx(0)