mc3 3.3.0__tar.gz → 3.3.1__tar.gz

{mc3-3.3.0/mc3.egg-info → mc3-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc3
-Version: 3.3.0
+Version: 3.3.1
 Summary: Multi-core Markov-chain Monte Carlo package
 Author-email: Patricio Cubillos <patricio.cubillos@oeaw.ac.at>
 License-Expression: MIT
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=2.0.0
 Requires-Dist: scipy>=1.5.4
-Requires-Dist: matplotlib>=3.3.4
+Requires-Dist: matplotlib>=3.8.0
 Provides-Extra: test
 Requires-Dist: pytest>=6.0; extra == "test"
 Dynamic: license-file

{mc3-3.3.0 → mc3-3.3.1}/mc3/plots/posterior.py

@@ -114,9 +114,9 @@ def hist_2D(posterior, ranges, nbins):
 def _histogram(
         posterior, estimates, ranges, axes,
         nbins, pdf, xpdf, hpd_min, low_bounds, high_bounds,
-        linewidth, theme, orientation, alpha=0.6,
-        top_pad=1.05,
-        clear=True,
+        linewidth, theme, orientation,
+        normalization='density',
+        alpha=0.6, top_pad=1.05, clear=True,
     ):
     """
     Lowest-lever routine to plot marginal posterior distributions.
@@ -128,13 +128,10 @@ def _histogram(
     )
 
     hist_kw = {
-        'bins': nbins,
         'linewidth': linewidth,
         'orientation': orientation,
         'facecolor': to_rgba(theme.light_color, alpha=alpha),
         'edgecolor': theme.color,
-        'histtype': 'stepfilled',
-        'density': True,
     }
     if has_credible_interval:
         hist_kw['facecolor'] = 'none'
@@ -154,7 +151,13 @@ def _histogram(
             fill_between = ax.fill_betweenx
             axline = ax.axhline
 
-        vals, bins, h = ax.hist(posterior[:,i], range=ranges[i], **hist_kw)
+        vals, bins = np.histogram(
+            posterior[:,i], bins=nbins, density=True, range=ranges[i],
+        )
+        if normalization == 'top':
+            vals /= np.amax(vals)
+        ax.stairs(vals, bins, fill=True, **hist_kw)
+
         # Plot the credible intervals as shaded areas:
         if has_credible_interval:
             vals = np.r_[0, vals, 0]
@@ -535,6 +538,7 @@ class Marginal():
             bins=25, fontsize=11, linewidth=1.5,
             axes=None,
             show_texts=True, show_estimates=True,
+            normalization=None,
             alpha=0.6,
         ):
         self.source = source
@@ -546,6 +550,9 @@ class Marginal():
         self.pnames = pnames
         self.bestp = bestp
         self.ranges = ranges
+        if normalization is None:
+            normalization = 'density'
+        self.normalization = normalization
         self.theme = theme
         self.alpha = alpha
 
@@ -633,7 +640,7 @@ class Marginal():
             self.source.pdf, self.source.xpdf,
             hpd_min, self.source.low_bounds, self.source.high_bounds,
             self.linewidth, self.theme,
-            self.orientation,
+            self.orientation, self.normalization,
             alpha=self.alpha,
             top_pad=1.25,
         )
@@ -655,7 +662,7 @@ class Marginal():
 
         Parameters
         ----------
-        posts: 1D iterable of Posterior objects
+        posts: Posterior or 1D iterable of Posterior objects
             Currently there are no checks that these new posteriors
             have the same parameters (nor same statistics) as self.
             The user needs to make sure they are all compartible.
@@ -664,6 +671,8 @@ class Marginal():
             length of labels has to be one more than posts, because
             it also contains the label for self.
         """
+        if isinstance(posts, Posterior):
+            posts = [posts]
         all_posts = [self.source] + list(posts)
         for i,post in enumerate(posts):
             estimates = post.estimates
@@ -679,7 +688,7 @@ class Marginal():
                 post.pdf, post.xpdf,
                 hpd_min, post.low_bounds, post.high_bounds,
                 self.linewidth, post.theme,
-                post.orientation, alpha=alpha,
+                post.orientation, self.normalization, alpha=alpha,
                 clear=False,
             )
         if not self.show_texts:
@@ -713,6 +722,7 @@ class Figure(Marginal):
             bins=25, nlevels=6, fontsize=None, linewidth=None,
             show_texts=True, show_estimates=True,
             show_colorbar=True,
+            normalization=None,
             figure=None,
             fignum=None,
         ):
@@ -763,6 +773,9 @@ class Figure(Marginal):
         self.fontsize = fontsize
         self.linewidth = linewidth
         self.orientation = 'vertical'
