diff --git a/script/Electric_field_loop.py b/script/Electric_field_loop.py index 3ce646e..21f936a 100644 --- a/script/Electric_field_loop.py +++ b/script/Electric_field_loop.py @@ -28,11 +28,11 @@ Max = 14; Min=-Max; No_of_steps = 10; dB = Max/No_of_steps; -Noavg = 5; +Noavg = 1; -forward=frange(-14,14,2) -reverse=frange(14,-14,2) +forward=frange(-14,14,1) +reverse=frange(14,-14,1) @@ -42,7 +42,7 @@ os.chdir("/sls/X11MA/data/X11MA/beamtime_december/") file_prefix = time.strftime("%y%m%d") ts=time.time(); -time_prefix = datetime.datetime.fromtimestamp(ts).strftime('%H:%M:%s') +time_prefix = datetime.datetime.fromtimestamp(ts).strftime('%H:%M:%S') filename=open("data"+file_prefix+time_prefix+".txt","a") #for i in range(0,No_of_steps): @@ -99,7 +99,7 @@ for i in range(0,len(forward)): ADC1_E2=ADC1_temp_E2/Noavg; tey_norm = tey_norm_E1/tey_norm_E2;#edge/preedge detector4 = caget(OTF_MODE2) - filename.write(" %f %f %e %f %e %e %s \n" %(B, E1, ADC2_E1, E2, ADC2_E2, tey_norm, detector4)); + filename.write(" %f %f %e %f %e %e %s \n" %(forward(i), E1, ADC2_E1, E2, ADC2_E2, tey_norm, detector4)); #reverse loop @@ -157,7 +157,7 @@ for i in range(0,len(reverse)): ADC1_E2=ADC1_temp_E2/Noavg; tey_norm = tey_norm_E1/tey_norm_E2;#edge/preedge detector4 = caget(OTF_MODE2) - filename.write(" %f %f %e %f %e %e %s \n" %(B, E1, ADC2_E1, E2, ADC2_E2, tey_norm, detector4)); + filename.write(" %f %f %e %f %e %e %s \n" %(reverse(i), E1, ADC2_E1, E2, ADC2_E2, tey_norm, detector4)); filename.close(); #plot(data"+file_prefix", title = "2d", xdata = B, ydata = data_y)