Changeset 790 in ETALON for BPM/initialise_motors.py

Timestamp:

Aug 3, 2018, 2:44:23 PM (6 years ago)

Author:

moutardier

Message:

code final version

File:

• BPM/initialise_motors.py (modified) (8 diffs)

BPM/initialise_motors.py

@@ -8 +8 @@
 from read_adc import *
 import numpy as np
-import matplotlib.pyplot as plt
+#import matplotlib.pyplot as plt
 from datetime import datetime
 
@@ -16 +16 @@
 write_to_motor_dated_log = data_dir + './write_to_motor_log'
 
-#from writeclient import *
+from writeclient import *
 import time
 
@@ -263 +263 @@
     motor_disable(1)
 
-def path(bpm_name): # create the path of the file what will contain data
+def path(bpm_name, list_of_data): # create the path of the file what will contain data
     idata = 0
     start_time_str=datetime.now().strftime("%Y%m%d")
     data_name_and_path = data_dir+"data/"
+    string_of_data = ""
+    for data_name in list_of_data:
+        string_of_data += data_name + "_"
     if not os.path.exists(data_name_and_path) :
         os.makedirs(data_name_and_path)
-    data_name_and_path = data_name_and_path+"BPM-number_x-motor-step_x-motor-mm_y-motor-step_y-motor_mm_Va_Vb_Vc_Vd_Sum_X_Y_"+bpm_name+"_"+start_time_str+"_"
+    data_name_and_path = data_name_and_path+string_of_data+bpm_name+"_"+start_time_str+"_"
     while os.path.exists(data_name_and_path+str(idata)+".txt") :
         idata+=1
@@ -290 +293 @@
                            bpm_name1 = "BPM_E",bpm_name2 = "BPM_impr",bpm_name3 = "BPM_C",bpm_name4 = None): #name of the BPM used (as default, it the configuration of the BPM when this code was writen 
 
-    data_name_and_path = path(title_bpm_name) #create the name of the datafile
+    data_name_and_path = path(title_bpm_name, list_of_data) #create the name of the datafile
     write_first_line(data_name_and_path, list_of_data) # write first line of the datafile with the name of the data
     bpm_list = initialise_bpm(bpm_name1,bpm_name2,bpm_name3,bpm_name4) # initialise BPM (program on read_adc.py)
@@ -312 +315 @@
                            bpm_name1 = "BPM_E",bpm_name2 = "BPM_impr",bpm_name3 = "BPM_C",bpm_name4 = None): #name of the BPM used (as default, it the configuration of the BPM when this code was writen
     
-    data_name_and_path = path(title_bpm_name) #create the name of the datafile
+    data_name_and_path = path(title_bpm_name, list_of_data) #create the name of the datafile
     write_first_line(data_name_and_path, list_of_data)  # write first line of the datafile with the name of the data
     bpm_list = initialise_bpm(bpm_name1,bpm_name2,bpm_name3,bpm_name4) # initialise BPM (program on read_adc.py)
@@ -334 +337 @@
                    bpm_name1 = "BPM_E",bpm_name2 = "BPM_impr",bpm_name3 = "BPM_C",bpm_name4 = None):#name of the BPM used (as default, it the configuration of the BPM when this code was writen
     
-    data_name_and_path = path(title_bpm_name)#create the name of the datafile
+    data_name_and_path = path(title_bpm_name, list_of_data)#create the name of the datafile
     write_first_line(data_name_and_path, list_of_data)# write first line of the datafile with the name of the data
     bpm_list = initialise_bpm(bpm_name1,bpm_name2,bpm_name3,bpm_name4)# initialise BPM (program on read_adc.py)
@@ -340 +343 @@
     motor_enable(2)
     for y_position in np.linspace(begin2, end2, number_of_point2):            
-         motor_move_absolute(2,2000,y_position)
+        motor_move_absolute(2,2000,y_position)
         print('moteur going to', y_position)
         for x_position in np.linspace(begin1,end1,number_of_point1):
@@ -349 +352 @@
             time.sleep(1)
             acquisition_libera(x_position, y_position, data_name_and_path, statistic_number, list_of_data, bpm_list) # read_the data (program on read_adc.py)
-        begin1,end1 = end1,begin1 #to 
+        begin1,end1 = end1,begin1 #to go and back
     motor_disable(1)
     motor_disable(2)