From 43cb61e55e031244c75cdca30569162f161fb3bc Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Thu, 14 Dec 2017 02:17:36 +0100 Subject: [PATCH] Script execution --- script/Electric_field_loop.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/script/Electric_field_loop.py b/script/Electric_field_loop.py index 6864ea1..23e0b5a 100644 --- a/script/Electric_field_loop.py +++ b/script/Electric_field_loop.py @@ -40,13 +40,13 @@ for i in range(0,No_of_steps): print "Setting field = ", B caput("X11MA-XMCD:I-SETraw",B) - temp_tey=[]; - temp_tey_E2 = []; - ADC2_temp_E1=[]; - ADC1_temp_E1=[]; - ADC2_temp_E2=[]; - ADC1_temp_E2=[]; - + temp_tey=0; + temp_tey_E2 = 0; + ADC2_temp_E1=0; + ADC1_temp_E1=0; + ADC2_temp_E2=0; + ADC1_temp_E2=0; + for j in range(0,Noavg): print "Setting energy = ", E1 @@ -58,7 +58,7 @@ for i in range(0,No_of_steps): detector2 = keithley_2a.read() #Keithley2 detector4 = caget(OTF_MODE2) #polarization in ID2 M1 = float(detector2)/float(detector1) - temp_tey=temp_tey+(M1); + temp_tey=temp_tey+M1; ADC2_temp_E1=ADC2_temp_E1+detector2; ADC1_temp_E1=ADC1_temp_E1+detector1;