backend: update extract_bounds_from_summary to new summary format

beat/apps/beat.py

@@ -645,7 +645,11 @@ def setup(parser):
                     param = wmap.time_shifts_id
 
                     new_bounds[param] = extract_bounds_from_summary(
-                        summarydf, varname=param, shape=(wmap.hypersize,), roundto=0
+                        summarydf,
+                        varname=param,
+                        shape=(wmap.hypersize,),
+                        roundto=0,
+                        alpha=0.06,
                     )
                     new_bounds[param].append(point[param])
 
@@ -692,7 +696,11 @@ def setup(parser):
                     new_bounds = {}
                     for param in ["time"]:
                         new_bounds[param] = extract_bounds_from_summary(
-                            summarydf, varname=param, shape=(n_sources[0],), roundto=0
+                            summarydf,
+                            varname=param,
+                            shape=(n_sources[0],),
+                            roundto=0,
+                            alpha=0.06,
                         )
                         new_bounds[param].append(point[param])
 
@@ -710,7 +718,11 @@ def setup(parser):
                         shape = (n_sources,)
 
                     new_bounds[param] = extract_bounds_from_summary(
-                        summarydf, varname=param, shape=shape, roundto=1
+                        summarydf,
+                        varname=param,
+                        shape=shape,
+                        roundto=1,
+                        alpha=0.06,
                     )
                     new_bounds[param].append(point[param])
 
@@ -733,7 +745,11 @@ def setup(parser):
                 for param in common_source_params:
                     try:
                         new_bounds[param] = extract_bounds_from_summary(
-                            summarydf, varname=param, shape=(n_sources,), roundto=0
+                            summarydf,
+                            varname=param,
+                            shape=(n_sources,),
+                            roundto=0,
+                            alpha=0.06,
                         )
                         new_bounds[param].append(point[param])
                     except KeyError:

beat/backend.py

@@ -80,6 +80,15 @@ def _create_flat_names(varname, shape):
     return ["{}__{}".format(varname, "_".join(idxs)) for idxs in zip(*labels)]
 
 
+def _create_flat_names_summary(varname, shape):
+    if not shape or sum(shape) == 1:
+        return [varname]
+
+    labels = (num.ravel(xs).tolist() for xs in num.indices(shape))
+    labels = (map(str, [xs]) for xs in labels)
+    return ["{}{}".format(varname, "".join(idxs)) for idxs in zip(*labels)]
+
+
 def _create_shape(flat_names):
     """Determine shape from `_create_flat_names` output."""
     try:
@@ -1350,9 +1359,9 @@ def extract_bounds_from_summary(summary, varname, shape, roundto=None, alpha=0.0
     def do_nothing(value):
         return value
 
-    indexes = _create_flat_names(varname, shape)
-    lower_quant = "hpd_{0:g}".format(100 * alpha / 2)
-    upper_quant = "hpd_{0:g}".format(100 * (1 - alpha / 2))
+    indexes = _create_flat_names_summary(varname, shape)
+    lower_quant = "hdi_{0:g}%".format(100 * alpha / 2)
+    upper_quant = "hdi_{0:g}%".format(100 * (1 - alpha / 2))
 
     bounds = []
     for quant in [lower_quant, upper_quant]:

beat/plotting/ffi.py

@@ -891,7 +891,10 @@ def draw_3d_slip_distribution(problem, po):
                 os.path.join(problem.outfolder, "summary.txt"), sep=r"\s+"
             )
             bounds = extract_bounds_from_summary(
-                summarydf, varname="uparr", shape=(fault.npatches,)
+                summarydf,
+                varname="uparr",
+                shape=(fault.npatches,),
+                alpha=0.06,
             )
             reference["slip_variation"] = bounds[1] - bounds[0]
             slip_units = "m"