changes in analysis imports

cosmicfishpie/analysis/fisher_derived.py

@@ -31,7 +31,7 @@
 
 import numpy as np
 
-from . import fisher_matrix as fm
+from cosmicfishpie.analysis import fisher_matrix as fm
 
 # ***************************************************************************************
 

cosmicfishpie/analysis/fisher_matrix.py

@@ -33,7 +33,7 @@
 
 import numpy as np
 
-from . import utilities as fu
+from cosmicfishpie.analysis import utilities as fu
 
 # ***************************************************************************************
 

cosmicfishpie/analysis/fisher_operations.py

@@ -29,7 +29,7 @@
 
 import numpy as np
 
-from . import fisher_matrix as fm
+from cosmicfishpie.analysis import fisher_matrix as fm
 
 # ***************************************************************************************
 

cosmicfishpie/analysis/fisher_plot_analysis.py

@@ -30,11 +30,10 @@
 
 import numpy as np
 
-from . import __init__ as CosmicFishPyLib
-from . import fisher_derived as fd
-from . import fisher_matrix as fm
-from . import fisher_operations as fo
-from . import utilities as fu
+from cosmicfishpie.analysis import fisher_derived as fd
+from cosmicfishpie.analysis import fisher_matrix as fm
+from cosmicfishpie.analysis import fisher_operations as fo
+from cosmicfishpie.analysis import utilities as fu
 
 # ***************************************************************************************
 
@@ -89,6 +88,7 @@ def __init__(
 
         """
         # create class instances:
+        self.feedback = 1
         self.fisher_list = []
         self.fisher_name_list = []
         # check wether we have to do something:
@@ -176,14 +176,14 @@ def search_fisher_path(self, fisher_path, search_fisher_guess=False, with_derive
 
         # import fisher matrices:
         for file in fisher_files:
-            if CosmicFishPyLib.__feedback__ > 1:
+            if self.feedback > 1:
                 print("Trying to import: " + file + " as a Fisher matrix: ", end=" ")
             try:
                 self.fisher_list.append(fm.fisher_matrix(file_name=file))
                 self.fisher_name_list.append(self.fisher_list[-1].name)
-                if CosmicFishPyLib.__feedback__ > 1:
+                if self.feedback > 1:
                     print("SUCCESS")
-                if CosmicFishPyLib.__feedback__ == 1:
+                if self.feedback == 1:
                     print("Imported as a Fisher matrix: " + file)
                 # remove from the derived fishers if necessary:
                 derived_fisher_files.remove(file)

cosmicfishpie/analysis/fisher_plotting.py

@@ -7,26 +7,22 @@
 
 from cosmicfishpie.utilities.utils import filesystem as ffs
 
-from . import fisher_matrix as fm
-from . import fisher_plot_analysis as fpa
-from . import plot_comparison as pc
+from cosmicfishpie.analysis import fisher_matrix as fm
+from cosmicfishpie.analysis import fisher_plot_analysis as fpa
+from cosmicfishpie.analysis import plot_comparison as pc
 
-matplotlib.rcParams.update({"font.size": 22})
-matplotlib.rcParams.update({"font.family": "cm"})
 params = {
-    "mathtext.fontset": "cm",
+    "mathtext.fontset": "stix",
+    "font.size": 22,
     "mathtext.rm": "serif",
     "mathtext.bf": "serif:bold",
     "mathtext.it": "serif:italic",
     "mathtext.sf": "sans\\-serif",
     "text.usetex": False,
-    "font.family": "serif",
+    "font.family": "STIXGeneral",
     "font.weight": "normal",
-    "font.serif": "Computer Modern",
 }
-
 matplotlib.rcParams.update(params)
-matplotlib.rcParams["text.usetex"]
 
 
 class fisher_plotting:

cosmicfishpie/analysis/plot_comparison.py

@@ -12,8 +12,8 @@
 import seaborn as sns
 from mpl_toolkits import axes_grid1
 
-from . import fisher_operations as fo
-from . import utilities as fu
+from cosmicfishpie.analysis import fisher_operations as fo
+from cosmicfishpie.analysis import utilities as fu
 
 plt.style.use("tableau-colorblind10")