diff --git a/script/Electric_field_loop2.py b/script/Electric_field_loop2.py index 7ca6829..ee09c0e 100644 --- a/script/Electric_field_loop2.py +++ b/script/Electric_field_loop2.py @@ -67,62 +67,54 @@ for k in range(0,len(loops)): ts=time.time(); time_prefix = datetime.datetime.fromtimestamp(ts).strftime('%H%M%S') filename=open("data"+file_prefix+time_prefix+"scan_"+str(k)+".txt","a"); -# for i in range(0,len(forward)): - # print "Setting field = ", forward[i] - # caput("X11MA-XMCD:I-SETraw",forward[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; - # -# 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)); + for i in range(0,len(forward)): + print "Setting field = ", forward[i] + caput("X11MA-XMCD:I-SETraw",forward[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; + 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)); #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 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) -# filename.write("%f %f %e %e %s \n" %(forward[i], E1, ADC2_E1, tey_norm_E1, detector4)); + 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; + 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): print "Setting field = ", (20-k)*Min/20 caput("X11MA-XMCD:I-SETraw", (20-k)*Min/20) sleep(0.1); - close_vg13() #plot(data"+file_prefix", title = "2d", xdata = B, ydata = data_y)