+        if normalization is None:
+            normalization = 'density'
+        self.normalization = normalization
         self.show_texts = show_texts
         self.show_estimates = show_estimates
         self.show_colorbar = show_colorbar
@@ -869,7 +882,7 @@ class Figure(Marginal):
                 hpd_min,
                 self.source.low_bounds, self.source.high_bounds,
                 self.linewidth, self.theme,
-                self.orientation,
+                self.orientation, self.normalization,
             )
         _plot_pairwise(self)
 
@@ -889,7 +902,7 @@ class Figure(Marginal):
 
         Parameters
         ----------
-        posts: 1D iterable of Posterior objects
+        posts: Posterior or 1D iterable of Posterior objects
             Currently there are no checks that these new posteriors
             have the same parameters (nor same statistics) as self.
             The user needs to make sure they are all compartible.
@@ -898,6 +911,8 @@ class Figure(Marginal):
             length of labels has to be one more than posts, because
             it also contains the label for self.
         """
+        if isinstance(posts, Posterior):
+            posts = [posts]
         all_posts = [self.source] + list(posts)
         for post in posts:
             post.hist_xran, post.hist, post.lmax = hist_2D(
@@ -954,7 +969,9 @@ class Figure(Marginal):
                 post.posterior, estimates, self.ranges, self.hist_axes,
                 self.bins, post.pdf, post.xpdf,
                 hpd_min, post.low_bounds, post.high_bounds,
-                self.linewidth, post.theme, post.orientation, alpha=alpha,
+                self.linewidth, post.theme, post.orientation,
+                normalization=self.normalization,
+                alpha=alpha,
                 clear=False,
             )
         if not self.show_texts:
@@ -1109,6 +1126,7 @@ class Posterior():
             theme='blue', orientation='vertical',
             show_texts=True, show_estimates=True,
             show_colorbar=True,
+            normalization='density',
             seed=314159,
             mask=None,
         ):
@@ -1131,6 +1149,7 @@ class Posterior():
         self.ranges = ranges
         self.theme = theme
         self.orientation = orientation
+        self.normalization = normalization
         self.show_texts = show_texts
         self.show_estimates = show_estimates
         self.show_colorbar = show_colorbar
@@ -1197,6 +1216,7 @@ class Posterior():
             fontsize=fontsize,
             figsize=figsize,
             fignum=fignum,
+            normalization=self.normalization,
             show_texts=show_texts,
             show_estimates=show_estimates,
             show_colorbar=show_colorbar,
@@ -1235,6 +1255,7 @@ class Posterior():
             quantile=quantile,
             fontsize=fontsize,
             linewidth=linewidth,
+            normalization=self.normalization,
             show_texts=show_texts,
             show_estimates=show_estimates,
             alpha=alpha,

{mc3-3.3.0 → mc3-3.3.1}/mc3/version.py

@@ -4,6 +4,6 @@
 # mc3 Version:
 MC3_VER = 3  # Major version
 MC3_MIN = 3  # Minor version
-MC3_REV = 0  # Revision
+MC3_REV = 1  # Revision
 
 __version__ = f'{MC3_VER}.{MC3_MIN}.{MC3_REV}'

{mc3-3.3.0 → mc3-3.3.1/mc3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc3
-Version: 3.3.0
+Version: 3.3.1
 Summary: Multi-core Markov-chain Monte Carlo package
 Author-email: Patricio Cubillos <patricio.cubillos@oeaw.ac.at>
 License-Expression: MIT
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=2.0.0
 Requires-Dist: scipy>=1.5.4
-Requires-Dist: matplotlib>=3.3.4
+Requires-Dist: matplotlib>=3.8.0
 Provides-Extra: test
 Requires-Dist: pytest>=6.0; extra == "test"
 Dynamic: license-file

{mc3-3.3.0 → mc3-3.3.1}/mc3.egg-info/requires.txt

@@ -1,6 +1,6 @@
 numpy>=2.0.0
 scipy>=1.5.4
-matplotlib>=3.3.4
+matplotlib>=3.8.0
 
 [test]
 pytest>=6.0

{mc3-3.3.0 → mc3-3.3.1}/pyproject.toml

@@ -22,7 +22,7 @@ authors = [
 dependencies = [
     'numpy>=2.0.0',
     'scipy>=1.5.4',
-    'matplotlib>=3.3.4',
+    'matplotlib>=3.8.0',
 ]
 
 [project.optional-dependencies]

{mc3-3.3.0 → mc3-3.3.1}/requirements.txt

@@ -1,4 +1,4 @@
 numpy>=2.0.0
 scipy>=1.5.4
-matplotlib>=3.3.4
+matplotlib>=3.8.0
 pytest>=6.0