Merge branch 'master' into ftong-patch-cython
This commit is contained in:
commit
910d933467
@ -57,7 +57,7 @@ def main(catalog_file, mc_file, pdf_file, m_file, m_select, mag_label, mc, m_max
|
||||
import utm
|
||||
from skimage.transform import resize
|
||||
import igfash
|
||||
from igfash.io import read_mat_cat, read_mat_m, read_mat_pdf, read_csv
|
||||
from igfash.io import read_mat_cat, read_mat_m, read_mat_mc, read_mat_pdf, read_csv
|
||||
from igfash.window import win_CTL, win_CNE
|
||||
import igfash.kde as kde
|
||||
from igfash.gm import compute_IMT_exceedance
|
||||
@ -142,7 +142,7 @@ verbose: {verbose}")
|
||||
trim_to_mc = True
|
||||
elif mc_file != None:
|
||||
logger.info("Mc estimation output file provided; selecting largest Mc from the list")
|
||||
mc = read_mc(mc_file)
|
||||
mc = read_mat_mc(mc_file)
|
||||
trim_to_mc = True
|
||||
else:
|
||||
logger.info("No Mc provided; using all magnitudes from the catalog")
|
||||
|
Loading…
Reference in New Issue
Block a user