Changeset 783 in ETALON

Timestamp:

Jul 17, 2018, 4:02:19 PM (6 years ago)

Author:

moutardier

Message:

add line to wait until motor stop move befor doing anything else

Location:

BPM

Files:

• initialise_motors.py (modified) (2 diffs)
• motor_control.py (modified) (2 diffs)
• print_datas.py (modified) (8 diffs)

BPM/initialise_motors.py

@@ -209 +209 @@
 def move_motor_relative(motor, speed, steps):
     motor_move_relative(motor, speed, steps)
+    while motor_get(motor, 'status') != 'READY':
+        time.sleep(1)
 
 def motor_move_absolute(motor, speed, steps):
@@ -221 +223 @@
     "Moves a motor with the given parameters"
     motor_move_absolute(motor, speed, steps)
-
+    while motor_get(motor, 'status') != 'READY':
+        time.sleep(1)
 
 def motor_wait_for_ready(motor,verbose=VERBOSE_DEFAULT):

BPM/motor_control.py

@@ -1 @@
-import time
-import urllib
-import os
+#import time
+#import urllib
+#import os
 from initialise_motors import *
 from scope_function import *
-import numpy as np
-import matplotlib.pyplot as plt
+#import numpy as np
+#import matplotlib.pyplot as plt
 
 # moteur 1 -> horizontal
@@ -16 +16 @@
 motor_enable(1)
 move_motor_absolute(1,5000,-5000)
+#while motor_get(1, 'status') != 'READY':
+#    time.sleep(1)
 move_motor_absolute(1,5000,0)
+#while motor_get(1, 'status') != 'READY':
+#    time.sleep(1)
 motor_disable(1)
 

BPM/print_datas.py

@@ -2 +2 @@
 import matplotlib.pyplot as plt
 from scipy import stats
+
+
+global_index_figure = 0
 
 def float_list(l): # convert a list of char in a list of float 
@@ -57 +60 @@
 def print_graph(L): # program to print graph of data set in a list with [[position][Va][Vb][Vc][Vd]], also do a linear regretion and print the equation
 #    a = np.array([L[0][i],L[1][i]] for i in range(len(L[0])))
-    fig = plt.figure(1)
+    global global_index_figure
+    fig1 = plt.figure(global_index_figure)
+    global_index_figure += 1
     plt.clf()
     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(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")
@@ -76 +81 @@
     
     plt.legend()
-    plt.xlabel("length in million motor step")
+    plt.xlabel("length in million motor step") #, fontsize=20)
     plt.ylabel("tension in mV")
-    plt.show()
+    plt.gca().yaxis.set_tick_params(labelsize = 8)
+#    plt.show()
 
 def residu(L): # program to do graph of residu of data give in a list with [[position][Va][Vb][Vc][Vd]]
-    fig = plt.figure(1)
+    global global_index_figure
+    fig1 = plt.figure(global_index_figure)
+    global_index_figure += 1
     plt.clf()
     plt.title("Residu")
@@ -88 +96 @@
         L[1][i] = L[1][i] -  lr1.slope*L[0][i] - lr1.intercept
     plt.plot(L[0],L[1], "r", label = "BMP_ref")
-    
+
     lr2 = stats.linregress(L[0],L[2])
     for i in range(len(L[2])):
@@ -98 +106 @@
         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])):
@@ -106 +114 @@
     plt.xlabel("length in million motor step")
     plt.ylabel("tension in mV")
-    plt.show()
+#    plt.show()
     
 """    
@@ -127 +135 @@
         if  L[0][i] >= mini and L[0][i] <= maxi :
             index_list.append(i)
-    print(index_list)
     return([[L[0][i] for i in index_list],[L[1][i] for i in index_list],[L[2][i] for i in index_list],[L[3][i] for i in index_list],[L[4][i] for i in index_list]])
 
@@ -162 +169 @@
 #print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_vertical_acquisition_20180612_0.txt")
 #print_data("data/position_vs_tension_ch1-3_bpm_ref_ch2-4_bpm_impr_vertical_acquisition_20180612_0.txt")
+plt.show()
+