Format with ruff

Author: dineshpinto

qudi_hira_analysis/_fitmethods/decaylikemethods.py

@@ -70,9 +70,9 @@ def barestretchedexponentialdecay_function(x, beta, lifetime):
 
     if not isinstance(prefix, str) and prefix is not None:
         self.log.error(
-            "The passed prefix <{}> of type {} is not a string and"
+            f"The passed prefix <{prefix}> of type {type(prefix)} is not a string and"
             "cannot be used as a prefix and will be ignored for now."
-            "Correct that!".format(prefix, type(prefix))
+            "Correct that!"
         )
         model = Model(barestretchedexponentialdecay_function, independent_vars=["x"])
     else:

qudi_hira_analysis/_fitmethods/gaussianlikemethods.py

@@ -74,9 +74,9 @@ def physical_gauss(x, center, sigma):
 
     if not isinstance(prefix, str) and prefix is not None:
         self.log.error(
-            "The passed prefix <{}> of type {} is not a string and"
+            f"The passed prefix <{prefix}> of type {type(prefix)} is not a string and"
             "cannot be used as a prefix and will be ignored for now."
-            "Correct that!".format(prefix, type(prefix))
+            "Correct that!"
         )
         gaussian_model = Model(physical_gauss, independent_vars=["x"])
     else:
@@ -299,9 +299,9 @@ def twoDgaussian_function(
 
     if not isinstance(prefix, str) and prefix is not None:
         self.log.error(
-            "The passed prefix <{}> of type {} is not a string and"
+            f"The passed prefix <{prefix}> of type {type(prefix)} is not a string and"
             "cannot be used as a prefix and will be ignored for now."
-            "Correct that!".format(prefix, type(prefix))
+            "Correct that!"
         )
         gaussian_2d_model = Model(twoDgaussian_function, independent_vars=["x"])
     else:

qudi_hira_analysis/_fitmethods/generalmethods.py

@@ -127,10 +127,10 @@ def _substitute_params(self, initial_params, update_params=None):
 
     else:
         self.log.error(
-            "The type of the passed update_params object <{}> is "
+            f"The type of the passed update_params object <{type(update_params)}> is "
             "neither of type lmfit.parameter.Parameters, "
             "OrderedDict or dict! Correct that, the initial_params"
-            "will be returned.".format(type(update_params))
+            "will be returned."
         )
 
     return initial_params

qudi_hira_analysis/_fitmethods/hyperbolicsaturationmethods.py

@@ -62,9 +62,9 @@ def hyperbolicsaturation_function(x, I_sat, P_sat):
 
     if not isinstance(prefix, str) and prefix is not None:
         self.log.error(
-            "The passed prefix <{}> of type {} is not a string and"
+            f"The passed prefix <{prefix}> of type {type(prefix)} is not a string and"
             "cannot be used as a prefix and will be ignored for now."
-            "Correct that!".format(prefix, type(prefix))
+            "Correct that!"
         )
 
         mod_sat = Model(hyperbolicsaturation_function, independent_vars=["x"])

qudi_hira_analysis/_fitmethods/poissonianlikemethods.py

@@ -104,9 +104,9 @@ def poisson_function(x, mu):
 
     if not isinstance(prefix, str) and prefix is not None:
         self.log.error(
-            "The passed prefix <{}> of type {} is not a string and"
+            f"The passed prefix <{prefix}> of type {type(prefix)} is not a string and"
             "cannot be used as a prefix and will be ignored for now."
-            "Correct that!".format(prefix, type(prefix))
+            "Correct that!"
         )
 
         poissonian_model = Model(poisson_function, independent_vars=["x"])

qudi_hira_analysis/_fitmethods/sinemethods.py

@@ -216,9 +216,9 @@ def bare_sine_function(x, frequency, phase):
 
     if not isinstance(prefix, str) and prefix is not None:
         self.log.error(
-            "The passed prefix <{}> of type {} is not a string and"
+            f"The passed prefix <{prefix}> of type {type(prefix)} is not a string and"
             "cannot be used as a prefix and will be ignored for now."
-            "Correct that!".format(prefix, type(prefix))
+            "Correct that!"
         )
         model = Model(bare_sine_function, independent_vars=["x"])
     else:

qudi_hira_analysis/_qudi_fit_logic.py

@@ -68,9 +68,7 @@ def __init__(self):
                     self._additional_methods_import_path
                 ]
                 self.log.info(
-                    "Adding fit methods path: {}".format(
-                        self._additional_methods_import_path
-                    )
+                    f"Adding fit methods path: {self._additional_methods_import_path}"
                 )
 
             if isinstance(self._additional_methods_import_path, (list, tuple, set)):
@@ -174,9 +172,7 @@ def __init__(self):
                 )
             else:
                 self.log.error(
-                    'No make_*_model method for fit "{}" found in FitLogic.' "".format(
-                        fit_name
-                    )
+                    f'No make_*_model method for fit "{fit_name}" found in FitLogic.' ""
                 )
 
             # Attach all estimate_* methods to corresponding fit method in fit_list
@@ -196,9 +192,7 @@ def __init__(self):
                     found_estimator = True
             if not found_estimator:
                 self.log.error(
-                    'No estimator method for fit "{}" found in FitLogic.' "".format(
-                        fit_name
-                    )
+                    f'No estimator method for fit "{fit_name}" found in FitLogic.' ""
                 )
 
         # self.log.info('Methods were included to FitLogic, but only if naming is