Small renaming

gem · Oct 15, 2024 · fa3406f · fa3406f
1 parent bc0da75
commit fa3406f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/openquake/calculators/extract.py b/openquake/calculators/extract.py
@@ -510,7 +510,7 @@ def extract_median_spectra(dstore, what):
     qdict = parse(what)
     [site_id] = qdict['site_id']
     [poe_id] = qdict['poe_id']
-    dset = dstore['log_median_spectra']
+    dset = dstore['median_spectra']
     dic = json.loads(dset.attrs['json'])
     spectra = dset[:, site_id, :, :, poe_id]  # (Gt, 3, M)
     return ArrayWrapper(spectra, dict(

diff --git a/openquake/calculators/postproc/median_spectrum.py b/openquake/calculators/postproc/median_spectrum.py
@@ -167,7 +167,7 @@ def main(dstore, csm):
     # save the median_spectrum
     Gr = len(csm.src_groups)  # number of groups
     P = len(oq.poes)
-    log_median_spectra = np.zeros((Gr, N, 3, M, P), np.float32)
+    median_spectra = np.zeros((Gr, N, 3, M, P), np.float32)
     tot_w = np.zeros((N, M, P))
 
     # create median_spectrum_disagg datasets
@@ -191,9 +191,9 @@ def main(dstore, csm):
             for arr in out:
                 hdf5.extend(dstore[f'median_spectrum_disagg/grp{grp_id}'], arr)
         else:
-            log_median_spectra[grp_id, site_id] = out
+            median_spectra[grp_id, site_id] = out
             tot_w[site_id] += out[2]
-    dstore.create_dset("median_spectra", log_median_spectra)
+    dstore.create_dset("median_spectra", median_spectra)
     dstore.set_shape_descr("median_spectra", grp_id=Gr,
                            site_id=N, kind=['mea', 'sig', 'wei'],
                            period=periods, poe=oq.poes)

diff --git a/openquake/calculators/views.py b/openquake/calculators/views.py
@@ -1852,7 +1852,7 @@ def view_log_median_spectrum(token, dstore):
         sid = int(token.split(':')[1])
     else:
         sid = 0
-    dset = dstore['log_median_spectra']
+    dset = dstore['median_spectra']
     periods = [imt.period for imt in dstore['oqparam'].imt_periods()]
     res = numpy.zeros(len(periods), dt('period value'))
     res['period'] = periods

diff --git a/openquake/commands/plot.py b/openquake/commands/plot.py
@@ -249,7 +249,7 @@ def make_figure_uhs(extractors, what):
         uhs = ex.get(what)
         for kind in uhs.kind:
             got[ex.calc_id, kind] = uhs[kind][0]  # 1 site
-        if 'log_median_spectra' in ex.dstore:
+        if 'median_spectra' in ex.dstore:
             spec[ex.calc_id] = ex.get(
                 f'median_spectra?site_id={uhs.site_id[0]}')[:]  # (M, P)
     oq = ex.oqparam