Closedown

This commit is contained in:
gac-x03da
2022-02-02 16:35:42 +01:00
parent a3e546ce0b
commit cc3aa6cdff
3 changed files with 8 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
#Wed Feb 02 15:56:32 CET 2022
#Wed Feb 02 16:24:16 CET 2022
LastRunDate=220202
FileSequentialNumber=10872
DaySequentialNumber=1
FileSequentialNumber=10873
DaySequentialNumber=2

View File

@@ -368,8 +368,8 @@ set_device_alias(Scienta.centerEnergy, get_diag_name(Scienta.centerEnergy))
set_device_alias(Scienta.highEnergy, get_diag_name(Scienta.highEnergy))
set_device_alias(ManipulatorX.readback, get_diag_name(ManipulatorX.readback))
set_device_alias(ManipulatorY.readback, get_diag_name(ManipulatorX.readback))
set_device_alias(ManipulatorZ.readback, get_diag_name(ManipulatorX.readback))
set_device_alias(ManipulatorY.readback, get_diag_name(ManipulatorY.readback))
set_device_alias(ManipulatorZ.readback, get_diag_name(ManipulatorZ.readback))
set_device_alias(ManipulatorTheta.readback, get_diag_name(ManipulatorTheta.readback))
set_device_alias(ManipulatorTilt.readback, get_diag_name(ManipulatorTilt.readback))
set_device_alias(ManipulatorPhi.readback, get_diag_name(ManipulatorPhi.readback))

View File

@@ -98,10 +98,12 @@ def after_read(rec):
rec.invalidate()
count=count+1
snap_channels = [ch for ch in diag_channels if not ch.getName().startswith("Scienta")]
try:
print "Scanning...",
try:
mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy", snaps=diag_channels)
mscan(SampleCurrent, sensors, -1, None, range="auto", take_initial=False, after_read=after_read, domain_axis="MonoEnergy", snaps=snap_channels)
finally:
ret[0].cancel(True)