Script execution

This commit is contained in:
gac-x10da
2019-03-19 12:39:19 +01:00
parent 42cccbb7fc
commit b4827a6d11
+6 -4
View File
@@ -41,9 +41,9 @@ TiffFileNumber = ChannelDouble('X10DA-PILATUS-1:Magick1:FileNumber_RBV', 'X10DA-
#ScalarDetector ROI4
ROI4 = ChannelDouble('X10DA-PILATUS-1:Stats4:Total_RBV', 'X10DA-PILATUS-1:Stats4:Total_RBV')
#ArrayDetector ROI1
ROI1_On = ChannelDoubleArray('X10DA-PILATUS-1:Stats1:ProfileCursorX_RBV', 'X10DA-PILATUS-1:Stats1:ProfileCursorX_RBV', ROI1size)
ROI1_On = ChannelDoubleArray('Roi1', 'X10DA-PILATUS-1:Stats1:ProfileCursorX_RBV', ROI1size)
#ArrayDetector ROI2
ROI2_On = ChannelDoubleArray('X10DA-PILATUS-1:Stats2:ProfileCursorX_RBV', 'X10DA-PILATUS-1:Stats2:ProfileCursorX_RBV' , ROI2size)
ROI2_On = ChannelDoubleArray('Roi2', 'X10DA-PILATUS-1:Stats2:ProfileCursorX_RBV' , ROI2size)
detectors = [SAI01, SAI02, RingCurrent, PilExpTime, PilFileNum, TotalCounts, TiffFileNumber, TiffFileNumber, ROI4, ROI1_On, ROI2_On]
@@ -86,7 +86,9 @@ class RoiDiff(Readable, ReadableArray):
return self.roi_on.getSize()
ROI1_Diff=RoiDiff(ROI1_On, ROI1_Off)
set_device_alias(ROI1_Diff, "Roi1Diff")
ROI2_Diff=RoiDiff(ROI2_On, ROI2_Off)
set_device_alias(ROI2_Diff, "Roi2Diff")
def before_sample():
@@ -99,8 +101,8 @@ def before_sample():
sleep(0.1)
try:
#tscan(detectors + [ROI1_Off, ROI1_Diff, ROI2_Off, ROI2_Diff], 30, 0, before_read = before_sample)
vscan(DELAY, detectors + [ROI1_Off, ROI1_Diff, ROI2_Off, ROI2_Diff], [0,100], passes=30, before_read = before_sample)
tscan(detectors + [ROI1_Off, ROI1_Diff, ROI2_Off, ROI2_Diff], 30, 0, before_read = before_sample)
#vscan(DELAY, detectors + [ROI1_Off, ROI1_Diff, ROI2_Off, ROI2_Diff], [0,100], passes=30, before_read = before_sample)
finally:
for det in detectors:
det.close()