Merge pull request #383 from Sai-Suraj-27/f-strings

Reformatted few files according to latest python standards.

toolboxes/AntennaPatterns/initial_save.py

@@ -65,10 +65,10 @@ if epsr:
     wavelength = v1 / f
 
 # Print some useful information
-logger.info("Centre frequency: {} GHz".format(f / 1e9))
+logger.info(f"Centre frequency: {f / 1000000000.0} GHz")
 if epsr:
-    logger.info("Critical angle for Er {} is {} degrees".format(epsr, thetac))
-    logger.info("Wavelength: {:.3f} m".format(wavelength))
+    logger.info(f"Critical angle for Er {epsr} is {thetac} degrees")
+    logger.info(f"Wavelength: {wavelength:.3f} m")
     logger.info(
         "Observation distance(s) from {:.3f} m ({:.1f} wavelengths) to {:.3f} m ({:.1f} wavelengths)".format(
             radii[0], radii[0] / wavelength, radii[-1], radii[-1] / wavelength
@@ -204,4 +204,4 @@ for radius in range(0, len(radii)):
 
 # Save pattern to numpy file
 np.save(os.path.splitext(outputfile)[0], patternsave)
-logger.info("Written Numpy file: {}.npy".format(os.path.splitext(outputfile)[0]))
+logger.info(f"Written Numpy file: {os.path.splitext(outputfile)[0]}.npy")

toolboxes/AntennaPatterns/plot_fields.py

@@ -65,7 +65,7 @@ if epsr:
 logger.info(f"Centre frequency: {f / 1000000000.0} GHz")
 if epsr:
     logger.info(f"Critical angle for Er {epsr} is {thetac} degrees")
-    logger.info("Wavelength: {:.3f} m".format(wavelength))
+    logger.info(f"Wavelength: {wavelength:.3f} m")
     logger.info(
         "Observation distance(s) from {:.3f} m ({:.1f} wavelengths) to {:.3f} m ({:.1f} wavelengths)".format(
             radii[0], radii[0] / wavelength, radii[-1], radii[-1] / wavelength
@@ -107,7 +107,7 @@ for patt in range(0, len(radii)):
     # Replace any NaNs or Infs from zero division
     power[np.invert(np.isfinite(power))] = 0
 
-    ax.plot(theta, power, label="{:.2f}m".format(radii[patt]), marker=".", ms=6, lw=1.5)
+    ax.plot(theta, power, label=f"{radii[patt]:.2f}m", marker=".", ms=6, lw=1.5)
 
 # Add Hertzian dipole plot
 # hertzplot1 = np.append(hertzian[0, :], hertzian[0, 0]) # Append start value to close circle

toolboxes/DebyeFit/Debye_Fit.py

@@ -220,14 +220,12 @@ class Relaxation(object):
         print(f"       |{'e_inf':^14s}|{'De':^14s}|{'log(tau_0)':^25s}|")
         print("_" * 65)
         for i in range(0, len(tau)):
-            print("Debye {0:}|{1:^14.5f}|{2:^14.5f}|{3:^25.5f}|".format(i + 1, ee / len(tau), weights[i], tau[i]))
+            print(f"Debye {i + 1}|{ee / len(tau):^14.5f}|{weights[i]:^14.5f}|{tau[i]:^25.5f}|")
             print("_" * 65)
 
         # Print the Debye expnasion in a gprMax format
         material_prop = []
-        material_prop.append(
-            "#material: {} {} {} {} {}\n".format(ee, self.sigma, self.mu, self.mu_sigma, self.material_name)
-        )
+        material_prop.append(f"#material: {ee} {self.sigma} {self.mu} {self.mu_sigma} {self.material_name}\n")
         print(material_prop[0], end="")
         dispersion_prop = f"#add_dispersion_debye: {len(tau)}"
         for i in range(len(tau)):

toolboxes/GPRAntennaModels/GSSI.py

@@ -422,9 +422,9 @@ def antenna_like_GSSI_1500(x, y, z, resolution=0.001, **kwargs):
 
 def antenna_like_GSSI_400(x, y, z, resolution=0.002, **kwargs):
     """Inserts a description of an antenna similar to the GSSI 400MHz antenna.
-        This model represents an update to the previous model of the GSSI 400MHz 
-        antenna and was created and optimised by Stadler et al. (2022) 
-        in: https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=9686638. 
+        This model represents an update to the previous model of the GSSI 400MHz
+        antenna and was created and optimised by Stadler et al. (2022)
+        in: https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=9686638.
         Can be used with 2mm spatial resolution.
         The external dimensions of the antenna are 300x300x178mm.
         One output point is defined between the arms of the receiver bowtie.
@@ -459,7 +459,7 @@ def antenna_like_GSSI_400(x, y, z, resolution=0.002, **kwargs):
     metalmiddleplateheight = 0.11
 
     smooth_dec = "yes"  # choose to use dielectric smoothing or not
-    src_type = "GSSI_400MHz_pulse" # (or voltage_source)
+    src_type = "GSSI_400MHz_pulse"  # (or voltage_source)
     pcber = 6.401200848809589
     hdper = 1.0
     skidthickness = 0.01

toolboxes/GPRAntennaModels/GSSI_400MHz_pulse.txt

@@ -39996,4 +39996,4 @@ time my_pulse
 9.9992499437e-08 0.0000000000e+00
 9.9994999625e-08 0.0000000000e+00
 9.9997499812e-08 0.0000000000e+00
-1.0000000000e-07 0.0000000000e+00
+1.0000000000e-07 0.0000000000e+00