This commit is contained in:
gac-x03da
2019-11-20 20:29:04 +01:00
parent 6cc5273bc5
commit a71b6acd92
3 changed files with 10 additions and 8 deletions
+2 -2
View File
@@ -1,2 +1,2 @@
#Tue Nov 19 17:27:26 CET 2019
FileSequentialNumber=950
#Wed Nov 20 20:15:40 CET 2019
FileSequentialNumber=996
+7 -5
View File
@@ -6,15 +6,17 @@
import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection as RangeSelection
rs = RangeSelection(706., 714.)
rs.setVars([0.1, 0.05, 1, 800.]) #Time, Size, Iteration, photon energy
rs.setVars([0.3, 0.025, 1, 800.]) #Time, Size, Iteration, photon energy
# DynamicBumpLock.write("X03DA")
# DynamicBumpLock.write("none")
BUMP_TIMEOUT = 30000
print "switching to linear"
DynamicBumpMode.write("off")
DynamicBumpYAngle.waitValueInRange(0.0, 0.02, 30000)
DynamicBumpYAngle.waitValueInRange(0.0, 0.002, BUMP_TIMEOUT)
print "running XPS spectrum"
run("XPSSpectrum", {"save_scienta_image":True,
"ranges":[rs, ],
@@ -23,7 +25,7 @@ run("XPSSpectrum", {"save_scienta_image":True,
print "switching to positive helicity"
DynamicBumpMode.write("pos")
DynamicBumpYAngle.waitValueInRange(0.2, 0.02, 30000)
DynamicBumpYAngle.waitValueInRange(0.2, 0.002, BUMP_TIMEOUT)
print "running XPS spectrum"
run("XPSSpectrum", {"save_scienta_image":True,
"ranges":[rs, ],
@@ -32,7 +34,7 @@ run("XPSSpectrum", {"save_scienta_image":True,
print "switching to negative helicity"
DynamicBumpMode.write("neg")
DynamicBumpYAngle.waitValueInRange(-0.2, 0.02, 30000)
DynamicBumpYAngle.waitValueInRange(-0.2, 0.002, BUMP_TIMEOUT)
print "running XPS spectrum"
run("XPSSpectrum", {"save_scienta_image":True,
"ranges":[rs, ],
@@ -41,5 +43,5 @@ run("XPSSpectrum", {"save_scienta_image":True,
print "switching to linear"
DynamicBumpMode.write("off")
DynamicBumpYAngle.waitValueInRange(0.0, 0.02, 30000)
DynamicBumpYAngle.waitValueInRange(0.0, 0.002, BUMP_TIMEOUT)
print "done"
+1 -1
View File
@@ -1,7 +1,7 @@
import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection as RangeSelection
rs = RangeSelection(902.0,920.0)
rs.setVars([0.5, 0.5, 1]) #Time, Size, Itaration
rs.setVars([0.5, 0.5, 1, 800.]) #Time, Size, Iteration, photon energy
run("XPSSpectrum", {"save_scienta_image":True,
"ranges":[rs, ],