Trying to resolve all the merge conflicts.

toolboxes/DebyeFit/Debye_Fit.py

@@ -123,9 +123,7 @@ class Relaxation(object):
         """
         print(f"Approximating {self.name}" f" using {self.number_of_debye_poles} Debye poles")
         print(f"{self.name} parameters: ")
-        s = ""
-        for k, v in self.params.items():
-            s += f"{k:10s} = {v}\n"
+        s = "".join(f"{k:10s} = {v}\n" for k, v in self.params.items())
         print(s)
         return f"{self.name}:\n{s}"
 
@@ -232,10 +230,10 @@ class Relaxation(object):
             "#material: {} {} {} {} {}\n".format(ee, self.sigma, self.mu, self.mu_sigma, self.material_name)
         )
         print(material_prop[0], end="")
-        dispersion_prop = "#add_dispersion_debye: {}".format(len(tau))
+        dispersion_prop = f"#add_dispersion_debye: {len(tau)}"
         for i in range(len(tau)):
-            dispersion_prop += " {} {}".format(weights[i], 10 ** tau[i])
-        dispersion_prop += " {}".format(self.material_name)
+            dispersion_prop += f" {weights[i]} {10**tau[i]}"
+        dispersion_prop += f" {self.material_name}"
         print(dispersion_prop)
         material_prop.append(dispersion_prop + "\n")
         return material_prop
@@ -312,11 +310,10 @@ class Relaxation(object):
             file_path = os.path.join("user_libs", "materials", "my_materials.txt")
         else:
             sys.exit("Cannot save material properties " f"in {os.path.join(fdir, 'my_materials.txt')}!")
-        fileH = open(file_path, "a")
-        fileH.write(f"## {output[0].split(' ')[-1]}")
-        fileH.writelines(output)
-        fileH.write("\n")
-        fileH.close()
+        with open(file_path, "a") as fileH:
+            fileH.write(f"## {output[0].split(' ')[-1]}")
+            fileH.writelines(output)
+            fileH.write("\n")
         print(f"Material properties save at: {file_path}")
 
 
@@ -613,7 +610,7 @@ class Crim(Relaxation):
         print(f"Approximating Complex Refractive Index Model (CRIM)" f" using {self.number_of_debye_poles} Debye poles")
         print("CRIM parameters: ")
         for i in range(len(self.volumetric_fractions)):
-            print("Material {}.:".format(i + 1))
+            print(f"Material {i + 1}.:")
             print("---------------------------------")
             print(f"{'Vol. fraction':>27s} = {self.volumetric_fractions[i]}")
             print(f"{'e_inf':>27s} = {self.materials[i][0]}")

toolboxes/DebyeFit/optimization.py

@@ -474,7 +474,6 @@ def DLS(logt, rl, im, freq):
     rp, ip = np.matmul(d.real, x[np.newaxis].T).T[0], np.matmul(d.imag, x[np.newaxis].T).T[0]
     cost_i = np.sum(np.abs(ip - im)) / len(im)
     ee = np.mean(rl - rp)
-    if ee < 1:
-        ee = 1
+    ee = max(ee, 1)
     cost_r = np.sum(np.abs(rp + ee - rl)) / len(im)
     return cost_i, cost_r, x, ee, rp, ip