diff --git a/script/Electric_field_loop3.py b/script/Electric_field_loop3.py index 4e6cb3a..a6d31a0 100644 --- a/script/Electric_field_loop3.py +++ b/script/Electric_field_loop3.py @@ -2,18 +2,15 @@ import os import traceback import thread import time - import datetime #ID settings - #Set PGM ID2 caput ("X11PHS-E:OPT","PGM+ID2") #set ID2 to C+ - OFFSETp = -1.9 OFFSETm = -1.9 @@ -23,7 +20,6 @@ caput(OTF_OFF2,OFFSETp) E1 = 779.3 # Edge #E2 = 770 #preedge - # Voltage/magnetic field setting Max = 10; Min=-Max; @@ -90,9 +86,7 @@ for k in range(0,len(loops)): ADC1_E1=ADC1_temp_E1/Noavg; detector4 = caget(OTF_MODE2) filename.write("%f %f %e %e %s \n" %(forward[i], E1, ADC2_E1, tey_norm_E1, detector4)); - #reverse loop - for i in range(0,len(reverse)): print "Setting field = ", reverse[i] caput("X11MA-XMCD:I-SETraw",reverse[i]) @@ -102,7 +96,6 @@ for k in range(0,len(loops)): ADC1_temp_E1=0; ADC2_temp_E2=0; ADC1_temp_E2=0; - for j in range(0,Noavg): detector1 = keithley_1a.read() #Keithley1 detector2 = keithley_2a.read() #Keithley2 @@ -110,14 +103,11 @@ for k in range(0,len(loops)): temp_tey=temp_tey+M1; ADC2_temp_E1=ADC2_temp_E1+detector2; ADC1_temp_E1=ADC1_temp_E1+detector1; - tey_norm_E1=temp_tey/Noavg; ADC2_E1=ADC2_temp_E1/Noavg; ADC1_E1=ADC1_temp_E1/Noavg; detector4 = caget(OTF_MODE2) - filename.write("%f %f %e %e %s \n" %(forward[i], E1, ADC2_E1, tey_norm_E1, detector4)); - filename.close(); for k in range(0,20):