Merge branch 'main' of gitlab.synchrotron-soleil.fr:PA/operation/pythoncontrol

beam_current_scan.py

@@ -239,8 +239,9 @@ def beam_current_scan_step(file,
     if chro_measurement:
         get_chro(file, **kwargs)
     
-    beam_current_scan_loop(goal_current, 
-                           booster_cav,
+    beam_current_scan_loop(goal_current=goal_current, 
+                           booster_cav=booster_cav,
+                           file=file,
                            **kwargs)
     
     if fill_pattern_measurement:

growth_damp.py

@@ -67,8 +67,7 @@ def growth_damp_measurement(file,
 
 def growth_damp_core(file, 
                      window_width=1,
-                     window_delay=10,
-                     datasize=4):
+                     window_delay=10):
     """
     Growth damp core function.
 
@@ -84,11 +83,6 @@ def growth_damp_core(file,
         Delay generator window delay in [ns].
         Delay of the window during which the FBT is off.
         The default is 10.
-    datasize : int, optional
-        Data size of the BBFV3 device.
-        Increasing this value allows to save more turns.
-        Be careful when increasing this value, ~10 is a good value.
-        The default is 4.
 
     """
     # Measurement params
@@ -105,18 +99,9 @@ def growth_damp_core(file,
     selected = fbt.selectedBunchNumberADC0
     check_feedback_stoped()
         
-    if datasize != 4:
-        # Change data size
-        fbt.automaticacquisitionoff()
-        sleep(sleep_time_acquisition_on_off)
-        fbt.datasize = datasize
-        fbt.automaticacquisitionon()
-        sleep(sleep_time_acquisition_on_off)
-        
     # File setup
     file["window_delay"] = window_delay
     file["window_width"] = window_width
-    file["datasize"] = datasize
     file["gainADC0"] = fbt.gainADC0
     file["gainADC4"] = fbt.gainADC4
     
@@ -144,14 +129,6 @@ def growth_damp_core(file,
 
     # Get back to nominal
     fbt.selMNOsource = selMNOsource_initial
-    if datasize != 4:
-        fbt.datasize = 4 # default value for operation
-        fbt.AutomaticAcquisitionON()
-        sleep(sleep_time_acquisition_on_off)
-        # Tune devices do not work for datasize != 4, so init is needed
-        tuneZ.init()
-        tuneX.init()
-
     fbt.selectedBunchNumberADC0 = selected
     
 

injection.py

@@ -170,7 +170,10 @@ def inject_uniform_beam(goal_current, booster_cav, fine_delay):
     eff_sr = np.ones((10,))*100
     count = 0
     while dcct.current < goal_current:
-        bucket_list = (1 + count*8)%416
+        for j in range(4):
+            bucket_list = (1 + count*8 + 104*j)%416
+            print(bucket_list)
+            bucket_list=[bucket_list]
             set_injection("LPM", bucket_list, fine_delay)
             inject_beam(booster_cav)