minor fix

dagghe · Jan 25, 2024 · eb984f6 · eb984f6
1 parent 658696c
commit eb984f6
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/src/pyoma2/OMA.py b/src/pyoma2/OMA.py
@@ -106,7 +106,7 @@ def plot_geo1(
         remove_axis: bool = True,
     ):
 
-        fig = plt.figure(figsize=(10, 10), tight_layout=True)
+        fig = plt.figure(figsize=(8, 8), tight_layout=True)
         ax = fig.add_subplot(111, projection="3d")
 
         # plot sensors' nodes
@@ -161,7 +161,7 @@ def plot_geo2(
         remove_axis: bool = True,
     ):
 
-        fig = plt.figure(figsize=(10, 10))
+        fig = plt.figure(figsize=(8, 8))
         ax = fig.add_subplot(111, projection="3d")
 
         # plot sensors' nodes
@@ -494,7 +494,6 @@ def merge_results(self) -> typing.Dict[str, MsPoserResult]:
             )
         return self.__result
 
-    # FIXME DA SISTEMARE
     # metodo per definire geometria 1
     def def_geo1(
         self,
@@ -558,7 +557,7 @@ def plot_geo1(
         remove_axis: bool = True,
     ):
 
-        fig = plt.figure(figsize=(10, 10), tight_layout=True)
+        fig = plt.figure(figsize=(8, 8), tight_layout=True)
         ax = fig.add_subplot(111, projection="3d")
 
         # plot sensors' nodes
@@ -603,7 +602,6 @@ def plot_geo1(
 
         return fig, ax
 
-    # FIXME DA SISTEMARE
     # metodo per definire geometria 2
     def def_geo2(
         self,
@@ -680,7 +678,7 @@ def plot_geo2(
         remove_axis: bool = True,
     ):
 
-        fig = plt.figure(figsize=(10, 10))
+        fig = plt.figure(figsize=(8, 8))
         ax = fig.add_subplot(111, projection="3d")
 
         # plot sensors' nodes
@@ -750,7 +748,7 @@ def plot_mode_g1(
         phi = Algo_Res.Phi[:, int(mode_numb - 1)].real
         fn = Algo_Res.Fn[int(mode_numb - 1)]
 
-        fig = plt.figure(figsize=(10, 10), tight_layout=True)
+        fig = plt.figure(figsize=(8, 8), tight_layout=True)
         ax = fig.add_subplot(111, projection="3d")
 
         # set title
@@ -925,7 +923,6 @@ def __init__(
         self.data = Y
         self.algorithms: typing.Dict[str, BaseAlgorithm] = {}  # set of algo
 
-    # FIXME DA SISTEMARE
     # metodo per definire geometria 1
     def def_geo1(
         self,
@@ -976,7 +973,6 @@ def def_geo1(
             bg_surf=bg_surf,
         )
 
-    # FIXME DA SISTEMARE
     # metodo per definire geometria 2
     def def_geo2(
         self,

diff --git a/src/pyoma2/algorithm/fdd.py b/src/pyoma2/algorithm/fdd.py
@@ -135,7 +135,7 @@ def plot_mode_g1(
         phi = self.result.Phi[:, int(mode_numb - 1)].real
         fn = self.result.Fn[int(mode_numb - 1)]
 
-        fig = plt.figure(figsize=(10, 10), tight_layout=True)
+        fig = plt.figure(figsize=(8, 8), tight_layout=True)
         ax = fig.add_subplot(111, projection="3d")
 
         # set title
@@ -310,6 +310,16 @@ def mpe(
         npmax: int = 20,
     ) -> typing.Any:
 
+        # Save run parameters
+        self.run_params.sel_freq = sel_freq
+        self.run_params.DF1 = DF1
+        self.run_params.DF2 = DF2
+        self.run_params.cm = cm
+        self.run_params.MAClim = MAClim
+        self.run_params.sppk = sppk
+        self.run_params.npmax = npmax
+
+        # Extract modal results
         Fn_FDD, Xi_FDD, Phi_FDD, forPlot = FDD_funct.EFDD_MPE(
             self.result.Sy,
             self.result.freq,
@@ -342,6 +352,14 @@ def mpe_fromPlot(
         freqlim: typing.Optional[float] = None,
     ) -> typing.Any:
 
+        # Save run parameters
+        self.run_params.DF1 = DF1
+        self.run_params.DF2 = DF2
+        self.run_params.cm = cm
+        self.run_params.MAClim = MAClim
+        self.run_params.sppk = sppk
+        self.run_params.npmax = npmax
+
         # chiamare plot interattivo
         SFP = SelFromPlot(algo=self, freqlim=freqlim, plot="FDD")
         sel_freq = SFP.result[0]
@@ -392,7 +410,6 @@ class FSDD_algo(EFDD_algo):
     method: typing.Literal["EFDD", "FSDD"] = "FSDD"
 
 
-# FIXME
 # =============================================================================
 # MULTI SETUP
 # =============================================================================

diff --git a/src/pyoma2/algorithm/ssi.py b/src/pyoma2/algorithm/ssi.py
@@ -93,11 +93,19 @@ def mpe(
     ) -> typing.Any:
         super().mpe(sel_freq=sel_freq, order=order, deltaf=deltaf, rtol=rtol)
 
+        # Save run parameters
+        self.run_params.sel_freq = sel_freq
+        self.run_params.order_in = order
+        self.run_params.deltaf = deltaf
+        self.run_params.rtol = rtol
+
+        # Get poles
         Fn_pol = self.result.Fn_poles
         Sm_pol = self.result.xi_poles
         Ms_pol = self.result.Phi_poles
         Lab = self.result.Lab
 
+        # Extract modal results
         Fn_SSI, Xi_SSI, Phi_SSI, order_out = SSI_funct.SSI_MPE(
             sel_freq, Fn_pol, Sm_pol, Ms_pol, order, Lab=Lab, deltaf=deltaf, rtol=rtol
         )
@@ -116,6 +124,11 @@ def mpe_fromPlot(
     ) -> typing.Any:
         super().mpe_fromPlot(freqlim=freqlim, deltaf=deltaf, rtol=rtol)
 
+        # Save run parameters
+        self.run_params.deltaf = deltaf
+        self.run_params.rtol = rtol
+
+        # Get poles
         Fn_pol = self.result.Fn_poles
         Sm_pol = self.result.xi_poles
         Ms_pol = self.result.Phi_poles
@@ -200,7 +213,7 @@ def plot_mode_g1(
         phi = self.result.Phi[:, int(mode_numb - 1)].real
         fn = self.result.Fn[int(mode_numb - 1)]
 
-        fig = plt.figure(figsize=(10, 10), tight_layout=True)
+        fig = plt.figure(figsize=(8, 8), tight_layout=True)
         ax = fig.add_subplot(111, projection="3d")
 
         # set title
@@ -361,7 +374,6 @@ class SSIcov_algo(SSIdat_algo):
     method: typing.Literal["cov_bias", "cov_mm", "cov_unb"] = "cov_bias"
 
 
-# FIXME - DOVREBBE ESSERE OK
 # =============================================================================
 # MULTISETUP
 # =============================================================================