Improved logging for beam current scan

pythoncontrol/measurements/beam_current_scan.py

@@ -93,28 +93,34 @@ class InstabilityThresholdMeasurement:
                 raise ValueError('max_emittance must to be specified if \
                                  stop_at_max_emit is True')
         FBT_gain = self.fbt.get_gain()
+        logger.info(f"FBT gain is {FBT_gain}")
 
         # Measurement loop
         count = 0
         max_current = 0
+        logger.info("Starting beam current increase")
         while self.beam_parameters.get_dcct() < goal_current:
             
             if FBT_on_off:
                 self.fbt.set_gain(FBT_gain)
                 
-            logger.info(f"Current: {self.beam_parameters.get_dcct()} mA")
+            logger.info(f"Current before injection is {self.beam_parameters.get_dcct()} mA")
             inject_beam(booster_cav)
             inject_beam(booster_cav)
             sleep(3)
-            
+            logger.info(f"Current after injection is \
+                        {self.beam_parameters.get_dcct()} ma")
             if FBT_on_off:
                 if measurement_plane == "V":
+                    logger.info(f"Setting vertical FBT gain to 0")
                     self.fbt.set_gain(0, FBT_gain[1])
                 elif measurement_plane == "H":
+                    logger.info(f"Setting horizontal FBT gain to 0")
                     self.fbt.set_gain(FBT_gain[0], 0)
                 else:
                     raise ValueError("FBT_plane must be 'V' or 'H'.")
 
+            logger.info('Recording intermediate measurement data') 
             self.beam_parameters.record_data(self.filename)
             self.tune.record_data(self.filename)
 
@@ -145,6 +151,7 @@ class InstabilityThresholdMeasurement:
             logger.info("Emittance blow-up detected, exiting loop.")
             return True
         return False
+
     def scan_vs_chromaticity(self, chromaticities, booster_cav,
                              FBT_on_off=False, measurement_plane="V"):
         """
@@ -166,7 +173,8 @@ class InstabilityThresholdMeasurement:
                           measurement_plane=measurement_plane,
                           N_current_increase=5,
                           chro_measurement=False)
-            logger.info("Completed threshold current measurement for chromaticity %s", chro)
+            logger.info(f"Completed threshold current measurement for \
+            chromaticity {chro}",)
 
 
 # def beam_current_scan_step(file,