fiqus 2024.6.0__tar.gz → 2024.7.0__tar.gz

{fiqus-2024.6.0 → fiqus-2024.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiqus
-Version: 2024.6.0
+Version: 2024.7.0
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team

{fiqus-2024.6.0 → fiqus-2024.7.0}/fiqus/data/DataFiQuSConductorAC_Strand.py

@@ -426,10 +426,10 @@ class CACStrandPostprocBatchpostprocPlot2d(BaseModel):
     save_plot: bool = Field(default=False, description="Set True to save the plot.")
     filename: str = Field(default="plot2d", description="Name of the plot file.")
     x_val: Optional[str] = Field(
-        default=None, description="Value to be plotted on the x-axis. This field corresponds to a parameter in the input YAML-file. E.g. 'solve.source_parameters.sine.frequency' will create a 2D plot with frequency on the x-axis."
+        default=None, description="Value to be plotted on the x-axis. Parameters in the input YAML-file and class-variables from the plotter 'SimulationData' class can be accessed trough the notation << . >>. E.g. '<<solve.source_parameters.sine.frequency>>' will create a 2D plot with frequency on the x-axis. '<<time>>' will create a plot with time on the x-axis."
     )
     y_vals: Optional[List[str]] = Field(
-        default=None, description=" List of values to be plotted on the y-axis. Total AC-loss per cycle can be accessed as ['total_power_per_cycle['TotalLoss_dyn']']."
+        default=None, description=" List of values to be plotted on the y-axis. Parameters in the input YAML-file and class-variables from the plotter 'SimulationData' class can be accessed trough the notation << . >>. E.g. total AC-loss per cycle can be accessed as ['<<total_power_per_cycle['TotalLoss_dyn']>>']."
     )
     labels: Optional[List[str]] = Field(
         default=None,
@@ -457,7 +457,7 @@ class CACStrandPostprocBatchpostprocFilter(BaseModel):
     )
     filter_criterion: Optional[str] = Field(
         default=None,
-        description="Criterion used to filter simulations based on simulation parameters. For example will 'solve.source_parameters.sine.frequency > 100' disregard simulations done with frequencies lower than 100Hz.",
+        description="Criterion used to filter simulations based on simulation parameters. For example will '<<solve.source_parameters.sine.frequency>> > 100' disregard simulations done with frequencies lower than 100Hz.",
     )
 
 

{fiqus-2024.6.0 → fiqus-2024.7.0}/fiqus/plotters/PlotPythonConductorAC.py

@@ -7,6 +7,7 @@ from matplotlib.animation import FuncAnimation
 import pandas as pd
 from scipy import integrate, interpolate
 from ruamel.yaml import YAML
+import subprocess
 
 # from fiqus.utils.Utils import FilesAndFolders as Util
 # from fiqus.data.DataFiQuSConductorAC_Strand import CACStrandSolve, CACStrandPostproc, CACStrandMesh, CACStrandGeometry
@@ -70,6 +71,17 @@ def load_yaml(file_path):
         data = yaml.load(file)
     return YamlWrapper(data)
 
+def is_latex_installed():
+    """
+    Check if LaTeX is installed on the system.
+    """
+    try:
+        subprocess.run(['pdflatex', '--version'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        return True
+    except subprocess.CalledProcessError:
+        return False
+    except FileNotFoundError:
+        return False
 
 class SimulationData:
     """
@@ -300,7 +312,7 @@ class PlotPython:
     def sort_simulationCollection(self, simulationCollection):
         """ 
         This function is used to sort the simulationCollection based on the sort key specified in the yaml input file.
-        An example of a sort key is 'sd.fdm.solve.source_parameters.sine.frequency', which will sort the simulations based on frequency.
+        An example of a sort key is 'solve.source_parameters.sine.frequency', which will sort the simulations based on frequency.
         """
         if self.fdm.magnet.postproc.batch_postproc.sort.apply_sort:
             sorting_function = eval(f'lambda sd: sd.{self.fdm.magnet.postproc.batch_postproc.sort.sort_key}')
@@ -460,10 +472,10 @@ class PlotPython:
         This function calls the lossMap_crossSection function and plots the data it returns, which is the loss for all values of one axis, given a constant value of the other axis.
         """
         
-
-        plt.rcParams['text.usetex'] = True
-        plt.rcParams['font.family'] = 'times'
-        plt.rcParams['font.size'] = 20
+        if is_latex_installed():
+            plt.rcParams['text.usetex'] = True
+            plt.rcParams['font.family'] = 'times'
+            plt.rcParams['font.size'] = 20
 
         lm = self.fdm.magnet.postproc.batch_postproc.loss_map
         slice_value = lm.cross_section.cut_value
@@ -594,9 +606,10 @@ class PlotPython:
         else:
             X, Y, V = self.totalLoss_gridData
 
-        plt.rcParams['text.usetex'] = True
-        plt.rcParams['font.family'] = 'times'
-        plt.rcParams['font.size'] = 20
+        if is_latex_installed():
+            plt.rcParams['text.usetex'] = True
+            plt.rcParams['font.family'] = 'times'
+            plt.rcParams['font.size'] = 20
 
         fig, ax = plt.subplots(figsize=(10,8))
     
@@ -713,9 +726,10 @@ class PlotPython:
         """
         This function is used to create a 2d plot. It is supposed to be flexible and work for various kinds of plots one may want to create.
         """
-        plt.rcParams['text.usetex'] = True
-        plt.rcParams['font.family'] = 'times'
-        # plt.rcParams['font.size'] = 20
+        if is_latex_installed():
+            plt.rcParams['text.usetex'] = True
+            plt.rcParams['font.family'] = 'times'
+            # plt.rcParams['font.size'] = 20
 
         # Create the title (or titles if combined_plot is False)
         title = self.fdm.magnet.postproc.batch_postproc.plot2d.title
@@ -746,7 +760,8 @@ class PlotPython:
                 simulation_labels.append(l)
             labels[i, :] = simulation_labels
 
-        colors = plt.cm.get_cmap('magma').resampled(len(self.simulation_collection)).colors
+        # colors = plt.cm.get_cmap('magma').resampled(len(self.simulation_collection)).colors
+        colors = plt.cm.get_cmap('viridis').resampled(len(self.simulation_collection)).colors
 
         # Load the x-values:
         x_val = self.fdm.magnet.postproc.batch_postproc.plot2d.x_val
@@ -780,7 +795,7 @@ class PlotPython:
 
         # Check if the y-values are all floats:
         y_is_float = np.all(np.apply_along_axis(lambda arr: np.all(np.vectorize(isinstance)(arr, float)), axis=1, arr=y_arr))
-        # If they are all floats, we can make a single plot, spanning all simulations, instead of one plot per simulation.
+        # If they are all floats (not arrays), we can make a single plot, spanning all simulations, instead of one plot per simulation.
         if y_is_float:
             for column in range(y_arr.shape[1]):
                 plt.plot(x_arr, y_arr[:, column], label=label_list[column])

{fiqus-2024.6.0 → fiqus-2024.7.0}/fiqus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fiqus
-Version: 2024.6.0
+Version: 2024.7.0
 Summary: Source code for STEAM FiQuS tool
 Home-page: https://gitlab.cern.ch/steam/fiqus
 Author: STEAM Team

{fiqus-2024.6.0 → fiqus-2024.7.0}/setup.py

@@ -35,7 +35,7 @@ all_requirements = required + docs_require + tests_require + build_require
 
 setup(
     name="fiqus",
-    version="2024.6.0",
+    version="2024.7.0",
     author="STEAM Team",
     author_email="steam-team@cern.ch",
     description="Source code for STEAM FiQuS tool",