diff --git a/script/Electric_field_loop.py b/script/Electric_field_loop.py index e49c2ff..7898add 100644 --- a/script/Electric_field_loop.py +++ b/script/Electric_field_loop.py @@ -28,14 +28,11 @@ Max = 14; Min=-Max; No_of_steps = 10; dB = Max/No_of_steps; -Noavg = 1; +Noavg = 3; forward=frange(-14,14,1); - - - os.chdir("/sls/X11MA/data/X11MA/beamtime_december/") #forward loop @@ -50,7 +47,7 @@ filename=open("data"+file_prefix+time_prefix+".txt","a") # print "Setting field = ", B # caput("X11MA-XMCD:I-SETraw",B) -for i in range(0,len(forward)): +for i in range(0,len(forward)+1): print "Setting field = ", forward[i] caput("X11MA-XMCD:I-SETraw",forward[i]) @@ -85,7 +82,7 @@ for i in range(0,len(forward)): detector1 = keithley_1a.read() #Keithley1 detector2 = keithley_2a.read() #Keithley2 detector4 = caget(OTF_MODE2) #polarization in ID2 - M2 = detector2/detector1 + M2 = float(detector2)/float(detector1) temp_tey_E2=temp_tey+M1; ADC2_temp_E2=ADC2_temp_E2+detector2; ADC1_temp_E2=ADC1_temp_E2+detector1; @@ -131,7 +128,7 @@ for i in range(0,len(reverse)): detector1 = keithley_1a.read() #Keithley1 detector2 = keithley_2a.read() #Keithley2 detector4 = caget(OTF_MODE2) #polarization in ID2 - M1 = detector2/detector1 + M1 = float(detector2)/float(detector1) temp_tey=temp_tey+M1; ADC2_temp_E1=ADC2_temp_E1+detector2; ADC1_temp_E1=ADC1_temp_E1+detector1; @@ -145,7 +142,7 @@ for i in range(0,len(reverse)): detector1 = keithley_1a.read() #Keithley1 detector2 = keithley_2a.read() #Keithley2 detector4 = caget(OTF_MODE2) #polarization in ID2 - M2 = detector2/detector1 + M2 = float(detector2)/float(detector1) temp_tey_E2=temp_tey+M1; ADC2_temp_E2=ADC2_temp_E2+detector2; ADC1_temp_E2=ADC1_temp_E2+detector1;