pshell_config/x07db
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gac-ISS
2023-06-20 11:27:01 +02:00
parent de76028d79
commit 350f06090b
18 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.properties
View File

@@ -1,9 +1,12 @@
#Tue Jan 17 11:35:04 CET 2023
#Tue Jun 13 08:45:56 CEST 2023
xscanMoveTimeout=600
autoSaveScanData=true
simulation=false
commandExecutionEvents=false
logDaysToLive=30
xscanCrlogicChannel=null
dataScanSaveOutput=false
xscanCrlogicSimulated=false
userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\\\\\://d.psi.ch | d.psi.ch | users.psi
logLevelConsole=Off
filePermissionsConfig=Default
@@ -15,6 +18,7 @@ parallelInitialization=false
fdaSerialization=false
dataTransferPath=
saveConsoleSessionFiles=false
xscanAppendSuffix=true
versionTrackingManual=true
dataTransferMode=Off
hostName=null
@@ -41,12 +45,16 @@ terminalEnabled=false
notificationLevel=Off
filePermissionsScripts=Default
terminalPort=3579
xscanCrlogicPrefix=null
dataTransferUser=
filePermissionsData=Default
xscanCrlogicAbortable=true
xscanContinuousUpdate=false
createSessionFiles=false
versionTrackingLogin={context}/svcusr-hlapp_robot
noBytecodeFiles=false
versionTrackingRemote=git@git.psi.ch\:pshell_config/x07db.git
dataProvider=h5
xscanCrlogicIoc=null
dataScanLazyTableCreation=false
saveCommandStatistics=false

2
config/devices.properties
View File

@@ -1,6 +1,6 @@
i0=ch.psi.pshell.epics.ChannelDouble|X07DB-KEI10:READOUT|Read||true
capture=ch.psi.pshell.epics.ChannelInteger|NAPP-SCIENTA:HDF1:Capture|||true
$energy=ch.psi.pshell.epics.Positioner|X07DB-OP-MONO:ENERGY X07DB-OP-MONO:ERBK|||true
energy=ch.psi.pshell.epics.Positioner|X07DB-OP-MONO:ENERGY X07DB-OP-MONO:ERBK|||true
scienta=Scienta|NAPP-SCIENTA|||true
spectrum=ch.psi.pshell.imaging.CameraSource|scienta|||true
AcquisitionMode=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:ACQ_MODE_RBV|||

8
config/variables.properties
View File

@@ -1,4 +1,4 @@
#Wed Jan 18 17:18:28 CET 2023
LastRunDate=230118
FileSequentialNumber=203
DaySequentialNumber=65
#Tue Jun 20 08:23:59 CEST 2023
LastRunDate=230620
FileSequentialNumber=246
DaySequentialNumber=32

1
script/queues/LL_20230501_XPS-Nexafs.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/LP57_230618_Ag_measurement_queue.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/LP57_230618_Full_Range_measurement_queue.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/LP57_230618_Full_Range_noAl_queue.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/LP57_230618_ZnO_measurement_queue.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[1180.0,1190.0,10.0]],\"FILE\":null,\"NAME\":null}", "Resume", "Success" ], [ true, "templates/XPS", "{\"PASSES\":3,\"REGIONS\":[[\"Zn_Auger_1190\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 971.5,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.05,\\r\\n \\\"scienta.passEnergy\\\" : 50,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 983.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 996.5,\\r\\n \\\"scienta.iterations\\\" : 3.0\\r\\n}\"],[\"Zn_2p_1190\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 133.5,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.1,\\r\\n \\\"scienta.passEnergy\\\" : 50,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 983.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 173.0,\\r\\n \\\"scienta.iterations\\\" : 3.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "Success" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[1190.0,684.0,506.0]],\"FILE\":null,\"NAME\":null}", "Resume", "Success" ], [ true, "templates/XPS", "{\"PASSES\":3,\"REGIONS\":[[\"Zn3p_684\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 584.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.05,\\r\\n \\\"scienta.passEnergy\\\" : 50,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 359.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 598.0,\\r\\n \\\"scienta.iterations\\\" : 2.0\\r\\n}\"],[\"O1s_684eV\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 140.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.05,\\r\\n \\\"scienta.passEnergy\\\" : 50,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 359.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 156.0,\\r\\n \\\"scienta.iterations\\\" : 1.0\\r\\n}\"],[\"C1s_684\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 387.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.05,\\r\\n \\\"scienta.passEnergy\\\" : 50,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 359.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 400.0,\\r\\n \\\"scienta.iterations\\\" : 1.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "Success" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[684.0,437.0,247.0]],\"FILE\":null,\"NAME\":null}", "Resume", "Success" ], [ true, "templates/XPS", "{\"PASSES\":6,\"REGIONS\":[[\"C1s_437\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 140.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.05,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 983.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 156.0,\\r\\n \\\"scienta.iterations\\\" : 2.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "Success" ] ] ]

1
script/queues/LP57_230618_charged_repeat.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/LP57_full_queue_1190-684-520-437.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/LP57_test_Queue.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ true, "templates/XPS", "{\"PASSES\":2,\"REGIONS\":[[\"Zn2p_1190\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 140.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.1,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 500.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 160.0,\\r\\n \\\"scienta.iterations\\\" : 4.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[1190.0,684.0,506.0]],\"FILE\":null,\"NAME\":null}", "Resume", "" ], [ true, "templates/XPS", "{\"PASSES\":4,\"REGIONS\":[[\"O1s_684eV\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 140.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.25,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 500.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 160.0,\\r\\n \\\"scienta.iterations\\\" : 4.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[684.0,520.0,164.0]],\"FILE\":null,\"NAME\":null}", "Resume", "" ], [ true, "templates/XPS", "{\"PASSES\":4,\"REGIONS\":[[\"Ag3d_520eV\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 140.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.25,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 500.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 160.0,\\r\\n \\\"scienta.iterations\\\" : 4.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[520.0,437.0,83.0]],\"FILE\":null,\"NAME\":null}", "Resume", "" ], [ true, "templates/XPS", "{\"PASSES\":4,\"REGIONS\":[[\"C1s_437eV\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 140.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.25,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 500.0,\\r\\n \\\"scienta.stepTime\\\" : 0.2,\\r\\n \\\"scienta.highEnergy\\\" : 160.0,\\r\\n \\\"scienta.iterations\\\" : 4.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "" ] ] ]

1
script/queues/Test_27Apr2023.que Normal file
View File

File diff suppressed because one or more lines are too long

1
script/queues/Test_WorkaroundBugEnergyPlusXSP.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[500.0,510.0,1.0]],\"FILE\":null,\"NAME\":null}", "Resume", "Disabled" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[510.0,600.0,90.0]],\"FILE\":null,\"NAME\":null}", "Resume", "Disabled" ], [ true, "templates/XPS", "{\"PASSES\":1,\"REGIONS\":[[\"test1\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 653.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.1,\\r\\n \\\"scienta.passEnergy\\\" : 100,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 498.0,\\r\\n \\\"scienta.stepTime\\\" : 0.08,\\r\\n \\\"scienta.highEnergy\\\" : 665.0,\\r\\n \\\"scienta.iterations\\\" : 1.0\\r\\n}\"],[\"test2\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 700.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.1,\\r\\n \\\"scienta.passEnergy\\\" : 100,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 498.0,\\r\\n \\\"scienta.stepTime\\\" : 0.08,\\r\\n \\\"scienta.highEnergy\\\" : 710.0,\\r\\n \\\"scienta.iterations\\\" : 1.0\\r\\n}\"]],\"FILE\":null,\"NAME\":null}", "Resume", "Disabled" ], [ true, "", "scienta.setAcquisitionMode(scienta.AcquisitionMode.Fixed)", "Resume", "Success" ], [ true, "templates/EnergyScan", "{\"PASSES\":1,\"REGIONS\":[[500.0,510.0,1.0]],\"FILE\":null,\"NAME\":null}", "Resume", "Aborted" ] ] ]

