Organize in submodules

plotter.py

@@ -36,12 +36,11 @@ except ModuleNotFoundError:
     print("WARNING: no movie support (missing module moviepy)")
 from mpl_toolkits.axes_grid1.inset_locator import inset_axes
 
-import pspec_read
 from baseprocessor import Rule, BaseProcessor
 from aggregator import Aggregator
 from studyprocessor import StudyProcessor
-from run_selector import RunSelector
-from units import U, unit_str, convert_exp
+from runselector import RunSelector
+from utils.units import U, unit_str, convert_exp
 
 try:
     import lic
@@ -56,7 +55,7 @@ from astrophysix.simdm.experiment import (
     ParameterVisibility,
     Simulation,
 )
-from ramses_astrophysix import ramses
+from galactica.ramses_astrophysix import ramses
 
 
 filetype_from_ext = {ext: ft for ft in FileType for ext in ft.extension_list}
@@ -270,6 +269,7 @@ class Plotter(Aggregator, BaseProcessor):
             self.nums,
             self.path_out,
             self.params,
+            tag=tag,
             unit_time=unit_time,
             selector=self.selector,
         )
@@ -1434,15 +1434,6 @@ class Plotter(Aggregator, BaseProcessor):
         if subname_y:
             hdf5_y.close()
 
-    def _pspec(self, name, **kwargs):
-        """
-        Plot power spectrum (wrapper around pspec_read)
-        """
-        del kwargs["run"]
-        file_pspec = self.current_processor.get_value("/hdf5/pspec")
-        num = self.current_processor.num
-        getattr(pspec_read, "pspec_" + name)(file_pspec, ".", num, **kwargs)
-
     def _overlay_fit(self, x, y, yerr=None, kind="linear", label=None, **kwargs):
         """
         Add an overlay : fit a curve, linear or powerlaw
@@ -1527,7 +1518,7 @@ class Plotter(Aggregator, BaseProcessor):
         This is where rules are defined
         """
         self.rules = {
-            "plot_arrays": PlotRule(lambda arg, **kwargs: self._plot(*arg, **kwargs), kind="comp"
+            "plot_comp": PlotRule(lambda arg, **kwargs: self._plot(*arg, **kwargs), kind="comp"
             ),
             "plot_run": PlotRule(lambda arg, **kwargs: self._plot(*arg, **kwargs), kind="run"
             ),
@@ -1674,7 +1665,6 @@ class Plotter(Aggregator, BaseProcessor):
                 "Density profile",
                 dependencies=["axis", "rho_prof"],
             ),
-            "pspec": PlotRule(self, self._pspec, dependencies={"pspec": None}),
             "sbeta": PlotRule(
                 partial(
                     self._plot,
@@ -1965,13 +1955,15 @@ class Plotter(Aggregator, BaseProcessor):
             self._gen_from_log("fine_step_from_log", name)
         for name in ["time", "dt", "a", "mem_cells", "mem_parts"]:
             self._gen_from_log("fine_step_from_log", name_y=name, name_x="fine_step")
+        
+        self._gen_from_log("SN_momentum_from_log", name_x="time", name_y="SN_momentum")
 
         # Dict of overlays
         self.overlays = {
             "g": partial(self._overlay_vector, "g"),
             "B": self._overlay_B,
             "vel": self._overlay_speed,
-            "speed": self._overlay_speed,
+            "speed": self._overlay_speed,   
             "levels": self._overlay_levels,
             "contour": self._overlay_contour,
             "particles": self._overlay_particles,