From b4827a6d11e3ebf5d5feeb01c637c7f7551f89f8 Mon Sep 17 00:00:00 2001 From: gac-x10da Date: Tue, 19 Mar 2019 12:39:19 +0100 Subject: [PATCH] Script execution --- script/PumpProbeXES_W1_v2.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script/PumpProbeXES_W1_v2.py b/script/PumpProbeXES_W1_v2.py index 5ba330c..bd589b0 100644 --- a/script/PumpProbeXES_W1_v2.py +++ b/script/PumpProbeXES_W1_v2.py @@ -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()