From ae617628ed690173b3ff11fd931381ba9898392c Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 06:14:06 +0100 Subject: [PATCH 01/10] Fixed gettemp --- openquake/baselib/general.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openquake/baselib/general.py b/openquake/baselib/general.py index 223e04bbef3..c400f5b4666 100644 --- a/openquake/baselib/general.py +++ b/openquake/baselib/general.py @@ -437,7 +437,7 @@ def gettemp(content=None, dir=None, prefix="tmp", suffix="tmp", remove=True): if dir is not None: if not os.path.exists(dir): os.makedirs(dir) - fh, path = tempfile.mkstemp(dir=dir or config.directory.custom_tmp, + fh, path = tempfile.mkstemp(dir=dir or config.directory.custom_tmp or None, prefix=prefix, suffix=suffix) if remove: _tmp_paths.append(path) From 4be81e1c7730ac0b76c58c2986c579252a5cb504 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 07:39:47 +0100 Subject: [PATCH 02/10] Fixing gsims with Total Stddev in Aristotle mode --- openquake/calculators/event_based.py | 12 +---- openquake/commands/plot.py | 8 ++-- openquake/hazardlib/calc/conditioned_gmfs.py | 23 ++++----- openquake/hazardlib/contexts.py | 49 +++++++++++++++----- openquake/hazardlib/imt.py | 8 ++++ 5 files changed, 62 insertions(+), 38 deletions(-) diff --git a/openquake/calculators/event_based.py b/openquake/calculators/event_based.py index b2653936a21..b238f84afc4 100644 --- a/openquake/calculators/event_based.py +++ b/openquake/calculators/event_based.py @@ -37,7 +37,7 @@ nofilter, getdefault, get_distances, SourceFilter) from openquake.hazardlib.calc.gmf import GmfComputer from openquake.hazardlib.calc.conditioned_gmfs import ConditionedGmfComputer -from openquake.hazardlib import valid, logictree, InvalidFile +from openquake.hazardlib import logictree, InvalidFile from openquake.hazardlib.calc.stochastic import get_rup_array, rupture_dt from openquake.hazardlib.source.rupture import ( RuptureProxy, EBRupture, get_ruptures) @@ -340,7 +340,6 @@ def starmap_from_rups(func, oq, full_lt, sitecol, dstore, save_tmp=None): # assume scenario with a single true rupture rlzs_by_gsim = full_lt.get_rlzs_by_gsim(0) cmaker = ContextMaker(trt, rlzs_by_gsim, oq) - cmaker.gid = numpy.arange(len(rlzs_by_gsim)) cmaker.scenario = True maxdist = oq.maximum_distance(cmaker.trt) srcfilter = SourceFilter(sitecol.complete, maxdist) @@ -372,7 +371,6 @@ def starmap_from_rups(func, oq, full_lt, sitecol, dstore, save_tmp=None): extra = sitecol.array.dtype.names rlzs_by_gsim = full_lt.get_rlzs_by_gsim(trt_smr) cmaker = ContextMaker(trt, rlzs_by_gsim, oq, extraparams=extra) - cmaker.gid = numpy.arange(len(rlzs_by_gsim)) cmaker.min_mag = getdefault(oq.minimum_magnitude, trt) for gsim in rlzs_by_gsim: toml_gsims.append(gsim._toml) @@ -458,13 +456,6 @@ def read_gsim_lt(oq): gsim_lt = logictree.GsimLogicTree.from_hdf5( expo_hdf5, oq.mosaic_model, oq.tectonic_region_type.encode('utf8')) - # add with_betw_ratio when only the total stddev is defined - betw = {'with_betw_ratio': 1.7} - for gsims in gsim_lt.values.values(): - for g, gsim in enumerate(gsims): - if len(gsim.DEFINED_FOR_STANDARD_DEVIATION_TYPES) == 1: - gsims[g] = valid.modified_gsim( - gsim, add_between_within_stds=betw) return gsim_lt @@ -649,7 +640,6 @@ def _read_scenario_ruptures(self): rup = readinput.get_rupture(oq) oq.mags_by_trt = {trt: ['%.2f' % rup.mag]} self.cmaker = ContextMaker(trt, rlzs_by_gsim, oq) - self.cmaker.gid = numpy.arange(len(rlzs_by_gsim)) if self.N > oq.max_sites_disagg: # many sites, split rupture ebrs = [] for i in range(ngmfs): diff --git a/openquake/commands/plot.py b/openquake/commands/plot.py index d02123f29f1..73d306ac7a2 100644 --- a/openquake/commands/plot.py +++ b/openquake/commands/plot.py @@ -1063,9 +1063,11 @@ def plot_wkt(wkt_string): poly = wkt.loads(wkt_string) if hasattr(poly, 'exterior'): coo = numpy.array(poly.exterior.coords) - else: # LINESTRING + else: # POINT or LINESTRING coo = numpy.array(poly.coords) - plt.plot(coo[:, 0], coo[:, 1], '-') + _fig, ax = plt.subplots() + ax.plot(coo[:, 0], coo[:, 1], 'o') + add_borders(ax, readinput.read_mosaic_df, buffer=0.) return plt @@ -1108,7 +1110,7 @@ def main(what, if what.endswith('.csv'): plot_csv(what) return - if what.startswith(('POLYGON', 'LINESTRING')): + if what.startswith(('POINT', 'POLYGON', 'LINESTRING')): plt = plot_wkt(what) plt.show() return diff --git a/openquake/hazardlib/calc/conditioned_gmfs.py b/openquake/hazardlib/calc/conditioned_gmfs.py index 3dbf6d0b547..ae8b15baa91 100644 --- a/openquake/hazardlib/calc/conditioned_gmfs.py +++ b/openquake/hazardlib/calc/conditioned_gmfs.py @@ -112,11 +112,10 @@ import numpy from openquake.hazardlib import correlation, cross_correlation -from openquake.hazardlib.imt import from_string +from openquake.hazardlib.imt import from_string, dictarray from openquake.hazardlib.calc.gmf import GmfComputer from openquake.hazardlib.const import StdDev from openquake.hazardlib.geo.geodetic import geodetic_distance -from openquake.hazardlib.contexts import ContextMaker U32 = numpy.uint32 F32 = numpy.float32 @@ -215,7 +214,7 @@ def get_mea_tau_phi(self): :returns: a list of arrays [mea, sig, tau, phi] """ return get_mean_covs( - self.rupture, self.cmaker.gsims, + self.rupture, self.cmaker, self.station_sitecol, self.station_data, self.observed_imt_strs, self.sitecol, self.imts, self.spatial_correl, @@ -388,7 +387,7 @@ def compute_spatial_cross_covariance_matrix( # tested in openquake/hazardlib/tests/calc/conditioned_gmfs_test.py def get_mean_covs( - rupture, gsims, station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, spatial_correl, cross_correl_between, cross_correl_within, maximum_distance, sigma=True): @@ -409,9 +408,8 @@ def get_mean_covs( # Generate the contexts and calculate the means and # standard deviations at the *station* sites ("_D") - cmaker_D = ContextMaker( - rupture.tectonic_region_type, gsims, - dict(imtls=observed_imtls, maximum_distance=maximum_distance)) + cmaker_D = cmaker.copy(imtls=dictarray(observed_imtls), + maximum_distance=maximum_distance) [ctx_D] = cmaker_D.get_ctx_iter([rupture], station_sitecol) mean_stds_D = cmaker_D.get_mean_stds([ctx_D]) @@ -419,10 +417,9 @@ def get_mean_covs( # Generate the contexts and calculate the means and # standard deviations at the *target* sites ("_Y") - cmaker_Y = ContextMaker( - rupture.tectonic_region_type, gsims, dict( - imtls={target_imts[0].string: [0]}, - maximum_distance=maximum_distance)) + cmaker_Y = cmaker.copy( + imtls=dictarray({target_imts[0].string: [0]}), + maximum_distance=maximum_distance) [ctx_Y] = cmaker_Y.get_ctx_iter([rupture], target_sitecol) mean_stds_Y = cmaker_D.get_mean_stds([ctx_Y]) @@ -436,13 +433,13 @@ def get_mean_covs( compute_cov = partial(compute_spatial_cross_covariance_matrix, spatial_correl, cross_correl_within) - G = len(gsims) + G = len(cmaker.gsims) M = len(target_imts) N = len(ctx_Y) me = numpy.zeros((G, M, N, 1)) ta = numpy.zeros((G, M, N, N)) ph = numpy.zeros((G, M, N, N)) - for g, gsim in enumerate(gsims): + for g, gsim in enumerate(cmaker.gsims): if gsim.DEFINED_FOR_STANDARD_DEVIATION_TYPES == {StdDev.TOTAL}: if not (type(gsim).__name__ == "ModifiableGMPE" and "add_between_within_stds" in gsim.kwargs): diff --git a/openquake/hazardlib/contexts.py b/openquake/hazardlib/contexts.py index e8d15fb4f42..ad1cc322a1d 100644 --- a/openquake/hazardlib/contexts.py +++ b/openquake/hazardlib/contexts.py @@ -196,10 +196,11 @@ class Oq(object): """ A mock for OqParam """ + af = None + aristotle = False mea_tau_phi = False split_sources = True use_rates = False - af = None def __init__(self, **hparams): vars(self).update(hparams) @@ -512,6 +513,22 @@ def _set_poes(mean_std, loglevels, phi_b, out): # ############################ ContextMaker ############################### # + +def _fix(gsimdict, aristotle): + if aristotle: + # add with_betw_ratio if only the total stddev is defined + betw = {'with_betw_ratio': 1.7} # as in GEESE + out = {} + for gsim, uints in gsimdict.items(): + if len(gsim.DEFINED_FOR_STANDARD_DEVIATION_TYPES) == 1: + out[valid.modified_gsim(gsim, add_between_within_stds=betw)] \ + = uints + else: + out[gsim] = uints + return out + return gsimdict + + class ContextMaker(object): """ A class to manage the creation of contexts and to compute mean/stddevs @@ -536,12 +553,6 @@ class ContextMaker(object): def __init__(self, trt, gsims, oq, monitor=Monitor(), extraparams=()): self.trt = trt - if isinstance(gsims, dict): - self.gsims = gsims - else: - self.gsims = {gsim: U32([i]) for i, gsim in enumerate(gsims)} - # NB: the gid array can be overridden later on - self.gid = numpy.arange(len(gsims), dtype=numpy.uint16) if isinstance(oq, dict): param = oq oq = Oq(**param) @@ -559,7 +570,13 @@ def __init__(self, trt, gsims, oq, monitor=Monitor(), extraparams=()): self.mags = () except KeyError: # missing TRT but there is only one [(_, self.mags)] = oq.mags_by_trt.items() - + if isinstance(gsims, dict): + self.gsims = _fix(gsims, oq.aristotle) + else: + self.gsims = _fix({gsim: U32([i]) for i, gsim in enumerate(gsims)}, + oq.aristotle) + # NB: the gid array can be overridden later on + self.gid = numpy.arange(len(gsims), dtype=numpy.uint16) self.oq = oq self.monitor = monitor self._init1(param) @@ -576,8 +593,7 @@ def _init1(self, param): raise TypeError('Expected string, got %s' % type(imt)) self.imtls = param['imtls'] elif 'hazard_imtls' in param: - self.imtls = DictArray( - imt_module.sort_by_imt(param['hazard_imtls'])) + self.imtls = imt_module.dictarray(param['hazard_imtls']) elif not hasattr(self, 'imtls'): raise KeyError('Missing imtls in ContextMaker!') self.cache_distances = param.get('cache_distances', False) @@ -671,6 +687,17 @@ def init_monitoring(self, monitor): self.out_no = getattr(monitor, 'out_no', self.task_no) self.cfactor = numpy.zeros(2) + def copy(self, **kw): + """ + :returns: a copy of the ContextMaker with modified attributes + """ + new = copy.copy(self) + for k, v in kw.items(): + setattr(new, k, v) + if 'imtls' in kw: + new.set_imts_conv() + return new + def restrict(self, imts): """ :param imts: a list of IMT strings subset of the full list @@ -684,7 +711,7 @@ def restrict(self, imts): def set_imts_conv(self): """ Set the .imts list and .conv dictionary for the horizontal component - conversion (if any). + conversion (if any). Also set the .loglevels. """ self.loglevels = DictArray(self.imtls) if self.imtls else {} with warnings.catch_warnings(): diff --git a/openquake/hazardlib/imt.py b/openquake/hazardlib/imt.py index cd0427f47f8..660552fbf41 100644 --- a/openquake/hazardlib/imt.py +++ b/openquake/hazardlib/imt.py @@ -23,6 +23,7 @@ import re import collections import numpy +from openquake.baselib.general import DictArray FREQUENCY_PATTERN = '^(EAS|FAS|DRVT|AvgSA)\\((\\d+\\.*\\d*)\\)' @@ -97,6 +98,13 @@ def sort_by_imt(imtls): return {imt: imtls[imt] for imt in imts} +def dictarray(imtls): + """ + :returns: a DictArray sorted by IMT + """ + return DictArray(sort_by_imt(imtls)) + + def repr(self): if self.period and self.damping != 5.0: if self.string.startswith('SDi'): From 0852dc96807791198256e371aa6b0d0a770a9915 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 07:41:38 +0100 Subject: [PATCH 03/10] Cleanup --- openquake/hazardlib/calc/conditioned_gmfs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openquake/hazardlib/calc/conditioned_gmfs.py b/openquake/hazardlib/calc/conditioned_gmfs.py index ae8b15baa91..f443fd97dc4 100644 --- a/openquake/hazardlib/calc/conditioned_gmfs.py +++ b/openquake/hazardlib/calc/conditioned_gmfs.py @@ -112,7 +112,7 @@ import numpy from openquake.hazardlib import correlation, cross_correlation -from openquake.hazardlib.imt import from_string, dictarray +from openquake.hazardlib.imt import from_string from openquake.hazardlib.calc.gmf import GmfComputer from openquake.hazardlib.const import StdDev from openquake.hazardlib.geo.geodetic import geodetic_distance @@ -408,7 +408,7 @@ def get_mean_covs( # Generate the contexts and calculate the means and # standard deviations at the *station* sites ("_D") - cmaker_D = cmaker.copy(imtls=dictarray(observed_imtls), + cmaker_D = cmaker.copy(imtls=observed_imtls, maximum_distance=maximum_distance) [ctx_D] = cmaker_D.get_ctx_iter([rupture], station_sitecol) @@ -418,7 +418,7 @@ def get_mean_covs( # Generate the contexts and calculate the means and # standard deviations at the *target* sites ("_Y") cmaker_Y = cmaker.copy( - imtls=dictarray({target_imts[0].string: [0]}), + imtls={target_imts[0].string: [0]}, maximum_distance=maximum_distance) [ctx_Y] = cmaker_Y.get_ctx_iter([rupture], target_sitecol) From 8358e70be427ef4f407ef625b6eb30ec33ce1d76 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 07:44:20 +0100 Subject: [PATCH 04/10] Cleanup --- openquake/calculators/event_based.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openquake/calculators/event_based.py b/openquake/calculators/event_based.py index b238f84afc4..72b4c363a80 100644 --- a/openquake/calculators/event_based.py +++ b/openquake/calculators/event_based.py @@ -428,7 +428,6 @@ def compute_avg_gmf(gmf_df, weights, min_iml): def read_gsim_lt(oq): # in aristotle mode the gsim_lt is read from the exposure.hdf5 file - gsim_lt = readinput.get_gsim_lt(oq) if oq.aristotle: if not oq.mosaic_model: if oq.rupture_dict: @@ -456,6 +455,8 @@ def read_gsim_lt(oq): gsim_lt = logictree.GsimLogicTree.from_hdf5( expo_hdf5, oq.mosaic_model, oq.tectonic_region_type.encode('utf8')) + else: + gsim_lt = readinput.get_gsim_lt(oq) return gsim_lt From ed77781baed420cde0e2a3f00ec74d90162fc029 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 08:03:27 +0100 Subject: [PATCH 05/10] Enhanced the conditioned tests to also use with_betw_ratio --- debian/changelog | 1 + openquake/commonlib/oqvalidation.py | 7 + openquake/commonlib/readinput.py | 5 +- openquake/hazardlib/contexts.py | 17 +- .../conditioned/expected/aggrisk.csv | 7 +- .../conditioned/expected/avg_gmf.csv | 151 +----------------- ..._tree_GEM_best_all_filtered_50_cataldi.xml | 10 +- .../scenario_risk/conditioned/job.ini | 1 + 8 files changed, 34 insertions(+), 165 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96fb3ee4682..a4b5ba4e30f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,5 @@ [Michele Simionato] + * Added parameter `with_betw_ratio` * Added command `oq info peril` * Extended consequences to perils * Replaced taxonomy mapping by loss type with taxonomy mapping by peril diff --git a/openquake/commonlib/oqvalidation.py b/openquake/commonlib/oqvalidation.py index 94f817ed91a..8c41798e4d4 100644 --- a/openquake/commonlib/oqvalidation.py +++ b/openquake/commonlib/oqvalidation.py @@ -868,6 +868,12 @@ Used to specify the width of the Magnitude Frequency Distribution. Example: *width_of_mfd_bin = 0.2*. Default: None + +with_betw_ratio: + Specify the between ratio for GSIMs with only the Total StdDev. + This is necessary in conditioned GMFs calculations. + Example: *with_betw_ratio = 1.7* + Default: None """ % __version__ PSDIST = float(config.performance.pointsource_distance) @@ -1156,6 +1162,7 @@ class OqParam(valid.ParamSet): use_rates = valid.Param(valid.boolean, False) vs30_tolerance = valid.Param(int, 0) width_of_mfd_bin = valid.Param(valid.positivefloat, None) + with_betw_ratio = valid.Param(valid.positivefloat, None) @property def no_pointsource_distance(self): diff --git a/openquake/commonlib/readinput.py b/openquake/commonlib/readinput.py index e5c7ddbaae5..11a44abad98 100644 --- a/openquake/commonlib/readinput.py +++ b/openquake/commonlib/readinput.py @@ -765,10 +765,9 @@ def get_gsim_lt(oqparam, trts=('*',)): # NB: gsim.DEFINED_FOR_TECTONIC_REGION_TYPE can be != trt, # but it is not an error, it is actually the most common case! if gmfcorr and (gsim.DEFINED_FOR_STANDARD_DEVIATION_TYPES == - {StdDev.TOTAL}): - modifications = list(gsim.kwargs.keys()) + {StdDev.TOTAL}) and not oqparam.with_betw_ratio: if not (type(gsim).__name__ == 'ModifiableGMPE' and - 'add_between_within_stds' in modifications): + 'add_between_within_stds' in gsim.kwargs): raise CorrelationButNoInterIntraStdDevs(gmfcorr, gsim) imt_dep_w = any(len(branch.weight.dic) > 1 for branch in gsim_lt.branches) if oqparam.number_of_logic_tree_samples and imt_dep_w: diff --git a/openquake/hazardlib/contexts.py b/openquake/hazardlib/contexts.py index ad1cc322a1d..4ed535842d9 100644 --- a/openquake/hazardlib/contexts.py +++ b/openquake/hazardlib/contexts.py @@ -514,10 +514,8 @@ def _set_poes(mean_std, loglevels, phi_b, out): # ############################ ContextMaker ############################### # -def _fix(gsimdict, aristotle): - if aristotle: - # add with_betw_ratio if only the total stddev is defined - betw = {'with_betw_ratio': 1.7} # as in GEESE +def _fix(gsimdict, betw): + if betw: out = {} for gsim, uints in gsimdict.items(): if len(gsim.DEFINED_FOR_STANDARD_DEVIATION_TYPES) == 1: @@ -570,11 +568,18 @@ def __init__(self, trt, gsims, oq, monitor=Monitor(), extraparams=()): self.mags = () except KeyError: # missing TRT but there is only one [(_, self.mags)] = oq.mags_by_trt.items() + + if oq.with_betw_ratio: + betw_ratio = {'with_betw_ratio': oq.with_betw_ratio} + elif oq.aristotle: + betw_ratio = {'with_betw_ratio': 1.7} + else: + betw_ratio = {} if isinstance(gsims, dict): - self.gsims = _fix(gsims, oq.aristotle) + self.gsims = _fix(gsims, betw_ratio) else: self.gsims = _fix({gsim: U32([i]) for i, gsim in enumerate(gsims)}, - oq.aristotle) + betw_ratio) # NB: the gid array can be overridden later on self.gid = numpy.arange(len(gsims), dtype=numpy.uint16) self.oq = oq diff --git a/openquake/qa_tests_data/scenario_risk/conditioned/expected/aggrisk.csv b/openquake/qa_tests_data/scenario_risk/conditioned/expected/aggrisk.csv index 085c82565b2..d6ea2f856fc 100644 --- a/openquake/qa_tests_data/scenario_risk/conditioned/expected/aggrisk.csv +++ b/openquake/qa_tests_data/scenario_risk/conditioned/expected/aggrisk.csv @@ -1,3 +1,4 @@ -#,,"generated_by='OpenQuake engine 3.21.0-git8677aaa2e3', start_date='2024-06-15T07:28:32', checksum=1984326034, investigation_time=None, risk_investigation_time=None" -loss_type,loss_value,loss_ratio -number,1.18013E+00,2.26338E-04 +#,,,"generated_by='OpenQuake engine 3.22.0-git8358e70be4', start_date='2024-11-08T08:01:17', checksum=106341491, investigation_time=None, risk_investigation_time=None" +loss_type,rlz_id,loss_value,loss_ratio +number,0,5.14894E+00,9.87518E-04 +number,1,4.28561E-05,8.21940E-09 diff --git a/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv b/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv index efb93b1f736..8f59839732e 100644 --- a/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv +++ b/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv @@ -1,149 +1,2 @@ -#,,,,,,,,,,"generated_by='OpenQuake engine 3.21.0-git8677aaa2e3', start_date='2024-06-15T07:28:32', checksum=1984326034" -custom_site_id,lon,lat,gmv_PGA,gsd_PGA,gmv_SA(0.3),gsd_SA(0.3),gmv_SA(0.6),gsd_SA(0.6),gmv_SA(1.0),gsd_SA(1.0) -t_2,1.93581E+01,4.03866E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_10,1.93958E+01,4.20708E+01,2.03524E-02,1.00000E+00,3.69734E-02,1.00000E+00,6.50154E-02,1.00000E+00,6.34672E-02,1.00000E+00 -t_13,1.94886E+01,4.02930E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_20,1.94958E+01,4.04339E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_42,1.94792E+01,4.04792E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_68,1.95056E+01,4.08887E+01,4.42283E-02,1.00000E+00,1.09145E-01,1.00000E+00,7.93550E-02,1.00000E+00,1.32548E-01,1.00000E+00 -t_90,1.95072E+01,4.13006E+01,2.63339E-01,1.00000E+00,3.24237E-01,1.00000E+00,2.17692E-01,1.00000E+00,6.58981E-01,1.00000E+00 -t_101,1.94708E+01,4.13208E+01,1.35556E-01,1.00000E+00,2.18651E-01,1.00000E+00,1.53611E-01,1.00000E+00,3.28383E-01,1.00000E+00 -t_125,1.94273E+01,4.13673E+01,2.83753E-01,1.00000E+00,4.83965E-01,1.00000E+00,1.78286E-01,1.00000E+00,3.23548E-01,1.00000E+00 -t_127,1.94398E+01,4.13964E+01,1.69066E-01,1.00000E+00,3.95165E-01,1.00000E+00,1.56378E-01,1.00000E+00,2.95439E-01,1.00000E+00 -t_270,1.96098E+01,4.10528E+01,1.42922E-01,1.00000E+00,2.79470E-01,1.00000E+00,4.28745E-02,1.00000E+00,8.13798E-02,1.00000E+00 -t_291,1.95375E+01,4.11792E+01,1.96098E-01,1.00000E+00,1.11392E-01,1.00000E+00,4.90444E-02,1.00000E+00,1.44096E-01,1.00000E+00 -t_298,1.95425E+01,4.12625E+01,1.88471E-01,1.00000E+00,1.44084E-01,1.00000E+00,2.48962E-01,1.00000E+00,2.52959E-01,1.00000E+00 -t_325,1.96431E+01,4.14938E+01,1.93589E-01,1.00000E+00,9.97829E-02,1.00000E+00,5.96287E-02,1.00000E+00,1.46069E-01,1.00000E+00 -t_343,1.96217E+01,4.17454E+01,1.57443E-01,1.00000E+00,1.22032E-01,1.00000E+00,6.17528E-02,1.00000E+00,2.05746E-01,1.00000E+00 -t_369,1.95446E+01,4.19755E+01,3.30813E-02,1.00000E+00,3.24394E-02,1.00000E+00,1.32133E-01,1.00000E+00,3.81714E-02,1.00000E+00 -t_395,1.97078E+01,4.02626E+01,2.08749E-02,1.00000E+00,2.80115E-02,1.00000E+00,5.56649E-02,1.00000E+00,1.47123E-02,1.00000E+00 -t_416,1.97879E+01,4.07426E+01,2.23533E-02,1.00000E+00,4.14320E-02,1.00000E+00,1.94213E-02,1.00000E+00,8.62379E-02,1.00000E+00 -t_428,1.97128E+01,4.08677E+01,9.51718E-02,1.00000E+00,5.31019E-02,1.00000E+00,5.21769E-02,1.00000E+00,7.18575E-02,1.00000E+00 -t_482,1.97875E+01,4.13042E+01,1.03233E-01,1.00000E+00,9.46012E-02,1.00000E+00,9.83730E-02,1.00000E+00,7.30475E-02,1.00000E+00 -t_494,1.97625E+01,4.13042E+01,8.12889E-02,1.00000E+00,8.95628E-02,1.00000E+00,1.25291E-01,1.00000E+00,7.09511E-02,1.00000E+00 -t_502,1.97542E+01,4.13375E+01,8.00459E-02,1.00000E+00,1.27968E-01,1.00000E+00,7.30672E-02,1.00000E+00,1.10740E-01,1.00000E+00 -t_505,1.97625E+01,4.13542E+01,1.34326E-01,1.00000E+00,2.25457E-01,1.00000E+00,8.28952E-02,1.00000E+00,1.28104E-01,1.00000E+00 -t_519,1.97913E+01,4.13496E+01,1.19456E-01,1.00000E+00,2.79527E-01,1.00000E+00,1.23496E-01,1.00000E+00,1.80026E-01,1.00000E+00 -t_529,1.97958E+01,4.13625E+01,9.58499E-02,1.00000E+00,2.23356E-01,1.00000E+00,1.04748E-01,1.00000E+00,1.69504E-01,1.00000E+00 -t_544,1.97625E+01,4.13875E+01,1.11175E-01,1.00000E+00,1.52765E-01,1.00000E+00,8.10245E-02,1.00000E+00,2.04961E-01,1.00000E+00 -t_590,1.97080E+01,4.15739E+01,1.27287E-01,1.00000E+00,5.76974E-02,1.00000E+00,7.53464E-02,1.00000E+00,1.06810E-01,1.00000E+00 -t_599,1.97211E+01,4.15966E+01,1.24822E-01,1.00000E+00,7.29172E-02,1.00000E+00,4.71645E-02,1.00000E+00,2.16014E-01,1.00000E+00 -t_638,1.98786E+01,4.07203E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_685,1.98271E+01,4.12254E+01,1.04062E-01,1.00000E+00,7.69658E-02,1.00000E+00,7.01836E-02,1.00000E+00,3.23613E-02,1.00000E+00 -t_717,1.98292E+01,4.13208E+01,9.60654E-02,1.00000E+00,7.74275E-02,1.00000E+00,7.20497E-02,1.00000E+00,7.45916E-02,1.00000E+00 -t_729,1.98926E+01,4.13486E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_818,2.00452E+01,4.06422E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_827,1.99458E+01,4.06958E+01,1.79977E-02,1.00000E+00,3.07652E-02,1.00000E+00,3.22610E-02,1.00000E+00,5.75978E-02,1.00000E+00 -t_852,1.99958E+01,4.09958E+01,9.62471E-02,1.00000E+00,7.08631E-02,1.00000E+00,6.47199E-02,1.00000E+00,3.23826E-02,1.00000E+00 -t_865,2.00412E+01,4.10850E+01,1.35079E-01,1.00000E+00,4.62383E-02,1.00000E+00,7.37921E-02,1.00000E+00,2.97582E-02,1.00000E+00 -t_883,1.99533E+01,4.14380E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_909,1.99862E+01,4.24740E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_957,2.01917E+01,4.08333E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_967,2.01958E+01,4.09875E+01,5.01369E-02,1.00000E+00,7.78006E-02,1.00000E+00,3.55013E-02,1.00000E+00,3.85392E-02,1.00000E+00 -t_996,2.01834E+01,4.12150E+01,7.12112E-02,1.00000E+00,4.58776E-02,1.00000E+00,3.78739E-02,1.00000E+00,4.37671E-02,1.00000E+00 -t_1014,2.00889E+01,4.23542E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1027,2.02949E+01,3.99014E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1034,2.02375E+01,4.05124E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1035,2.02277E+01,4.05048E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1050,2.03285E+01,4.11708E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1126,2.03808E+01,4.19091E+01,3.04328E-02,1.00000E+00,6.13532E-02,1.00000E+00,3.46799E-02,1.00000E+00,2.56621E-02,1.00000E+00 -t_1134,2.04227E+01,4.20535E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1140,2.04239E+01,4.20809E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1166,2.05500E+01,4.11083E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1169,2.04967E+01,4.13340E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1175,2.04943E+01,4.17361E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1185,2.06362E+01,4.03531E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1186,2.06852E+01,4.03445E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -t_1194,2.06927E+01,4.06097E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_0,1.94573E+01,4.13199E+01,1.90020E-01,1.00000E+00,2.19453E-01,1.00000E+00,2.41391E-01,1.00000E+00,4.15206E-01,1.00000E+00 -s_1,2.04017E+01,4.20731E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_2,1.98078E+01,4.13357E+01,1.11440E-01,1.00000E+00,1.23998E-01,1.00000E+00,1.45943E-01,1.00000E+00,1.91436E-01,1.00000E+00 -s_3,2.00799E+01,4.11161E+01,7.33013E-02,1.00000E+00,2.99531E-02,1.00000E+00,5.15806E-02,1.00000E+00,3.36214E-02,1.00000E+00 -s_4,1.95669E+01,4.07174E+01,5.94906E-02,1.00000E+00,5.49370E-02,1.00000E+00,4.16214E-02,1.00000E+00,7.79608E-02,1.00000E+00 -s_5,1.99455E+01,4.07082E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_6,1.99202E+01,3.96189E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_7,2.11418E+01,4.08350E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_8,1.78504E+01,4.05894E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_9,2.06081E+01,3.86306E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_10,2.08487E+01,3.96562E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_11,2.14243E+01,3.83727E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_12,1.68191E+01,4.06033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_13,1.59427E+01,4.07867E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_14,2.32262E+01,4.34111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_15,2.04878E+01,3.81783E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_16,2.17600E+01,3.82693E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_17,1.56328E+01,4.03900E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_18,1.57296E+01,4.04256E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_19,1.58019E+01,4.03249E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_20,1.55782E+01,4.07889E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_21,2.26750E+01,4.36227E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_22,1.57967E+01,4.05722E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_23,2.19209E+01,3.85933E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_24,1.57251E+01,4.07619E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_25,1.62114E+01,3.92534E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_26,2.09937E+01,3.91474E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_27,2.17912E+01,3.82959E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_28,2.35750E+01,3.99980E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_29,2.29506E+01,3.93660E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_30,2.21080E+01,3.80326E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_31,1.94527E+01,4.13206E+01,2.07540E-01,1.00000E+00,2.27249E-01,1.00000E+00,1.51167E-01,1.00000E+00,1.39331E-01,1.00000E+00 -s_32,1.96745E+01,4.15755E+01,1.50230E-01,1.00000E+00,1.58459E-01,1.00000E+00,1.01664E-01,1.00000E+00,1.11771E-01,1.00000E+00 -s_33,1.97870E+01,4.13336E+01,1.50230E-01,1.00000E+00,1.59702E-01,1.00000E+00,1.02706E-01,1.00000E+00,1.11530E-01,1.00000E+00 -s_34,1.98111E+01,4.13248E+01,1.27810E-01,1.00000E+00,1.37054E-01,1.00000E+00,1.13325E-01,1.00000E+00,9.80120E-02,1.00000E+00 -s_35,1.98232E+01,4.13160E+01,1.27810E-01,1.00000E+00,1.38285E-01,1.00000E+00,1.40231E-01,1.00000E+00,1.04815E-01,1.00000E+00 -s_36,1.97994E+01,4.13067E+01,1.17890E-01,1.00000E+00,1.28931E-01,1.00000E+00,9.30421E-02,1.00000E+00,9.86438E-02,1.00000E+00 -s_37,1.97991E+01,4.13247E+01,8.53399E-02,1.00000E+00,9.36980E-02,1.00000E+00,7.78210E-02,1.00000E+00,6.86388E-02,1.00000E+00 -s_38,1.98114E+01,4.13068E+01,7.87099E-02,1.00000E+00,8.73099E-02,1.00000E+00,7.19304E-02,1.00000E+00,6.72660E-02,1.00000E+00 -s_39,1.98351E+01,4.13161E+01,7.87099E-02,1.00000E+00,8.61794E-02,1.00000E+00,8.06474E-02,1.00000E+00,6.40975E-02,1.00000E+00 -s_40,1.98109E+01,4.13338E+01,7.26000E-02,1.00000E+00,7.90656E-02,1.00000E+00,6.22269E-02,1.00000E+00,5.47918E-02,1.00000E+00 -s_41,1.98112E+01,4.13158E+01,7.26000E-02,1.00000E+00,7.99125E-02,1.00000E+00,6.79100E-02,1.00000E+00,5.83390E-02,1.00000E+00 -s_42,1.98230E+01,4.13250E+01,6.69700E-02,1.00000E+00,7.29925E-02,1.00000E+00,7.21613E-02,1.00000E+00,5.08070E-02,1.00000E+00 -s_43,1.97752E+01,4.13245E+01,6.17700E-02,1.00000E+00,6.88645E-02,1.00000E+00,5.42405E-02,1.00000E+00,4.96890E-02,1.00000E+00 -s_44,1.98228E+01,4.13340E+01,4.84800E-02,1.00000E+00,5.32417E-02,1.00000E+00,5.52491E-02,1.00000E+00,3.61970E-02,1.00000E+00 -s_45,1.98346E+01,4.13431E+01,4.84800E-02,1.00000E+00,5.33690E-02,1.00000E+00,5.98284E-02,1.00000E+00,3.72616E-02,1.00000E+00 -s_46,1.94841E+01,4.04742E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_47,1.99642E+01,4.07048E+01,2.01744E-02,1.00000E+00,5.09723E-02,1.00000E+00,6.39583E-02,1.00000E+00,3.06018E-02,1.00000E+00 -s_48,1.98348E+01,4.13341E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_49,2.00769E+01,4.11111E+01,7.32844E-02,1.00000E+00,3.12530E-02,1.00000E+00,6.00331E-02,1.00000E+00,2.72133E-02,1.00000E+00 -s_50,1.90953E+01,4.20988E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_51,2.09581E+01,4.15111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_52,1.87087E+01,4.24249E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_53,2.11769E+01,4.26548E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_54,2.08964E+01,4.25829E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_55,2.04351E+01,4.23834E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_56,1.88348E+01,4.22923E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_57,2.09577E+01,4.19975E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_58,2.09097E+01,4.17903E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_59,1.87694E+01,4.24261E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_60,1.92430E+01,4.24434E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_61,2.14648E+01,4.19876E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_62,2.09097E+01,4.17993E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_63,2.09698E+01,4.20065E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_64,1.86962E+01,4.24337E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_65,2.10073E+01,5.22379E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_66,2.02984E+01,4.26618E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_67,2.07395E+01,4.22134E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_68,1.92089E+01,4.19295E+01,3.52609E-02,1.00000E+00,7.00629E-02,1.00000E+00,3.69344E-02,1.00000E+00,8.18487E-02,1.00000E+00 -s_69,2.14045E+01,4.20058E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_70,2.14166E+01,4.20058E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_71,1.95072E+01,4.20689E+01,5.08157E-02,1.00000E+00,3.77974E-02,1.00000E+00,5.18481E-02,1.00000E+00,6.77766E-02,1.00000E+00 -s_72,1.72469E+01,4.04623E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_73,1.92675E+01,4.24347E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_74,1.84180E+01,4.38594E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_75,2.08035E+01,4.11146E+01,1.87134E-02,1.00000E+00,2.47331E-02,1.00000E+00,2.03988E-02,1.00000E+00,5.32223E-02,1.00000E+00 -s_76,1.92575E+01,4.27948E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_77,2.10915E+01,4.26369E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_78,1.68644E+01,4.11267E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_79,2.11648E+01,4.26728E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_80,2.13804E+01,4.20059E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_81,2.02862E+01,4.26617E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_82,2.13924E+01,4.19968E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_83,2.14286E+01,4.19967E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_84,2.14406E+01,4.19786E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_85,2.14527E+01,4.19876E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_86,2.05143E+01,4.31402E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_87,1.83811E+01,4.38496E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_88,2.04879E+01,4.48058E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_89,2.25197E+01,4.46672E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_90,1.97962E+01,3.97127E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 -s_91,2.24892E+01,4.01033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +#,,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git8358e70be4', start_date='2024-11-08T08:01:17', checksum=106341491" +custom_site_id,lon,lat,gmv_PGA,gmv_SA(0.3),gmv_SA(0.6),gmv_SA(1.0)t_2,1.93581E+01,4.03866E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_10,1.93958E+01,4.20708E+01,2.50074E-02,3.81969E-02,5.55275E-02,5.46740E-02t_13,1.94886E+01,4.02930E+01,4.27012E-02,6.12595E-02,3.17919E-02,3.68517E-02t_20,1.94958E+01,4.04339E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_42,1.94792E+01,4.04792E+01,5.67386E-02,2.96126E-02,3.59731E-02,3.65408E-02t_68,1.95056E+01,4.08887E+01,3.96553E-02,1.41694E-01,6.57891E-02,1.11924E-01t_90,1.95072E+01,4.13006E+01,2.31520E-01,2.37980E-01,2.05719E-01,6.08602E-01t_101,1.94708E+01,4.13208E+01,1.50273E-01,2.22697E-01,2.20702E-01,4.19617E-01t_125,1.94273E+01,4.13673E+01,2.22903E-01,3.84604E-01,2.42078E-01,2.65894E-01t_127,1.94398E+01,4.13964E+01,1.72845E-01,4.31078E-01,1.76542E-01,3.45088E-01t_270,1.96098E+01,4.10528E+01,1.38127E-01,1.54405E-01,4.73973E-02,7.50073E-02t_291,1.95375E+01,4.11792E+01,1.66990E-01,1.27507E-01,8.22230E-02,9.61694E-02t_298,1.95425E+01,4.12625E+01,2.20102E-01,2.11477E-01,2.12529E-01,1.72195E-01t_325,1.96431E+01,4.14938E+01,1.31592E-01,8.96234E-02,9.88259E-02,1.53521E-01t_343,1.96217E+01,4.17454E+01,1.36808E-01,8.79434E-02,7.70339E-02,1.69417E-01t_369,1.95446E+01,4.19755E+01,6.08881E-02,2.70313E-02,8.53815E-02,3.74133E-02t_395,1.97078E+01,4.02626E+01,3.94721E-02,5.03754E-02,7.82125E-02,3.60573E-02t_416,1.97879E+01,4.07426E+01,3.33693E-02,4.02353E-02,1.98491E-02,2.71778E-02t_428,1.97128E+01,4.08677E+01,8.66234E-02,6.49630E-02,4.79457E-02,6.68235E-02t_482,1.97875E+01,4.13042E+01,1.09540E-01,9.78091E-02,9.02048E-02,1.08126E-01t_494,1.97625E+01,4.13042E+01,8.59232E-02,9.80309E-02,8.09534E-02,7.57950E-02t_502,1.97542E+01,4.13375E+01,8.44086E-02,1.20554E-01,8.41487E-02,1.03663E-01t_505,1.97625E+01,4.13542E+01,1.11485E-01,2.14305E-01,9.47526E-02,1.16064E-01t_519,1.97913E+01,4.13496E+01,1.17500E-01,2.17689E-01,1.11241E-01,1.55606E-01t_529,1.97958E+01,4.13625E+01,8.51713E-02,1.67968E-01,9.59884E-02,1.33744E-01t_544,1.97625E+01,4.13875E+01,1.08676E-01,1.61540E-01,1.12499E-01,2.04154E-01t_590,1.97080E+01,4.15739E+01,1.32288E-01,8.75712E-02,5.79461E-02,1.48121E-01t_599,1.97211E+01,4.15966E+01,1.27645E-01,9.70155E-02,3.67564E-02,1.79407E-01t_638,1.98786E+01,4.07203E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_685,1.98271E+01,4.12254E+01,1.07382E-01,9.04456E-02,9.25738E-02,4.96654E-02t_717,1.98292E+01,4.13208E+01,8.59986E-02,8.33228E-02,7.12556E-02,8.73860E-02t_729,1.98926E+01,4.13486E+01,5.19320E-02,4.60032E-02,4.48144E-02,4.04053E-02t_818,2.00452E+01,4.06422E+01,2.91614E-02,5.04419E-02,3.88977E-02,4.19177E-02t_827,1.99458E+01,4.06958E+01,2.55656E-02,3.76251E-02,3.99743E-02,5.74315E-02t_852,1.99958E+01,4.09958E+01,4.66674E-02,4.75537E-02,5.91215E-02,9.01020E-02t_865,2.00412E+01,4.10850E+01,5.40369E-02,3.15806E-02,6.27724E-02,6.12617E-02t_883,1.99533E+01,4.14380E+01,7.08643E-02,5.53487E-02,5.07429E-02,4.19093E-02t_909,1.99862E+01,4.24740E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_957,2.01917E+01,4.08333E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_967,2.01958E+01,4.09875E+01,4.23842E-02,5.88868E-02,3.81904E-02,4.07507E-02t_996,2.01834E+01,4.12150E+01,2.11053E-02,3.10908E-02,3.94915E-02,5.28838E-02t_1014,2.00889E+01,4.23542E+01,3.84572E-02,5.14122E-02,6.93007E-02,2.51768E-02t_1027,2.02949E+01,3.99014E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1034,2.02375E+01,4.05124E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1035,2.02277E+01,4.05048E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1050,2.03285E+01,4.11708E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1126,2.03808E+01,4.19091E+01,4.09872E-02,6.64694E-02,4.90822E-02,4.16236E-02t_1134,2.04227E+01,4.20535E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1140,2.04239E+01,4.20809E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1166,2.05500E+01,4.11083E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1169,2.04967E+01,4.13340E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1175,2.04943E+01,4.17361E+01,3.23758E-02,5.23805E-02,2.92814E-02,3.04616E-02t_1185,2.06362E+01,4.03531E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1186,2.06852E+01,4.03445E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1194,2.06927E+01,4.06097E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_0,1.94573E+01,4.13199E+01,1.90020E-01,2.58294E-01,3.09689E-01,5.93340E-01s_1,2.04017E+01,4.20731E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_2,1.98078E+01,4.13357E+01,1.11440E-01,1.39451E-01,1.72456E-01,2.36481E-01s_3,2.00799E+01,4.11161E+01,4.33420E-02,2.79297E-02,6.64464E-02,5.43952E-02s_4,1.95669E+01,4.07174E+01,4.59350E-02,5.01024E-02,4.32571E-02,4.04250E-02s_5,1.99455E+01,4.07082E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_6,1.99202E+01,3.96189E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_7,2.11418E+01,4.08350E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_8,1.78504E+01,4.05894E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_9,2.06081E+01,3.86306E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_10,2.08487E+01,3.96562E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_11,2.14243E+01,3.83727E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_12,1.68191E+01,4.06033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_13,1.59427E+01,4.07867E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_14,2.32262E+01,4.34111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_15,2.04878E+01,3.81783E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_16,2.17600E+01,3.82693E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_17,1.56328E+01,4.03900E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_18,1.57296E+01,4.04256E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_19,1.58019E+01,4.03249E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_20,1.55782E+01,4.07889E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_21,2.26750E+01,4.36227E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_22,1.57967E+01,4.05722E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_23,2.19209E+01,3.85933E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_24,1.57251E+01,4.07619E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_25,1.62114E+01,3.92534E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_26,2.09937E+01,3.91474E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_27,2.17912E+01,3.82959E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_28,2.35750E+01,3.99980E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_29,2.29506E+01,3.93660E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_30,2.21080E+01,3.80326E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_31,1.94527E+01,4.13206E+01,2.07540E-01,2.69027E-01,1.96056E-01,1.84869E-01s_32,1.96745E+01,4.15755E+01,1.50230E-01,1.79227E-01,1.16510E-01,1.31896E-01s_33,1.97870E+01,4.13336E+01,1.50230E-01,1.82276E-01,1.28051E-01,1.32999E-01s_34,1.98111E+01,4.13248E+01,1.27810E-01,1.54784E-01,1.28548E-01,1.15443E-01s_35,1.98232E+01,4.13160E+01,1.27810E-01,1.56539E-01,1.42539E-01,1.24216E-01s_36,1.97994E+01,4.13067E+01,1.17890E-01,1.46222E-01,9.42147E-02,1.17075E-01s_37,1.97991E+01,4.13247E+01,8.53399E-02,1.04654E-01,8.52164E-02,7.93064E-02s_38,1.98114E+01,4.13068E+01,7.87100E-02,9.73590E-02,7.08350E-02,7.76682E-02s_39,1.98351E+01,4.13161E+01,7.87099E-02,9.54481E-02,7.60299E-02,7.32519E-02s_40,1.98109E+01,4.13338E+01,7.26001E-02,8.71907E-02,7.48464E-02,6.19531E-02s_41,1.98112E+01,4.13158E+01,7.25999E-02,8.84779E-02,7.50071E-02,6.64819E-02s_42,1.98230E+01,4.13250E+01,6.69700E-02,8.00919E-02,7.67892E-02,5.70388E-02s_43,1.97752E+01,4.13245E+01,6.17699E-02,7.62522E-02,5.81219E-02,5.64619E-02s_44,1.98228E+01,4.13340E+01,4.84800E-02,5.76042E-02,6.02525E-02,3.96654E-02s_45,1.98346E+01,4.13431E+01,4.84800E-02,5.77391E-02,6.00575E-02,4.08916E-02s_46,1.94841E+01,4.04742E+01,5.31239E-02,2.69076E-02,3.39137E-02,3.37546E-02s_47,1.99642E+01,4.07048E+01,2.69480E-02,4.99538E-02,5.90907E-02,3.88664E-02s_48,1.98348E+01,4.13341E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_49,2.00769E+01,4.11111E+01,4.26520E-02,2.61298E-02,6.96037E-02,4.69576E-02s_50,1.90953E+01,4.20988E+01,3.51299E-02,3.48047E-02,2.69659E-02,5.43912E-02s_51,2.09581E+01,4.15111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_52,1.87087E+01,4.24249E+01,3.76298E-02,5.69259E-02,2.81920E-02,1.98675E-02s_53,2.11769E+01,4.26548E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_54,2.08964E+01,4.25829E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_55,2.04351E+01,4.23834E+01,4.42933E-02,2.42916E-02,5.26384E-02,3.31412E-02s_56,1.88348E+01,4.22923E+01,5.05016E-02,1.22398E-02,2.59286E-02,2.73287E-02s_57,2.09577E+01,4.19975E+01,4.07595E-02,2.93813E-02,5.00516E-02,2.78585E-02s_58,2.09097E+01,4.17903E+01,3.64986E-02,2.84711E-02,5.11006E-02,4.17803E-02s_59,1.87694E+01,4.24261E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_60,1.92430E+01,4.24434E+01,2.61671E-02,1.90886E-02,2.59999E-02,5.03689E-02s_61,2.14648E+01,4.19876E+01,2.15537E-02,5.16921E-02,2.41128E-02,4.05939E-02s_62,2.09097E+01,4.17993E+01,3.26777E-02,2.61453E-02,5.19840E-02,5.13868E-02s_63,2.09698E+01,4.20065E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_64,1.86962E+01,4.24337E+01,3.25080E-02,5.04956E-02,2.72237E-02,1.70417E-02s_65,2.10073E+01,5.22379E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_66,2.02984E+01,4.26618E+01,3.61239E-02,3.20986E-02,5.57650E-02,4.58106E-02s_67,2.07395E+01,4.22134E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_68,1.92089E+01,4.19295E+01,4.20690E-02,5.39219E-02,3.98399E-02,6.88989E-02s_69,2.14045E+01,4.20058E+01,3.09672E-02,5.85502E-02,2.10830E-02,3.93351E-02s_70,2.14166E+01,4.20058E+01,2.85697E-02,5.69383E-02,2.23118E-02,3.94280E-02s_71,1.95072E+01,4.20689E+01,4.30913E-02,2.60575E-02,4.03020E-02,6.70980E-02s_72,1.72469E+01,4.04623E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_73,1.92675E+01,4.24347E+01,2.06292E-02,1.61035E-02,2.25827E-02,7.68085E-02s_74,1.84180E+01,4.38594E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_75,2.08035E+01,4.11146E+01,3.37877E-02,4.19045E-02,3.93957E-02,7.05448E-02s_76,1.92575E+01,4.27948E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_77,2.10915E+01,4.26369E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_78,1.68644E+01,4.11267E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_79,2.11648E+01,4.26728E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_80,2.13804E+01,4.20059E+01,2.30581E-02,5.42624E-02,2.34012E-02,3.16374E-02s_81,2.02862E+01,4.26617E+01,3.67250E-02,4.25075E-02,5.29530E-02,4.54509E-02s_82,2.13924E+01,4.19968E+01,2.43944E-02,6.20015E-02,2.14753E-02,3.19094E-02s_83,2.14286E+01,4.19967E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_84,2.14406E+01,4.19786E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_85,2.14527E+01,4.19876E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_86,2.05143E+01,4.31402E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_87,1.83811E+01,4.38496E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_88,2.04879E+01,4.48058E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_89,2.25197E+01,4.46672E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_90,1.97962E+01,3.97127E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_91,2.24892E+01,4.01033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 \ No newline at end of file diff --git a/openquake/qa_tests_data/scenario_risk/conditioned/gmpe_logic_tree_GEM_best_all_filtered_50_cataldi.xml b/openquake/qa_tests_data/scenario_risk/conditioned/gmpe_logic_tree_GEM_best_all_filtered_50_cataldi.xml index f157ab2a427..388bbea7741 100644 --- a/openquake/qa_tests_data/scenario_risk/conditioned/gmpe_logic_tree_GEM_best_all_filtered_50_cataldi.xml +++ b/openquake/qa_tests_data/scenario_risk/conditioned/gmpe_logic_tree_GEM_best_all_filtered_50_cataldi.xml @@ -3,17 +3,19 @@ xmlns="http://openquake.org/xmlns/nrml/0.5" xmlns:gml="http://www.opengis.net/gml" > - + + + AtkinsonBoore2006Modified2011 + .5 + BooreAtkinson2011 - 1 + .5 diff --git a/openquake/qa_tests_data/scenario_risk/conditioned/job.ini b/openquake/qa_tests_data/scenario_risk/conditioned/job.ini index b07e158497a..98729bc22b3 100644 --- a/openquake/qa_tests_data/scenario_risk/conditioned/job.ini +++ b/openquake/qa_tests_data/scenario_risk/conditioned/job.ini @@ -22,6 +22,7 @@ ground_motion_correlation_model = JB2009 ground_motion_correlation_params = {"vs30_clustering": True} extreme_gmv = { "PGA": 2.5, "SA(0.3)": 3.5, "SA(0.6)": 3.0, "SA(1.0)": 1.5} +with_betw_ratio = 1.7 [exposure] exposure_file = Exposure/Exposure_Albania.xml From ccfcad6fbde7a54a6bc3b2fe1b0ed0f452372e13 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 08:11:06 +0100 Subject: [PATCH 06/10] Fixed test --- openquake/hazardlib/contexts.py | 2 + .../conditioned/expected/avg_gmf.csv | 151 +++++++++++++++++- 2 files changed, 151 insertions(+), 2 deletions(-) diff --git a/openquake/hazardlib/contexts.py b/openquake/hazardlib/contexts.py index 4ed535842d9..235f7658128 100644 --- a/openquake/hazardlib/contexts.py +++ b/openquake/hazardlib/contexts.py @@ -201,6 +201,7 @@ class Oq(object): mea_tau_phi = False split_sources = True use_rates = False + with_betw_ratio = None def __init__(self, **hparams): vars(self).update(hparams) @@ -552,6 +553,7 @@ class ContextMaker(object): def __init__(self, trt, gsims, oq, monitor=Monitor(), extraparams=()): self.trt = trt if isinstance(oq, dict): + # this happens when instantiating RuptureData in extract.py param = oq oq = Oq(**param) self.mags = param.get('mags', ()) # list of strings %.2f diff --git a/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv b/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv index 8f59839732e..7d7c2f2a5ce 100644 --- a/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv +++ b/openquake/qa_tests_data/scenario_risk/conditioned/expected/avg_gmf.csv @@ -1,2 +1,149 @@ -#,,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git8358e70be4', start_date='2024-11-08T08:01:17', checksum=106341491" -custom_site_id,lon,lat,gmv_PGA,gmv_SA(0.3),gmv_SA(0.6),gmv_SA(1.0)t_2,1.93581E+01,4.03866E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_10,1.93958E+01,4.20708E+01,2.50074E-02,3.81969E-02,5.55275E-02,5.46740E-02t_13,1.94886E+01,4.02930E+01,4.27012E-02,6.12595E-02,3.17919E-02,3.68517E-02t_20,1.94958E+01,4.04339E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_42,1.94792E+01,4.04792E+01,5.67386E-02,2.96126E-02,3.59731E-02,3.65408E-02t_68,1.95056E+01,4.08887E+01,3.96553E-02,1.41694E-01,6.57891E-02,1.11924E-01t_90,1.95072E+01,4.13006E+01,2.31520E-01,2.37980E-01,2.05719E-01,6.08602E-01t_101,1.94708E+01,4.13208E+01,1.50273E-01,2.22697E-01,2.20702E-01,4.19617E-01t_125,1.94273E+01,4.13673E+01,2.22903E-01,3.84604E-01,2.42078E-01,2.65894E-01t_127,1.94398E+01,4.13964E+01,1.72845E-01,4.31078E-01,1.76542E-01,3.45088E-01t_270,1.96098E+01,4.10528E+01,1.38127E-01,1.54405E-01,4.73973E-02,7.50073E-02t_291,1.95375E+01,4.11792E+01,1.66990E-01,1.27507E-01,8.22230E-02,9.61694E-02t_298,1.95425E+01,4.12625E+01,2.20102E-01,2.11477E-01,2.12529E-01,1.72195E-01t_325,1.96431E+01,4.14938E+01,1.31592E-01,8.96234E-02,9.88259E-02,1.53521E-01t_343,1.96217E+01,4.17454E+01,1.36808E-01,8.79434E-02,7.70339E-02,1.69417E-01t_369,1.95446E+01,4.19755E+01,6.08881E-02,2.70313E-02,8.53815E-02,3.74133E-02t_395,1.97078E+01,4.02626E+01,3.94721E-02,5.03754E-02,7.82125E-02,3.60573E-02t_416,1.97879E+01,4.07426E+01,3.33693E-02,4.02353E-02,1.98491E-02,2.71778E-02t_428,1.97128E+01,4.08677E+01,8.66234E-02,6.49630E-02,4.79457E-02,6.68235E-02t_482,1.97875E+01,4.13042E+01,1.09540E-01,9.78091E-02,9.02048E-02,1.08126E-01t_494,1.97625E+01,4.13042E+01,8.59232E-02,9.80309E-02,8.09534E-02,7.57950E-02t_502,1.97542E+01,4.13375E+01,8.44086E-02,1.20554E-01,8.41487E-02,1.03663E-01t_505,1.97625E+01,4.13542E+01,1.11485E-01,2.14305E-01,9.47526E-02,1.16064E-01t_519,1.97913E+01,4.13496E+01,1.17500E-01,2.17689E-01,1.11241E-01,1.55606E-01t_529,1.97958E+01,4.13625E+01,8.51713E-02,1.67968E-01,9.59884E-02,1.33744E-01t_544,1.97625E+01,4.13875E+01,1.08676E-01,1.61540E-01,1.12499E-01,2.04154E-01t_590,1.97080E+01,4.15739E+01,1.32288E-01,8.75712E-02,5.79461E-02,1.48121E-01t_599,1.97211E+01,4.15966E+01,1.27645E-01,9.70155E-02,3.67564E-02,1.79407E-01t_638,1.98786E+01,4.07203E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_685,1.98271E+01,4.12254E+01,1.07382E-01,9.04456E-02,9.25738E-02,4.96654E-02t_717,1.98292E+01,4.13208E+01,8.59986E-02,8.33228E-02,7.12556E-02,8.73860E-02t_729,1.98926E+01,4.13486E+01,5.19320E-02,4.60032E-02,4.48144E-02,4.04053E-02t_818,2.00452E+01,4.06422E+01,2.91614E-02,5.04419E-02,3.88977E-02,4.19177E-02t_827,1.99458E+01,4.06958E+01,2.55656E-02,3.76251E-02,3.99743E-02,5.74315E-02t_852,1.99958E+01,4.09958E+01,4.66674E-02,4.75537E-02,5.91215E-02,9.01020E-02t_865,2.00412E+01,4.10850E+01,5.40369E-02,3.15806E-02,6.27724E-02,6.12617E-02t_883,1.99533E+01,4.14380E+01,7.08643E-02,5.53487E-02,5.07429E-02,4.19093E-02t_909,1.99862E+01,4.24740E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_957,2.01917E+01,4.08333E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_967,2.01958E+01,4.09875E+01,4.23842E-02,5.88868E-02,3.81904E-02,4.07507E-02t_996,2.01834E+01,4.12150E+01,2.11053E-02,3.10908E-02,3.94915E-02,5.28838E-02t_1014,2.00889E+01,4.23542E+01,3.84572E-02,5.14122E-02,6.93007E-02,2.51768E-02t_1027,2.02949E+01,3.99014E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1034,2.02375E+01,4.05124E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1035,2.02277E+01,4.05048E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1050,2.03285E+01,4.11708E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1126,2.03808E+01,4.19091E+01,4.09872E-02,6.64694E-02,4.90822E-02,4.16236E-02t_1134,2.04227E+01,4.20535E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1140,2.04239E+01,4.20809E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1166,2.05500E+01,4.11083E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1169,2.04967E+01,4.13340E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1175,2.04943E+01,4.17361E+01,3.23758E-02,5.23805E-02,2.92814E-02,3.04616E-02t_1185,2.06362E+01,4.03531E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1186,2.06852E+01,4.03445E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00t_1194,2.06927E+01,4.06097E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_0,1.94573E+01,4.13199E+01,1.90020E-01,2.58294E-01,3.09689E-01,5.93340E-01s_1,2.04017E+01,4.20731E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_2,1.98078E+01,4.13357E+01,1.11440E-01,1.39451E-01,1.72456E-01,2.36481E-01s_3,2.00799E+01,4.11161E+01,4.33420E-02,2.79297E-02,6.64464E-02,5.43952E-02s_4,1.95669E+01,4.07174E+01,4.59350E-02,5.01024E-02,4.32571E-02,4.04250E-02s_5,1.99455E+01,4.07082E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_6,1.99202E+01,3.96189E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_7,2.11418E+01,4.08350E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_8,1.78504E+01,4.05894E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_9,2.06081E+01,3.86306E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_10,2.08487E+01,3.96562E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_11,2.14243E+01,3.83727E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_12,1.68191E+01,4.06033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_13,1.59427E+01,4.07867E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_14,2.32262E+01,4.34111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_15,2.04878E+01,3.81783E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_16,2.17600E+01,3.82693E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_17,1.56328E+01,4.03900E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_18,1.57296E+01,4.04256E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_19,1.58019E+01,4.03249E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_20,1.55782E+01,4.07889E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_21,2.26750E+01,4.36227E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_22,1.57967E+01,4.05722E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_23,2.19209E+01,3.85933E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_24,1.57251E+01,4.07619E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_25,1.62114E+01,3.92534E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_26,2.09937E+01,3.91474E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_27,2.17912E+01,3.82959E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_28,2.35750E+01,3.99980E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_29,2.29506E+01,3.93660E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_30,2.21080E+01,3.80326E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_31,1.94527E+01,4.13206E+01,2.07540E-01,2.69027E-01,1.96056E-01,1.84869E-01s_32,1.96745E+01,4.15755E+01,1.50230E-01,1.79227E-01,1.16510E-01,1.31896E-01s_33,1.97870E+01,4.13336E+01,1.50230E-01,1.82276E-01,1.28051E-01,1.32999E-01s_34,1.98111E+01,4.13248E+01,1.27810E-01,1.54784E-01,1.28548E-01,1.15443E-01s_35,1.98232E+01,4.13160E+01,1.27810E-01,1.56539E-01,1.42539E-01,1.24216E-01s_36,1.97994E+01,4.13067E+01,1.17890E-01,1.46222E-01,9.42147E-02,1.17075E-01s_37,1.97991E+01,4.13247E+01,8.53399E-02,1.04654E-01,8.52164E-02,7.93064E-02s_38,1.98114E+01,4.13068E+01,7.87100E-02,9.73590E-02,7.08350E-02,7.76682E-02s_39,1.98351E+01,4.13161E+01,7.87099E-02,9.54481E-02,7.60299E-02,7.32519E-02s_40,1.98109E+01,4.13338E+01,7.26001E-02,8.71907E-02,7.48464E-02,6.19531E-02s_41,1.98112E+01,4.13158E+01,7.25999E-02,8.84779E-02,7.50071E-02,6.64819E-02s_42,1.98230E+01,4.13250E+01,6.69700E-02,8.00919E-02,7.67892E-02,5.70388E-02s_43,1.97752E+01,4.13245E+01,6.17699E-02,7.62522E-02,5.81219E-02,5.64619E-02s_44,1.98228E+01,4.13340E+01,4.84800E-02,5.76042E-02,6.02525E-02,3.96654E-02s_45,1.98346E+01,4.13431E+01,4.84800E-02,5.77391E-02,6.00575E-02,4.08916E-02s_46,1.94841E+01,4.04742E+01,5.31239E-02,2.69076E-02,3.39137E-02,3.37546E-02s_47,1.99642E+01,4.07048E+01,2.69480E-02,4.99538E-02,5.90907E-02,3.88664E-02s_48,1.98348E+01,4.13341E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_49,2.00769E+01,4.11111E+01,4.26520E-02,2.61298E-02,6.96037E-02,4.69576E-02s_50,1.90953E+01,4.20988E+01,3.51299E-02,3.48047E-02,2.69659E-02,5.43912E-02s_51,2.09581E+01,4.15111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_52,1.87087E+01,4.24249E+01,3.76298E-02,5.69259E-02,2.81920E-02,1.98675E-02s_53,2.11769E+01,4.26548E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_54,2.08964E+01,4.25829E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_55,2.04351E+01,4.23834E+01,4.42933E-02,2.42916E-02,5.26384E-02,3.31412E-02s_56,1.88348E+01,4.22923E+01,5.05016E-02,1.22398E-02,2.59286E-02,2.73287E-02s_57,2.09577E+01,4.19975E+01,4.07595E-02,2.93813E-02,5.00516E-02,2.78585E-02s_58,2.09097E+01,4.17903E+01,3.64986E-02,2.84711E-02,5.11006E-02,4.17803E-02s_59,1.87694E+01,4.24261E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_60,1.92430E+01,4.24434E+01,2.61671E-02,1.90886E-02,2.59999E-02,5.03689E-02s_61,2.14648E+01,4.19876E+01,2.15537E-02,5.16921E-02,2.41128E-02,4.05939E-02s_62,2.09097E+01,4.17993E+01,3.26777E-02,2.61453E-02,5.19840E-02,5.13868E-02s_63,2.09698E+01,4.20065E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_64,1.86962E+01,4.24337E+01,3.25080E-02,5.04956E-02,2.72237E-02,1.70417E-02s_65,2.10073E+01,5.22379E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_66,2.02984E+01,4.26618E+01,3.61239E-02,3.20986E-02,5.57650E-02,4.58106E-02s_67,2.07395E+01,4.22134E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_68,1.92089E+01,4.19295E+01,4.20690E-02,5.39219E-02,3.98399E-02,6.88989E-02s_69,2.14045E+01,4.20058E+01,3.09672E-02,5.85502E-02,2.10830E-02,3.93351E-02s_70,2.14166E+01,4.20058E+01,2.85697E-02,5.69383E-02,2.23118E-02,3.94280E-02s_71,1.95072E+01,4.20689E+01,4.30913E-02,2.60575E-02,4.03020E-02,6.70980E-02s_72,1.72469E+01,4.04623E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_73,1.92675E+01,4.24347E+01,2.06292E-02,1.61035E-02,2.25827E-02,7.68085E-02s_74,1.84180E+01,4.38594E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_75,2.08035E+01,4.11146E+01,3.37877E-02,4.19045E-02,3.93957E-02,7.05448E-02s_76,1.92575E+01,4.27948E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_77,2.10915E+01,4.26369E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_78,1.68644E+01,4.11267E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_79,2.11648E+01,4.26728E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_80,2.13804E+01,4.20059E+01,2.30581E-02,5.42624E-02,2.34012E-02,3.16374E-02s_81,2.02862E+01,4.26617E+01,3.67250E-02,4.25075E-02,5.29530E-02,4.54509E-02s_82,2.13924E+01,4.19968E+01,2.43944E-02,6.20015E-02,2.14753E-02,3.19094E-02s_83,2.14286E+01,4.19967E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_84,2.14406E+01,4.19786E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_85,2.14527E+01,4.19876E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_86,2.05143E+01,4.31402E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_87,1.83811E+01,4.38496E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_88,2.04879E+01,4.48058E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_89,2.25197E+01,4.46672E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_90,1.97962E+01,3.97127E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00s_91,2.24892E+01,4.01033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 \ No newline at end of file +#,,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-gited77781bae', start_date='2024-11-08T08:10:41', checksum=106341491" +custom_site_id,lon,lat,gmv_PGA,gsd_PGA,gmv_SA(0.3),gsd_SA(0.3),gmv_SA(0.6),gsd_SA(0.6),gmv_SA(1.0),gsd_SA(1.0) +t_2,1.93581E+01,4.03866E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_10,1.93958E+01,4.20708E+01,2.50074E-02,1.99941E+00,3.81969E-02,1.30901E+00,5.55275E-02,1.11055E+00,5.46740E-02,1.09348E+00 +t_13,1.94886E+01,4.02930E+01,4.27012E-02,1.17093E+00,6.12595E-02,1.22519E+00,3.17919E-02,1.57273E+00,3.68517E-02,1.35679E+00 +t_20,1.94958E+01,4.04339E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_42,1.94792E+01,4.04792E+01,5.67386E-02,1.13477E+00,2.96126E-02,1.68847E+00,3.59731E-02,1.38993E+00,3.65408E-02,1.36833E+00 +t_68,1.95056E+01,4.08887E+01,3.96553E-02,1.35345E+00,1.41694E-01,1.43160E+00,6.57891E-02,1.09814E+00,1.11924E-01,1.19978E+00 +t_90,1.95072E+01,4.13006E+01,2.31520E-01,1.23135E+00,2.37980E-01,1.30666E+00,2.05719E-01,1.04199E+00,6.08602E-01,1.31936E+00 +t_101,1.94708E+01,4.13208E+01,1.50273E-01,1.10847E+00,2.22697E-01,1.78286E+00,2.20702E-01,1.35168E+00,4.19617E-01,1.88096E+00 +t_125,1.94273E+01,4.13673E+01,2.22903E-01,1.15071E+00,3.84604E-01,1.22216E+00,2.42078E-01,1.51716E+00,2.65894E-01,1.23485E+00 +t_127,1.94398E+01,4.13964E+01,1.72845E-01,1.25866E+00,4.31078E-01,1.09468E+00,1.76542E-01,1.03199E+00,3.45088E-01,1.04544E+00 +t_270,1.96098E+01,4.10528E+01,1.38127E-01,1.04180E+00,1.54405E-01,2.39708E+00,4.73973E-02,1.12025E+00,7.50073E-02,1.21536E+00 +t_291,1.95375E+01,4.11792E+01,1.66990E-01,1.40014E+00,1.27507E-01,1.11548E+00,8.22230E-02,1.44866E+00,9.61694E-02,2.07820E+00 +t_298,1.95425E+01,4.12625E+01,2.20102E-01,1.08682E+00,2.11477E-01,1.15950E+00,2.12529E-01,1.76370E+00,1.72195E-01,2.17163E+00 +t_325,1.96431E+01,4.14938E+01,1.31592E-01,1.69796E+00,8.96234E-02,1.39999E+00,9.88259E-02,1.37053E+00,1.53521E-01,1.36889E+00 +t_343,1.96217E+01,4.17454E+01,1.36808E-01,1.11799E+00,8.79434E-02,1.51378E+00,7.70339E-02,1.23192E+00,1.69417E-01,1.59421E+00 +t_369,1.95446E+01,4.19755E+01,6.08881E-02,2.86357E+00,2.70313E-02,1.12981E+00,8.53815E-02,1.57376E+00,3.74133E-02,1.17529E+00 +t_395,1.97078E+01,4.02626E+01,3.94721E-02,1.26672E+00,5.03754E-02,1.00751E+00,7.82125E-02,1.56425E+00,3.60573E-02,1.38668E+00 +t_416,1.97879E+01,4.07426E+01,3.33693E-02,2.47473E+00,4.02353E-02,1.24774E+00,1.98491E-02,1.41917E+00,2.71778E-02,3.11330E+00 +t_428,1.97128E+01,4.08677E+01,8.66234E-02,1.21092E+00,6.49630E-02,1.57545E+00,4.79457E-02,1.11684E+00,6.68235E-02,1.03498E+00 +t_482,1.97875E+01,4.13042E+01,1.09540E-01,1.05333E+00,9.78091E-02,1.21856E+00,9.02048E-02,1.48136E+00,1.08126E-01,1.10871E+00 +t_494,1.97625E+01,4.13042E+01,8.59232E-02,1.03892E+00,9.80309E-02,1.17641E+00,8.09534E-02,2.25453E+00,7.57950E-02,1.25720E+00 +t_502,1.97542E+01,4.13375E+01,8.44086E-02,1.05918E+00,1.20554E-01,1.44028E+00,8.41487E-02,1.13003E+00,1.03663E-01,1.53698E+00 +t_505,1.97625E+01,4.13542E+01,1.11485E-01,1.27932E+00,2.14305E-01,1.54671E+00,9.47526E-02,1.13770E+00,1.16064E-01,1.59343E+00 +t_519,1.97913E+01,4.13496E+01,1.17500E-01,1.02617E+00,2.17689E-01,1.93024E+00,1.11241E-01,1.53206E+00,1.55606E-01,1.76837E+00 +t_529,1.97958E+01,4.13625E+01,8.51713E-02,1.12903E+00,1.67968E-01,1.94319E+00,9.59884E-02,1.47120E+00,1.33744E-01,1.91611E+00 +t_544,1.97625E+01,4.13875E+01,1.08676E-01,1.06330E+00,1.61540E-01,1.28486E+00,1.12499E-01,1.08541E+00,2.04154E-01,1.54699E+00 +t_590,1.97080E+01,4.15739E+01,1.32288E-01,1.05734E+00,8.75712E-02,1.41572E+00,5.79461E-02,1.57010E+00,1.48121E-01,1.03209E+00 +t_599,1.97211E+01,4.15966E+01,1.27645E-01,1.06202E+00,9.70155E-02,1.22521E+00,3.67564E-02,1.37364E+00,1.79407E-01,1.78083E+00 +t_638,1.98786E+01,4.07203E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_685,1.98271E+01,4.12254E+01,1.07382E-01,1.02883E+00,9.04456E-02,1.03583E+00,9.25738E-02,1.11782E+00,4.96654E-02,1.47389E+00 +t_717,1.98292E+01,4.13208E+01,8.59986E-02,1.16632E+00,8.33228E-02,1.14639E+00,7.12556E-02,1.30451E+00,8.73860E-02,1.14798E+00 +t_729,1.98926E+01,4.13486E+01,5.19320E-02,1.03864E+00,4.60032E-02,1.08688E+00,4.48144E-02,1.11571E+00,4.04053E-02,1.23746E+00 +t_818,2.00452E+01,4.06422E+01,2.91614E-02,1.71459E+00,5.04419E-02,1.00884E+00,3.88977E-02,1.28542E+00,4.19177E-02,1.19281E+00 +t_827,1.99458E+01,4.06958E+01,2.55656E-02,1.95575E+00,3.76251E-02,1.32890E+00,3.99743E-02,1.25080E+00,5.74315E-02,1.14863E+00 +t_852,1.99958E+01,4.09958E+01,4.66674E-02,1.61409E+00,4.75537E-02,1.26709E+00,5.91215E-02,1.02850E+00,9.01020E-02,3.45072E+00 +t_865,2.00412E+01,4.10850E+01,5.40369E-02,2.14011E+00,3.15806E-02,1.18109E+00,6.27724E-02,1.09797E+00,6.12617E-02,2.53469E+00 +t_883,1.99533E+01,4.14380E+01,7.08643E-02,1.41729E+00,5.53487E-02,1.10697E+00,5.07429E-02,1.01486E+00,4.19093E-02,1.19305E+00 +t_909,1.99862E+01,4.24740E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_957,2.01917E+01,4.08333E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_967,2.01958E+01,4.09875E+01,4.23842E-02,1.17969E+00,5.88868E-02,1.17774E+00,3.81904E-02,1.30923E+00,4.07507E-02,1.22697E+00 +t_996,2.01834E+01,4.12150E+01,2.11053E-02,2.65563E+00,3.10908E-02,1.22636E+00,3.94915E-02,1.22321E+00,5.28838E-02,1.34172E+00 +t_1014,2.00889E+01,4.23542E+01,3.84572E-02,1.30015E+00,5.14122E-02,1.02824E+00,6.93007E-02,1.38601E+00,2.51768E-02,1.98595E+00 +t_1027,2.02949E+01,3.99014E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1034,2.02375E+01,4.05124E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1035,2.02277E+01,4.05048E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1050,2.03285E+01,4.11708E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1126,2.03808E+01,4.19091E+01,4.09872E-02,1.21989E+00,6.64694E-02,1.32939E+00,4.90822E-02,1.01870E+00,4.16236E-02,1.20124E+00 +t_1134,2.04227E+01,4.20535E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1140,2.04239E+01,4.20809E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1166,2.05500E+01,4.11083E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1169,2.04967E+01,4.13340E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1175,2.04943E+01,4.17361E+01,3.23758E-02,1.54437E+00,5.23805E-02,1.04761E+00,2.92814E-02,1.70757E+00,3.04616E-02,1.64141E+00 +t_1185,2.06362E+01,4.03531E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1186,2.06852E+01,4.03445E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +t_1194,2.06927E+01,4.06097E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_0,1.94573E+01,4.13199E+01,1.90020E-01,1.00000E+00,2.58294E-01,1.20262E+00,3.09689E-01,1.29513E+00,5.93340E-01,1.42907E+00 +s_1,2.04017E+01,4.20731E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_2,1.98078E+01,4.13357E+01,1.11440E-01,1.00000E+00,1.39451E-01,1.14912E+00,1.72456E-01,1.19513E+00,2.36481E-01,1.23533E+00 +s_3,2.00799E+01,4.11161E+01,4.33420E-02,1.31433E+00,2.79297E-02,1.24043E+00,6.64464E-02,1.44951E+00,5.43952E-02,1.91798E+00 +s_4,1.95669E+01,4.07174E+01,4.59350E-02,1.13704E+00,5.01024E-02,1.22062E+00,4.32571E-02,1.33261E+00,4.04250E-02,1.73450E+00 +s_5,1.99455E+01,4.07082E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_6,1.99202E+01,3.96189E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_7,2.11418E+01,4.08350E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_8,1.78504E+01,4.05894E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_9,2.06081E+01,3.86306E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_10,2.08487E+01,3.96562E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_11,2.14243E+01,3.83727E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_12,1.68191E+01,4.06033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_13,1.59427E+01,4.07867E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_14,2.32262E+01,4.34111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_15,2.04878E+01,3.81783E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_16,2.17600E+01,3.82693E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_17,1.56328E+01,4.03900E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_18,1.57296E+01,4.04256E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_19,1.58019E+01,4.03249E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_20,1.55782E+01,4.07889E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_21,2.26750E+01,4.36227E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_22,1.57967E+01,4.05722E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_23,2.19209E+01,3.85933E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_24,1.57251E+01,4.07619E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_25,1.62114E+01,3.92534E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_26,2.09937E+01,3.91474E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_27,2.17912E+01,3.82959E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_28,2.35750E+01,3.99980E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_29,2.29506E+01,3.93660E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_30,2.21080E+01,3.80326E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_31,1.94527E+01,4.13206E+01,2.07540E-01,1.00000E+00,2.69027E-01,1.20962E+00,1.96056E-01,1.20940E+00,1.84869E-01,1.32687E+00 +s_32,1.96745E+01,4.15755E+01,1.50230E-01,1.00000E+00,1.79227E-01,1.15569E+00,1.16510E-01,1.13158E+00,1.31896E-01,1.18009E+00 +s_33,1.97870E+01,4.13336E+01,1.50230E-01,1.00000E+00,1.82276E-01,1.16620E+00,1.28051E-01,1.06859E+00,1.32999E-01,1.19252E+00 +s_34,1.98111E+01,4.13248E+01,1.27810E-01,1.00000E+00,1.54784E-01,1.15395E+00,1.28548E-01,1.19768E+00,1.15443E-01,1.17788E+00 +s_35,1.98232E+01,4.13160E+01,1.27810E-01,1.00000E+00,1.56539E-01,1.15665E+00,1.42539E-01,1.39155E+00,1.24216E-01,1.18513E+00 +s_36,1.97994E+01,4.13067E+01,1.17890E-01,1.00000E+00,1.46222E-01,1.15880E+00,9.42147E-02,1.31547E+00,1.17075E-01,1.18688E+00 +s_37,1.97991E+01,4.13247E+01,8.53399E-02,1.00000E+00,1.04654E-01,1.14125E+00,8.52164E-02,1.20151E+00,7.93064E-02,1.15545E+00 +s_38,1.98114E+01,4.13068E+01,7.87100E-02,1.00000E+00,9.73590E-02,1.13938E+00,7.08350E-02,1.32290E+00,7.76682E-02,1.15468E+00 +s_39,1.98351E+01,4.13161E+01,7.87099E-02,1.00000E+00,9.54481E-02,1.13166E+00,7.60299E-02,1.39346E+00,7.32519E-02,1.14285E+00 +s_40,1.98109E+01,4.13338E+01,7.26001E-02,1.00000E+00,8.71907E-02,1.12678E+00,7.48464E-02,1.05032E+00,6.19531E-02,1.13073E+00 +s_41,1.98112E+01,4.13158E+01,7.25999E-02,1.00000E+00,8.84779E-02,1.13129E+00,7.50071E-02,1.16828E+00,6.64819E-02,1.13961E+00 +s_42,1.98230E+01,4.13250E+01,6.69700E-02,1.00000E+00,8.00919E-02,1.12115E+00,7.67892E-02,1.22180E+00,5.70388E-02,1.12269E+00 +s_43,1.97752E+01,4.13245E+01,6.17699E-02,1.00000E+00,7.62522E-02,1.13139E+00,5.81219E-02,1.18691E+00,5.64619E-02,1.13634E+00 +s_44,1.98228E+01,4.13340E+01,4.84800E-02,1.00000E+00,5.76042E-02,1.10550E+00,6.02525E-02,1.15914E+00,3.96654E-02,1.09585E+00 +s_45,1.98346E+01,4.13431E+01,4.84800E-02,1.00000E+00,5.77391E-02,1.10544E+00,6.00575E-02,1.27500E+00,4.08916E-02,1.09745E+00 +s_46,1.94841E+01,4.04742E+01,5.31239E-02,1.06248E+00,2.69076E-02,1.85821E+00,3.39137E-02,1.47433E+00,3.37546E-02,1.48128E+00 +s_47,1.99642E+01,4.07048E+01,2.69480E-02,1.85542E+00,4.99538E-02,1.00093E+00,5.90907E-02,1.18181E+00,3.88664E-02,1.28646E+00 +s_48,1.98348E+01,4.13341E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_49,2.00769E+01,4.11111E+01,4.26520E-02,1.33464E+00,2.61298E-02,1.10325E+00,6.96037E-02,1.26882E+00,4.69576E-02,2.12811E+00 +s_50,1.90953E+01,4.20988E+01,3.51299E-02,1.42329E+00,3.48047E-02,1.43659E+00,2.69659E-02,1.85420E+00,5.43912E-02,1.08782E+00 +s_51,2.09581E+01,4.15111E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_52,1.87087E+01,4.24249E+01,3.76298E-02,1.32874E+00,5.69259E-02,1.13852E+00,2.81920E-02,1.77355E+00,1.98675E-02,2.51667E+00 +s_53,2.11769E+01,4.26548E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_54,2.08964E+01,4.25829E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_55,2.04351E+01,4.23834E+01,4.42933E-02,1.12884E+00,2.42916E-02,2.05833E+00,5.26384E-02,1.05277E+00,3.31412E-02,1.50870E+00 +s_56,1.88348E+01,4.22923E+01,5.05016E-02,1.01003E+00,1.22398E-02,4.08505E+00,2.59286E-02,1.92837E+00,2.73287E-02,1.82958E+00 +s_57,2.09577E+01,4.19975E+01,4.07595E-02,1.22671E+00,2.93813E-02,1.70176E+00,5.00516E-02,1.00103E+00,2.78585E-02,1.79478E+00 +s_58,2.09097E+01,4.17903E+01,3.64986E-02,1.36992E+00,2.84711E-02,1.75617E+00,5.11006E-02,1.02201E+00,4.17803E-02,1.19674E+00 +s_59,1.87694E+01,4.24261E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_60,1.92430E+01,4.24434E+01,2.61671E-02,1.91080E+00,1.90886E-02,2.61936E+00,2.59999E-02,1.92308E+00,5.03689E-02,1.00738E+00 +s_61,2.14648E+01,4.19876E+01,2.15537E-02,2.31979E+00,5.16921E-02,1.03384E+00,2.41128E-02,2.07359E+00,4.05939E-02,1.23171E+00 +s_62,2.09097E+01,4.17993E+01,3.26777E-02,1.53009E+00,2.61453E-02,1.91239E+00,5.19840E-02,1.03968E+00,5.13868E-02,1.02774E+00 +s_63,2.09698E+01,4.20065E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_64,1.86962E+01,4.24337E+01,3.25080E-02,1.53808E+00,5.04956E-02,1.00991E+00,2.72237E-02,1.83664E+00,1.70417E-02,2.93398E+00 +s_65,2.10073E+01,5.22379E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_66,2.02984E+01,4.26618E+01,3.61239E-02,1.38413E+00,3.20986E-02,1.55770E+00,5.57650E-02,1.11530E+00,4.58106E-02,1.09145E+00 +s_67,2.07395E+01,4.22134E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_68,1.92089E+01,4.19295E+01,4.20690E-02,1.75861E+00,5.39219E-02,1.10410E+00,3.98399E-02,1.28329E+00,6.88989E-02,1.18547E+00 +s_69,2.14045E+01,4.20058E+01,3.09672E-02,1.61461E+00,5.85502E-02,1.17100E+00,2.10830E-02,2.37158E+00,3.93351E-02,1.27113E+00 +s_70,2.14166E+01,4.20058E+01,2.85697E-02,1.75011E+00,5.69383E-02,1.13877E+00,2.23118E-02,2.24096E+00,3.94280E-02,1.26813E+00 +s_71,1.95072E+01,4.20689E+01,4.30913E-02,1.27794E+00,2.60575E-02,1.03258E+00,4.03020E-02,1.05522E+00,6.70980E-02,1.12703E+00 +s_72,1.72469E+01,4.04623E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_73,1.92675E+01,4.24347E+01,2.06292E-02,1.03115E+00,1.61035E-02,1.87798E+00,2.25827E-02,1.79590E+00,7.68085E-02,1.02429E+00 +s_74,1.84180E+01,4.38594E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_75,2.08035E+01,4.11146E+01,3.37877E-02,1.47983E+00,4.19045E-02,1.19319E+00,3.93957E-02,1.26917E+00,7.05448E-02,1.41090E+00 +s_76,1.92575E+01,4.27948E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_77,2.10915E+01,4.26369E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_78,1.68644E+01,4.11267E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_79,2.11648E+01,4.26728E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_80,2.13804E+01,4.20059E+01,2.30581E-02,2.16843E+00,5.42624E-02,1.08525E+00,2.34012E-02,2.13664E+00,3.16374E-02,1.58041E+00 +s_81,2.02862E+01,4.26617E+01,3.67250E-02,1.36147E+00,4.25075E-02,1.17626E+00,5.29530E-02,1.05906E+00,4.54509E-02,1.10009E+00 +s_82,2.13924E+01,4.19968E+01,2.43944E-02,2.04965E+00,6.20015E-02,1.24003E+00,2.14753E-02,2.32826E+00,3.19094E-02,1.56694E+00 +s_83,2.14286E+01,4.19967E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_84,2.14406E+01,4.19786E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_85,2.14527E+01,4.19876E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_86,2.05143E+01,4.31402E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_87,1.83811E+01,4.38496E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_88,2.04879E+01,4.48058E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_89,2.25197E+01,4.46672E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_90,1.97962E+01,3.97127E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 +s_91,2.24892E+01,4.01033E+01,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00 From 91e455a036680e26d5a047563fe32bcaa14b6a39 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 08:13:05 +0100 Subject: [PATCH 07/10] Cleanup --- openquake/commonlib/readinput.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openquake/commonlib/readinput.py b/openquake/commonlib/readinput.py index 11a44abad98..861e1933180 100644 --- a/openquake/commonlib/readinput.py +++ b/openquake/commonlib/readinput.py @@ -766,9 +766,7 @@ def get_gsim_lt(oqparam, trts=('*',)): # but it is not an error, it is actually the most common case! if gmfcorr and (gsim.DEFINED_FOR_STANDARD_DEVIATION_TYPES == {StdDev.TOTAL}) and not oqparam.with_betw_ratio: - if not (type(gsim).__name__ == 'ModifiableGMPE' and - 'add_between_within_stds' in gsim.kwargs): - raise CorrelationButNoInterIntraStdDevs(gmfcorr, gsim) + raise CorrelationButNoInterIntraStdDevs(gmfcorr, gsim) imt_dep_w = any(len(branch.weight.dic) > 1 for branch in gsim_lt.branches) if oqparam.number_of_logic_tree_samples and imt_dep_w: logging.error('IMT-dependent weights in the logic tree cannot work ' From a89272d50a1de13c70a63915484ec072cdf264ec Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 08:15:26 +0100 Subject: [PATCH 08/10] Added a comment [ci skip] --- openquake/hazardlib/contexts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openquake/hazardlib/contexts.py b/openquake/hazardlib/contexts.py index 235f7658128..1df0b5ecbbd 100644 --- a/openquake/hazardlib/contexts.py +++ b/openquake/hazardlib/contexts.py @@ -574,7 +574,7 @@ def __init__(self, trt, gsims, oq, monitor=Monitor(), extraparams=()): if oq.with_betw_ratio: betw_ratio = {'with_betw_ratio': oq.with_betw_ratio} elif oq.aristotle: - betw_ratio = {'with_betw_ratio': 1.7} + betw_ratio = {'with_betw_ratio': 1.7} # same as in GEESE else: betw_ratio = {} if isinstance(gsims, dict): From 8134b13207161f0f1bd9945cbcf3d57478a1e7aa Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 08:39:35 +0100 Subject: [PATCH 09/10] Fixed tests --- openquake/hazardlib/calc/conditioned_gmfs.py | 14 +-- .../tests/calc/conditioned_gmfs_test.py | 100 ++++++++---------- 2 files changed, 50 insertions(+), 64 deletions(-) diff --git a/openquake/hazardlib/calc/conditioned_gmfs.py b/openquake/hazardlib/calc/conditioned_gmfs.py index f443fd97dc4..0f6fc46f472 100644 --- a/openquake/hazardlib/calc/conditioned_gmfs.py +++ b/openquake/hazardlib/calc/conditioned_gmfs.py @@ -217,9 +217,8 @@ def get_mea_tau_phi(self): self.rupture, self.cmaker, self.station_sitecol, self.station_data, self.observed_imt_strs, self.sitecol, self.imts, - self.spatial_correl, - self.cross_correl_between, self.cross_correl_within, - self.cmaker.maximum_distance, sigma=False) + self.spatial_correl, self.cross_correl_between, self.cross_correl_within, + sigma=False) @dataclass @@ -390,7 +389,7 @@ def get_mean_covs( rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance, sigma=True): + sigma=True): """ :returns: a list of arrays [mea, sig, tau, phi] or [mea, tau, phi] """ @@ -408,8 +407,7 @@ def get_mean_covs( # Generate the contexts and calculate the means and # standard deviations at the *station* sites ("_D") - cmaker_D = cmaker.copy(imtls=observed_imtls, - maximum_distance=maximum_distance) + cmaker_D = cmaker.copy(imtls=observed_imtls) [ctx_D] = cmaker_D.get_ctx_iter([rupture], station_sitecol) mean_stds_D = cmaker_D.get_mean_stds([ctx_D]) @@ -417,9 +415,7 @@ def get_mean_covs( # Generate the contexts and calculate the means and # standard deviations at the *target* sites ("_Y") - cmaker_Y = cmaker.copy( - imtls={target_imts[0].string: [0]}, - maximum_distance=maximum_distance) + cmaker_Y = cmaker.copy(imtls={target_imts[0].string: [0]}) [ctx_Y] = cmaker_Y.get_ctx_iter([rupture], target_sitecol) mean_stds_Y = cmaker_D.get_mean_stds([ctx_Y]) diff --git a/openquake/hazardlib/tests/calc/conditioned_gmfs_test.py b/openquake/hazardlib/tests/calc/conditioned_gmfs_test.py index a508dbb5ca4..09436cd65bb 100644 --- a/openquake/hazardlib/tests/calc/conditioned_gmfs_test.py +++ b/openquake/hazardlib/tests/calc/conditioned_gmfs_test.py @@ -25,6 +25,7 @@ import numpy +from openquake.hazardlib.contexts import simple_cmaker from openquake.hazardlib.calc.conditioned_gmfs import get_mean_covs from openquake.hazardlib.tests.calc import \ _conditioned_gmfs_test_data as test_data @@ -36,7 +37,8 @@ class SetUSGSTestCase(unittest.TestCase): def test_case_01(self): case_name = "test_case_01" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE01_STATION_SITECOL station_data = test_data.CASE01_STATION_DATA observed_imt_strs = test_data.CASE01_OBSERVED_IMTS @@ -45,12 +47,10 @@ def test_case_01(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.zeros_like(mu), mu) @@ -62,7 +62,8 @@ def test_case_01(self): def test_case_02(self): case_name = "test_case_02" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE02_STATION_SITECOL station_data = test_data.CASE02_STATION_DATA observed_imt_strs = test_data.CASE02_OBSERVED_IMTS @@ -71,12 +72,10 @@ def test_case_02(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.min(mu), -1, rtol=1e-4) @@ -90,7 +89,8 @@ def test_case_02(self): def test_case_03(self): case_name = "test_case_03" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE03_STATION_SITECOL station_data = test_data.CASE03_STATION_DATA observed_imt_strs = test_data.CASE03_OBSERVED_IMTS @@ -99,12 +99,10 @@ def test_case_03(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.min(mu), 0.36, rtol=1e-4) @@ -117,7 +115,8 @@ def test_case_03(self): def test_case_04(self): case_name = "test_case_04" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE04_STATION_SITECOL station_data = test_data.CASE04_STATION_DATA observed_imt_strs = test_data.CASE04_OBSERVED_IMTS @@ -126,12 +125,10 @@ def test_case_04(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.min(mu), 0.36, rtol=1e-4) @@ -144,7 +141,8 @@ def test_case_04(self): def test_case_04b(self): case_name = "test_case_04b" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE04B_STATION_SITECOL station_data = test_data.CASE04_STATION_DATA observed_imt_strs = test_data.CASE04_OBSERVED_IMTS @@ -153,12 +151,10 @@ def test_case_04b(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.min(mu), 0.52970, rtol=1e-4) @@ -171,7 +167,8 @@ def test_case_04b(self): def test_case_05(self): case_name = "test_case_05" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE05_STATION_SITECOL station_data = test_data.CASE05_STATION_DATA observed_imt_strs = test_data.CASE05_OBSERVED_IMTS @@ -180,12 +177,10 @@ def test_case_05(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.zeros_like(mu), mu, atol=1e-4) @@ -197,7 +192,8 @@ def test_case_05(self): def test_case_06(self): case_name = "test_case_06" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE06_STATION_SITECOL station_data = test_data.CASE06_STATION_DATA observed_imt_strs = test_data.CASE06_OBSERVED_IMTS @@ -206,12 +202,10 @@ def test_case_06(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) plot_test_results(target_sitecol.lons, mu, sig, 0, @@ -220,7 +214,8 @@ def test_case_06(self): def test_case_07(self): case_name = "test_case_07" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE07_STATION_SITECOL station_data = test_data.CASE07_STATION_DATA observed_imt_strs = test_data.CASE07_OBSERVED_IMTS @@ -229,12 +224,10 @@ def test_case_07(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0] sig = mean_covs[1][0] periods = [imt.period for imt in target_imts] @@ -243,7 +236,8 @@ def test_case_07(self): def test_case_08(self): case_name = "test_case_08" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE08_STATION_SITECOL station_data_list = test_data.CASE08_STATION_DATA_LIST observed_imt_strs = test_data.CASE08_OBSERVED_IMTS @@ -252,7 +246,6 @@ def test_case_08(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST std_addon_d = test_data.CASE08_STD_ADDON_D bias_mean = test_data.CASE08_BD_YD conditioned_mean_obs = test_data.CASE08_MU_YD_OBS @@ -262,10 +255,9 @@ def test_case_08(self): sigs = [] for i, station_data in enumerate(station_data_list): mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) aac(numpy.min(mu), bias_mean[i], rtol=1e-4) @@ -280,7 +272,8 @@ def test_case_08(self): def test_case_09(self): case_name = "test_case_09" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE09_STATION_SITECOL station_data = test_data.CASE09_STATION_DATA observed_imt_strs = test_data.CASE09_OBSERVED_IMTS @@ -289,12 +282,10 @@ def test_case_09(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) plot_test_results(target_sitecol.lons, mu, sig, 0, @@ -303,7 +294,8 @@ def test_case_09(self): def test_case_10(self): case_name = "test_case_10" rupture = test_data.RUP - gmm = test_data.ZeroMeanGMM() + cmaker = simple_cmaker([test_data.ZeroMeanGMM()], [], + maximum_distance=test_data.MAX_DIST) station_sitecol = test_data.CASE10_STATION_SITECOL station_data = test_data.CASE10_STATION_DATA observed_imt_strs = test_data.CASE10_OBSERVED_IMTS @@ -312,12 +304,10 @@ def test_case_10(self): spatial_correl = test_data.DummySpatialCorrelationModel() cross_correl_between = test_data.DummyCrossCorrelationBetween() cross_correl_within = test_data.DummyCrossCorrelationWithin() - maximum_distance = test_data.MAX_DIST mean_covs = get_mean_covs( - rupture, [gmm], station_sitecol, station_data, + rupture, cmaker, station_sitecol, station_data, observed_imt_strs, target_sitecol, target_imts, - spatial_correl, cross_correl_between, cross_correl_within, - maximum_distance) + spatial_correl, cross_correl_between, cross_correl_within) mu = mean_covs[0][0, 0, :, 0] sig = numpy.sqrt(numpy.diag(mean_covs[1][0, 0])) plot_test_results(target_sitecol.lons, mu, sig, 0, From b529f1fd1611da701dd5921eef302a15d7ae036a Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Fri, 8 Nov 2024 09:39:28 +0100 Subject: [PATCH 10/10] Fixed disagg tests --- openquake/hazardlib/calc/disagg.py | 29 +++++++++---------- openquake/hazardlib/contexts.py | 3 ++ openquake/hazardlib/tests/calc/disagg_test.py | 27 ++++++++--------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/openquake/hazardlib/calc/disagg.py b/openquake/hazardlib/calc/disagg.py index c3897d76f6d..4674caf60d8 100644 --- a/openquake/hazardlib/calc/disagg.py +++ b/openquake/hazardlib/calc/disagg.py @@ -25,7 +25,6 @@ import operator import collections import itertools -from unittest.mock import Mock from functools import lru_cache import numpy import scipy.stats @@ -43,7 +42,7 @@ from openquake.hazardlib.tom import get_pnes from openquake.hazardlib.site import Site, SiteCollection from openquake.hazardlib.gsim.base import to_distribution_values -from openquake.hazardlib.contexts import ContextMaker, FarAwayRupture +from openquake.hazardlib.contexts import ContextMaker, Oq, FarAwayRupture from openquake.hazardlib.calc.mean_rates import ( calc_rmap, calc_mean_rates, to_rates, to_probs) @@ -634,19 +633,19 @@ def disaggregation( mags_by_trt = AccumDict(accum=set()) dists = [] tom = sources[0].temporal_occurrence_model - oq = Mock(imtls={str(imt): [iml]}, - poes=[None], - rlz_index=[0], - epsstar=epsstar, - truncation_level=truncation_level, - investigation_time=tom.time_span, - maximum_distance=source_filter.integration_distance, - mags_by_trt=mags_by_trt, - num_epsilon_bins=n_epsilons, - mag_bin_width=mag_bin_width, - distance_bin_width=dist_bin_width, - coordinate_bin_width=coord_bin_width, - disagg_bin_edges=bin_edges) + oq = Oq(imtls={str(imt): [iml]}, + poes=[None], + rlz_index=[0], + epsilon_star=epsstar, + truncation_level=truncation_level, + investigation_time=tom.time_span, + maximum_distance=source_filter.integration_distance, + mags_by_trt=mags_by_trt, + num_epsilon_bins=n_epsilons, + mag_bin_width=mag_bin_width, + distance_bin_width=dist_bin_width, + coordinate_bin_width=coord_bin_width, + disagg_bin_edges=bin_edges) for trt, srcs in by_trt.items(): cmaker[trt] = cm = ContextMaker(trt, rlzs_by_gsim, oq) ctxs[trt].extend(cm.from_srcs(srcs, sitecol)) diff --git a/openquake/hazardlib/contexts.py b/openquake/hazardlib/contexts.py index 1df0b5ecbbd..98355eb7de8 100644 --- a/openquake/hazardlib/contexts.py +++ b/openquake/hazardlib/contexts.py @@ -198,10 +198,13 @@ class Oq(object): """ af = None aristotle = False + cross_correl = None mea_tau_phi = False split_sources = True use_rates = False with_betw_ratio = None + infer_occur_rates = False + inputs = () def __init__(self, **hparams): vars(self).update(hparams) diff --git a/openquake/hazardlib/tests/calc/disagg_test.py b/openquake/hazardlib/tests/calc/disagg_test.py index bbbe34a36b1..06b69bed906 100644 --- a/openquake/hazardlib/tests/calc/disagg_test.py +++ b/openquake/hazardlib/tests/calc/disagg_test.py @@ -101,21 +101,22 @@ def setUpClass(cls): cls.gsims = {cls.trt: gsim} mags = cls.sources[0].get_mags() maxdist = filters.IntegrationDistance.new('200.') - oq = unittest.mock.Mock(truncation_level=cls.truncation_level, - investigation_time=50., - imtls={'PGA': [cls.iml]}, - rlz_index=[0, 1], - poes=[None], - num_epsilon_bins=3, - mag_bin_width=.075, - distance_bin_width=10, - coordinate_bin_width=100, - maximum_distance=maxdist, - mags_by_trt={cls.trt: mags}, - disagg_bin_edges={}) + oq = dict(truncation_level=cls.truncation_level, + investigation_time=50., + imtls={'PGA': [cls.iml]}, + rlz_index=[0, 1], + poes=[None], + epsilon_star=False, + num_epsilon_bins=3, + mag_bin_width=.075, + distance_bin_width=10, + coordinate_bin_width=100, + maximum_distance=maxdist, + mags_by_trt={cls.trt: mags}, + disagg_bin_edges={}) sitecol = SiteCollection([cls.site]) - cls.bin_edges, _ = disagg.get_edges_shapedic(oq, sitecol) cls.cmaker = ContextMaker(cls.trt, {gsim: [0]}, oq) + cls.bin_edges, _ = disagg.get_edges_shapedic(cls.cmaker.oq, sitecol) cls.sources[0].grp_id = 0 cls.cmaker.grp_id = 0 cls.cmaker.poes = [.001]