From 84cbe21ce8389e1da922cef9ed665c435d29e52b Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Thu, 14 Dec 2017 14:00:57 +0100 Subject: [PATCH] Script execution --- script/Electric_field_loop2.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/script/Electric_field_loop2.py b/script/Electric_field_loop2.py index 3c1d7df..7ca6829 100644 --- a/script/Electric_field_loop2.py +++ b/script/Electric_field_loop2.py @@ -67,7 +67,6 @@ 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"); - filename.close(); # for i in range(0,len(forward)): # print "Setting field = ", forward[i] # caput("X11MA-XMCD:I-SETraw",forward[i]) @@ -94,9 +93,7 @@ for k in range(0,len(loops)): # 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]) @@ -106,7 +103,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 @@ -119,10 +115,8 @@ for k in range(0,len(loops)): # 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(); + filename.close(); for k in range(0,20): print "Setting field = ", (20-k)*Min/20