Added sbeta_onavg + Switched to densty PDF

plotter.py

@@ -708,8 +708,6 @@ class Plotter(Aggregator, BaseProcessor):
 
         P.streamplot(hh, vv, map_Bh_red, map_Bv_red, **kwargs)
 
-        P.streamplot(hh, vv, map_Bh_red, map_Bv_red)
-
     def _plot_radial(
         self,
         name,
@@ -719,6 +717,7 @@ class Plotter(Aggregator, BaseProcessor):
         xlog=False,
         ylog=False,
         ytransform=None,
+        label=None,
         title=None,
         nml_key=None,
         put_title=True,
@@ -763,6 +762,10 @@ class Plotter(Aggregator, BaseProcessor):
 
             P.title(title)
 
+        if label is None:
+            label = title
+        P.plot(bin_centers, mean_bin, label=label, **kwargs)
+
         P.plot(bin_centers, mean_bin, label=title, **kwargs)
 
     def _plot_hist(
@@ -863,7 +866,7 @@ class Plotter(Aggregator, BaseProcessor):
         if not ylabel is None:
             P.ylabel(ylabel)
 
-        if not ax_los is None and "/hist/fit_" + name + "_" + ax_los in self.save:
+        if ax_los is not None and "/hist/fit_" + name + "_" + ax_los in self.save:
             slope = node.attrs.slope
             origin = node.attrs.origin
             P.plot(
@@ -900,6 +903,7 @@ class Plotter(Aggregator, BaseProcessor):
         nml_key=None,
         run=None,
         runs=None,
+        yerr=None,
         yerr_kind="std",
         sigma_err=2.0,
         grid=False,
@@ -955,7 +959,6 @@ class Plotter(Aggregator, BaseProcessor):
             else:
                 label = time_str
 
-        yerr = None
         if node_y._v_attrs.CLASS == "ARRAY":
             x = node_x.read() * xunit_old.express(xunit)
             y = node_y.read() * yunit_old.express(yunit)
@@ -981,7 +984,14 @@ class Plotter(Aggregator, BaseProcessor):
                         color = colors[nml]
                     except:
                         color = colors(nml)
-                (base_line,) = P.plot(x, y, label=label, color=color, **kwargs)
+                if yerr is None:
+                    (base_line,) = P.plot(x, y, label=label, color=color, **kwargs)
+                else:
+                    if isinstance(yerr, str):
+                        yerr = self.save.get_node(yerr).read()
+
+                    base_line, _, _ = P.errorbar(x, y, yerr=yerr, label=label, **kwargs)
+
         elif "mean" in node_y:
             x = node_x.read() * xunit_old.express(xunit)
             y = node_y.mean.read() * yunit_old.express(yunit)
@@ -1401,7 +1411,7 @@ class Plotter(Aggregator, BaseProcessor):
                 dependencies=["axis", "rho_prof"],
             ),
             "pspec": PlotRule(self, self._pspec, dependencies={"pspec": None}),
-            "kappa_beta": PlotRule(
+            "sbeta": PlotRule(
                 self,
                 partial(
                     self._plot,
@@ -1415,6 +1425,18 @@ class Plotter(Aggregator, BaseProcessor):
                     "avg_time_pdf_slope_coldens": None,
                 },
             ),
+            "sbeta_onavg": PlotRule(
+                self,
+                partial(
+                    self._plot,
+                    "/comp/sbeta_onavg/beta",
+                    "/comp/sbeta_onavg/slope",
+                    yerr="/comp/sbeta_onavg/stderr",
+                ),
+                "Slope of the time averaged Sigma-PDF against cooling beta factor",
+                kind="comp",
+                dependencies=["sbeta_onavg"],
+            ),
             "sink_mass": PlotRule(
                 self,
                 partial(