diff --git a/config/devices.properties b/config/devices.properties index 6d64b80b..27721016 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -46,10 +46,10 @@ MachineBumpXOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:X-SYM|Read||true MachineBumpXAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:X-ASYM|Read||true MachineBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:Y-SYM|Read||true MachineBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-LBB:Y-ASYM|Read||true -MachineBumpMode=ch.psi.pshell.epics.ChannelString|X03DA-DBB:Y-ASYMMODE|||true -MachineBumpControl=ch.psi.pshell.epics.ChannelString|ARIDI-BPM:DBB-LOCK|||true -#DynamicBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-SYM|Read||true -#DynamicBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-ASYM|Read||true +DynamicBumpMode=ch.psi.pshell.epics.ChannelString|X03DA-DBB:Y-ASYMMODE|||true +DynamicBumpLock=ch.psi.pshell.epics.ChannelString|ARIDI-BPM:DBB-LOCK|||true +DynamicBumpYOffset=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-SYM|Read||true +DynamicBumpYAngle=ch.psi.pshell.epics.ChannelDouble|X03DA-DBB:Y-ASYM|Read||true FrontendVCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SV:ctr|||true FrontendVSize=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SV:size|||true FrontendHCenter=ch.psi.pshell.epics.ChannelDouble|X03DA-FE-SH:ctr|||true diff --git a/config/variables.properties b/config/variables.properties index b83925bf..71891732 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Mon Nov 18 18:51:19 CET 2019 -FileSequentialNumber=946 +#Tue Nov 19 17:27:26 CET 2019 +FileSequentialNumber=950 diff --git a/script/local.py b/script/local.py index a393f50e..4f37b700 100644 --- a/script/local.py +++ b/script/local.py @@ -195,6 +195,8 @@ diag_channels.append(MachineBumpXOffset) diag_channels.append(MachineBumpXAngle) diag_channels.append(MachineBumpYOffset) diag_channels.append(MachineBumpYAngle) +diag_channels.append(DynamicBumpYOffset) +diag_channels.append(DynamicBumpYAngle) diag_channels.append(FrontendVCenter) diag_channels.append(FrontendVSize) diag_channels.append(FrontendHCenter) diff --git a/script/optics/CheckMachineBump.py b/script/optics/CheckMachineBump.py index cc19086b..69a14bf9 100644 --- a/script/optics/CheckMachineBump.py +++ b/script/optics/CheckMachineBump.py @@ -9,12 +9,12 @@ rs = RangeSelection(706., 714.) rs.setVars([0.1, 0.05, 1]) #Time, Size, Itaration -# MachineBumpControl.write("X03DA") -# MachineBumpControl.write("none") +# DynamicBumpLock.write("X03DA") +# DynamicBumpLock.write("none") print "switching to linear" -MachineBumpMode.write("off") -MachineBumpYAngle.waitValueInRange(0.0, 0.001, 10000) +DynamicBumpMode.write("off") +DynamicBumpYAngle.waitValueInRange(0.0, 0.001, 10000) print "running XPS spectrum" run("XPSSpectrum", {"save_scienta_image":True, "ranges":[rs, ], @@ -22,8 +22,8 @@ run("XPSSpectrum", {"save_scienta_image":True, "pass_energy":50}) print "switching to positive helicity" -MachineBumpMode.write("pos") -MachineBumpYAngle.waitValueInRange(0.02, 0.001, 10000) +DynamicBumpMode.write("pos") +DynamicBumpYAngle.waitValueInRange(0.02, 0.001, 10000) print "running XPS spectrum" run("XPSSpectrum", {"save_scienta_image":True, "ranges":[rs, ], @@ -31,8 +31,8 @@ run("XPSSpectrum", {"save_scienta_image":True, "pass_energy":50}) print "switching to negative helicity" -MachineBumpMode.write("neg") -MachineBumpYAngle.waitValueInRange(-0.02, 0.001, 10000) +DynamicBumpMode.write("neg") +DynamicBumpYAngle.waitValueInRange(-0.02, 0.001, 10000) print "running XPS spectrum" run("XPSSpectrum", {"save_scienta_image":True, "ranges":[rs, ], @@ -40,6 +40,6 @@ run("XPSSpectrum", {"save_scienta_image":True, "pass_energy":50}) print "switching to linear" -MachineBumpMode.write("off") -MachineBumpYAngle.waitValueInRange(0.0, 0.001, 10000) +DynamicBumpMode.write("off") +DynamicBumpYAngle.waitValueInRange(0.0, 0.001, 10000) print "done"