diff --git a/script/Electric_field_loop2.py b/script/Electric_field_loop2.py index b23f991..3865818 100644 --- a/script/Electric_field_loop2.py +++ b/script/Electric_field_loop2.py @@ -30,13 +30,13 @@ Min=-Max; No_of_steps = 20; step_size = float(Max/No_of_steps); Noavg = 3; -N_loops = 10; +N_loops = 2; loops=frange(1,N_loops,1); forward=frange(Min,Max,dB); reverse=frange(Max,Min,-dB); -print "forward = ", forward +#print "forward = ", forward os.chdir("/sls/X11MA/data/X11MA/beamtime_december/") @@ -54,6 +54,11 @@ wait_channel(OTF_DONE, 1, type = 'i') readback2 = energy.read() sleep(3); +for k in range(0,20) + print "Setting field = ", k*Min/20 + caput("X11MA-XMCD:I-SETraw", k*Min/20 + sleep(0.1); + for k in range(0,len(loops)): file_prefix = time.strftime("%y%m%d") ts=time.time(); @@ -89,33 +94,38 @@ for k in range(0,len(loops)): #reverse loop - #for i in range(0,len(reverse)): - # print "Setting field = ", reverse[i] - # caput("X11MA-XMCD:I-SETraw",reverse[i]) - # temp_tey=0; - # temp_tey_E2 = 0; - # ADC2_temp_E1=0; - # ADC1_temp_E1=0; - # ADC2_temp_E2=0; - # ADC1_temp_E2=0; + for i in range(0,len(reverse)): + print "Setting field = ", reverse[i] + caput("X11MA-XMCD:I-SETraw",reverse[i]) + 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): - # detector1 = keithley_1a.read() #Keithley1 - # detector2 = keithley_2a.read() #Keithley2 - # M1 = float(detector2)/float(detector1) - # temp_tey=temp_tey+M1; - # ADC2_temp_E1=ADC2_temp_E1+detector2; - # ADC1_temp_E1=ADC1_temp_E1+detector1; + for j in range(0,Noavg): + detector1 = keithley_1a.read() #Keithley1 + detector2 = keithley_2a.read() #Keithley2 + M1 = float(detector2)/float(detector1) + 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) + 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.write("%f %f %e %e %s \n" %(forward[i], E1, ADC2_E1, tey_norm_E1, detector4)); filename.close(); +for k in range(0,20) + print "Setting field = ", (20-k)*Max/20 + caput("X11MA-XMCD:I-SETraw", (20-k)*Max/20 + sleep(0.1); + close_vg13() #plot(data"+file_prefix", title = "2d", xdata = B, ydata = data_y)