2
script/queues/test.que
View File

@@ -1 +1 @@
[ [ [ true, "parameters/Jerome_O_K_edge_BaF.ens", "", "Resume", "" ], [ true, "parameters/Na_K_edge_Yanisha.ens", "", "Resume", "" ] ] ]
[ [ [ true, "templates/XPS", "{\"PASSES\":2,\"REGIONS\":[[\"test_1\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 137.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.1,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 507.0,\\r\\n \\\"scienta.stepTime\\\" : 0.12,\\r\\n \\\"scienta.highEnergy\\\" : 145.0,\\r\\n \\\"scienta.iterations\\\" : 1.0\\r\\n}\"],[\"test_2\",\"{\\r\\n \\\"scienta.elementSet\\\" : \\\"HiPPHAXPES\\\",\\r\\n \\\"scienta.lensMode\\\" : \\\"T_HiPPHAXPES\\\",\\r\\n \\\"scienta.lowEnergy\\\" : 137.0,\\r\\n \\\"scienta.acquisitionMode\\\" : \\\"Swept\\\",\\r\\n \\\"scienta.slices\\\" : 1.0,\\r\\n \\\"scienta.stepSize\\\" : 0.1,\\r\\n \\\"scienta.passEnergy\\\" : 20,\\r\\n \\\"scienta.detectorMode\\\" : \\\"ADC\\\",\\r\\n \\\"scienta.energyMode\\\" : \\\"Kinetic\\\",\\r\\n \\\"scienta.centerEnergy\\\" : 507.0,\\r\\n \\\"scienta.stepTime\\\" : 0.12,\\r\\n \\\"scienta.highEnergy\\\" : 110.0,\\r\\n \\\"scienta.iterations\\\" : 2.0\\r\\n}\"]],\"FILE\":null,\"NAME\":\"Seq_565eV\"}", "Resume", "" ] ] ]

2
script/templates/EnergyScan.py
View File

@@ -31,7 +31,7 @@ sensors=[i0, scienta.stats[0], scienta.getSpectrum()] #), scienta.getDataMatrix(
def before_read(position, scan):
trigger_scienta()
clear_output()
clear_scan_output()
if DUMMY_TRIGGER:
dummy_trigger_scienta()

2
script/templates/TimeResolved.py
View File

@@ -38,7 +38,7 @@ sensors=[i0, scienta.getSpectrum()]
def before_read(position, scan):
trigger_scienta()
clear_output()
clear_scan_output()
if DUMMY_TRIGGER:
dummy_trigger_scienta()

2
script/templates/XPS_seq.py
View File

@@ -87,7 +87,7 @@ def before_read(position, scan):
trigger_scienta()
pass
clear_output()
clear_scan_output()
try:
for i in range(len(REGIONS)):

1
script/test/SetEnergyInQueue.que Normal file
View File

@@ -0,0 +1 @@
[ [ [ true, "", "energy.move(1001.0)", "Resume", "Success" ], [ true, "", "energy.move(1000.0)", "Resume", "Success" ], [ true, "", "scienta.setAcquisitionMode(scienta.AcquisitionMode.Fixed)", "Resume", "" ] ] ]