Changeset 780 in ETALON

Timestamp:

Jun 18, 2018, 5:32:04 PM (6 years ago)

Author:

moutardier

Message:

add fonction to select part of data and to convert lenght in step on lenght in mm in print_data.py and correct issue in residu

Location:

BPM

Files:

• motor_control.py (modified) (2 diffs)
• print_datas.py (modified) (5 diffs)

BPM/motor_control.py

@@ -37 +37 @@
 #horizontal_acquisition(4000,0,-4000,"test")    
 
-acquisition(-15000,15000,10000,-50000,50000,25000,"test")
+acquisition(-100000,100000,20000,-50000,50000,10000,"test")
 
 #acquisition(-10000,10000,1000,-50000,0,5000,"test")
@@ -55 +55 @@
 
 #fichier = open("24-05-2018_acquisition_from_0_to_400000_step_of_1000.txt", "r")
-"""
-A = fichier.read()
-
-X = []
-Y1 = []
-Y2 = []
-Y3 = []
-Y4 = []
-a = ""
-l = 0
-
-
-for i in A:
-    if (i == "\n") :
-         if l == 0:
-             X.append(a)
-             
-             l += 1
-         elif l == 1:
-             Y1.append(a)
-             #print(a)
-             l += 1
-         elif l == 2:
-             Y2.append(a)
-             l += 1
-         elif l == 3:
-             Y3.append(a)
-             l += 1
-         else:
-             Y4.append(a)
-             l = 0
-         a = ""
-    else:
-        a += i
-
-def float_list(l):
-    L = []
-    for i in l:
-        L.append(float(i))
-    return(L)
-    
-X = float_list(X)
-Y1 = float_list(Y1)
-Y2 = float_list(Y2)
-Y3 = float_list(Y3)
-Y4 = float_list(Y4)
-
-plt.plot(X,Y1)
-plt.plot(X,Y2)
-plt.plot(X,Y3)
-plt.plot(X,Y4)
-plt.show()
-"""
 
 #fichier.close()

BPM/print_datas.py

@@ -9 +9 @@
     return(L)
 
-def product_list(L,x):
-    Lx = []
-    for i in L:
-        Lx.append(i*x)
-    return(Lx)
+def product_list(L,x, b = None):
+    if b is None:
+        Lx = []
+        for i in L:
+            Lx.append(i*x)
+        return(Lx)
+    else:
+        Lx = []
+        for i in L:
+            Lx.append(i*x +b)
+        return(Lx)
 
 
@@ -46 +52 @@
             a += i
     fichier.close()
-
     for i in range(5):
         L[i] = float_list(L[i])
@@ -62 +67 @@
     lr1 = stats.linregress(L[0],L[1]) # return tuple (pente,ordonnee a l'origine, coef de correlation, p-value, erreur standard de l'estimation)
     plt.plot(L[0],L[1], "r", label = "BMP_ref")
-    plt.plot(L[0],[lr1.slope*i + lr1.intercept for i in L[0]], "r--", label = "BMP_ref regression line, \nerror = "+str(lr1.stderr)+",\ncorrelation coefficient = "+str(lr1.rvalue))
+    plt.plot(L[0],[lr1.slope*i + lr1.intercept for i in L[0]], "r--", label = "BMP_ref regression line, \nerror = "+str(round(lr1.stderr,3))+",\ncorrelation coefficient = "+str(round(lr1.rvalue,3)))
     
     lr2 = stats.linregress(L[0],L[2])
     plt.plot(L[0],L[2], "b", label = "BMP_impr")
-    plt.plot(L[0],[lr2.slope*i + lr2.intercept for i in L[0]], "b--", label = "BMP_impr regression line, \nerror = "+str(lr2.stderr)+",\ncorrelation coefficient = "+str(lr2.rvalue))
+    plt.plot(L[0],[lr2.slope*i + lr2.intercept for i in L[0]], "b--", label = "BMP_impr regression line, \nerror = "+str(round(lr2.stderr,3))+",\ncorrelation coefficient = "+str(round(lr2.rvalue,3)))
 
     lr3 = stats.linregress(L[0],L[3])
     plt.plot(L[0],L[3], "g", label = "BMP_ref")
