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
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -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" ] ] ]
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
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", "" ] ] ]
File diff suppressed because one or more lines are too long
@@ -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" ] ] ]
+1 -1
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", "" ] ] ]
+1 -1
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()
+1 -1
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()
+1 -1
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
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", "" ] ] ]