From 10286162d6541ff3d6aea7e95518c87190b48aad Mon Sep 17 00:00:00 2001 From: gac-x10da Date: Tue, 19 Mar 2019 10:05:42 +0100 Subject: [PATCH] Script execution --- script/PumpProbeXES_W1.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/script/PumpProbeXES_W1.py b/script/PumpProbeXES_W1.py index 6e10a72..1a41664 100644 --- a/script/PumpProbeXES_W1.py +++ b/script/PumpProbeXES_W1.py @@ -10,6 +10,9 @@ caput('X10DA-PILATUS-1:cam1:AcquirePeriod', '1.1') caput('X10DA-ES1-MA1:TRX.VAL', '-18') caput('X10DA-ES1-MA1:TRX1.VAL', '-15') +ROI1size=487 +ROI2size=487 + #TODO: Set the diplay names of positioners and detectors scan = ManualScan(['Pseudo'], ['SAI01-MEAN_On','SAI01-MEAN_off', 'SAI02_On','SAI02_off', 'Ring-current_On','Ring-current_off', 'PilExpTime_On','PilExpTime_off', 'Timestamp_On','Timestamp_off', 'PilFileNum_On', 'PilFileNum_Off', 'TotalCounts_On','TotalCounts_Off', 'TiffFileNumber_On', 'TiffFileNumber_ff', 'ROI4_On','ROI4_Off', 'ROI1_On', 'ROI1_Off', 'ROI2_On','ROI2_Off','ROI4_Diff', 'ROI1_Diff','ROI2_Diff'] , [0.0], [30.0], [30]) scan.start() @@ -34,9 +37,9 @@ TiffFileNumber = Channel('X10DA-PILATUS-1:Magick1:FileNumber_RBV', type = 'd') #ScalarDetector ROI4 ROI4 = Channel('X10DA-PILATUS-1:Stats4:Total_RBV', type = 'd') #ArrayDetector ROI1 -ROI1 = Channel('X10DA-PILATUS-1:Stats1:ProfileCursorX_RBV', type = '[d', size = 487) +ROI1 = Channel('X10DA-PILATUS-1:Stats1:ProfileCursorX_RBV', type = '[d', size = ROI1size) #ArrayDetector ROI2 -ROI2 = Channel('X10DA-PILATUS-1:Stats2:ProfileCursorX_RBV', type = '[d', size = 487) +ROI2 = Channel('X10DA-PILATUS-1:Stats2:ProfileCursorX_RBV', type = '[d', size = ROI2size) #Dimension 1 #PseudoPositioner Pseudo @@ -107,9 +110,12 @@ for setpoint1 in range(0, 30): #Detector ROI2 detector11Off = ROI2.get() + detector9Diff=detector9On-detector9Off - detector10Diff=detector10On-detector10Off - detector11Diff=detector11On-detector11Off + for i in range (0,ROI1size): + detector10Diff[i]=detector10On[i]-detector10Off[i] + for i in range (0,ROI2size): + detector11Diff[i]=detector11On[i]-detector11Off[i] scan.append ([setpoint1], [readback1], [detector1On, detector1Off, detector2On, detector2Off, detector3On, detector3Off, detector4On, detector4Off, detector5On, detector5Off, detector6On,detector6Off, detector7On, detector7Off, detector8On, detector8Off, detector9On, detector9Off, detector10On, detector10Off, detector11On, detector11Off,detector9Diff,detector10Diff,detector11Diff])