-    plt.plot(L[0],[lr3.slope*i + lr3.intercept for i in L[0]], "g--", label = "BMP_ref regression line, \nerror = "+str(lr3.stderr)+",\ncorrelation coefficient = "+str(lr3.rvalue))
+    plt.plot(L[0],[lr3.slope*i + lr3.intercept for i in L[0]], "g--", label = "BMP_ref regression line, \nerror = "+str(round(lr3.stderr,3))+",\ncorrelation coefficient = "+str(round(lr3.rvalue,3)))
 
     lr4 = stats.linregress(L[0],L[4])
     plt.plot(L[0],L[4], "m", label = "BMP_impr")
-    plt.plot(L[0],[lr4.slope*i + lr4.intercept for i in L[0]], "m--", label = "BMP_impr regression line, \nerror = "+str(lr4.stderr)+",\ncorrelation coefficient = "+str(lr4.rvalue))
+    plt.plot(L[0],[lr4.slope*i + lr4.intercept for i in L[0]], "m--", label = "BMP_impr regression line, \nerror = "+str(round(lr4.stderr,2))+",\ncorrelation coefficient = "+str(round(lr4.rvalue,3)))
     
     plt.legend()
@@ -92 +97 @@
     lr2 = stats.linregress(L[0],L[2])
     for i in range(len(L[2])):
-        L[2][i] = L[2][i] -  lr1.slope*L[0][i] - lr1.intercept
+        L[2][i] = L[2][i] -  lr2.slope*L[0][i] - lr2.intercept
     plt.plot(L[0],L[2], "b", label = "BMP_impr")
 
     lr3 = stats.linregress(L[0],L[3])
     for i in range(len(L[3])):
-        L[3][i] = L[3][i] -  lr1.slope*L[0][i] - lr1.intercept
+        L[3][i] = L[3][i] -  lr3.slope*L[0][i] - lr3.intercept
     plt.plot(L[0],L[3], "g", label = "BMP_ref")
  
     lr4 = stats.linregress(L[0],L[4])
     for i in range(len(L[4])):
-        L[4][i] = L[4][i] -  lr1.slope*L[0][i] - lr1.intercept
+        L[4][i] = L[4][i] -  lr4.slope*L[0][i] - lr4.intercept
     plt.plot(L[0],L[4], "m", label = "BMP_impr")
     plt.legend()
@@ -116 +121 @@
     plt.show()
 """
-def print_data(fichier):
-    L = read_data(fichier)
+
+def min_max(L,mini = None ,maxi = None):
+    if mini is None :
+        mini = -1
+    if maxi is None :
+        maxi = len(L[0])
+    i_min = 0
+    i_max = 0
+    for i in range(len(L[0])):
+        if  L[0][i] <= mini :
+            i_min = i
+        if  L[0][i] <= maxi :
+            i_max = i
+    if i_max < len(L[0]) :
+        i_max += 1
+    return([L[0][i_min:i_max],L[1][i_min:i_max],L[2][i_min:i_max],L[3][i_min:i_max],L[4][i_min:i_max]])
+
+
+def convertion_step_mm(L,begin_mm,end_mm):
+    begin_step = L[0]
+    end_step = L[len(L)-1]
+    a = float((end_mm - begin_mm))/(end_step - begin_step)
+    b = begin_mm - a*begin_step
+    print(a,b)
+    print(L)
+    L = product_list(L, a, b)
+    return(L)
+    
+
+#L = [[i for i in range(51)] for j in range(5)]
+#print(convertion_step_mm(L[0],3.1,44520))
+
+    
+def print_data(fichier, min = None, max = None):
+    L = min_max(read_data(fichier),min,max)
     print_graph(L)
+    #print(L)
 
-def print_residu(fichier):
-    L = read_data(fichier)
+def print_residu(fichier, min = None, max = None):
+    L = min_max(read_data(fichier), mini = min, maxi = max)
     residu(L)
 
-print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_160153_0.txt")
-print_residu("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_160153_0.txt")
+#print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_160153_0.txt",0.1,0.3)
+#print_residu("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_160153_0.txt",0.1,0.3)
 
 #print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_20180611_163036_0.txt")