From c227b6499e7f7d5df71ddbe1a1765e982323bc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 2 Dec 2015 10:15:05 +0100 Subject: [PATCH] Modified for extended class MoMw of object magntitude. MoMw returns pick dictionary containing individual corner frequencies, w0-values, seismic moments and moment magnitudes. --- autoPyLoT.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/autoPyLoT.py b/autoPyLoT.py index 7de3953d..eb205dbd 100755 --- a/autoPyLoT.py +++ b/autoPyLoT.py @@ -139,8 +139,9 @@ def autoPyLoT(inputfile): # get latest NLLoc-location file if several are available nllocfile = max(glob.glob(locsearch), key=os.path.getctime) # calculating seismic moment Mo and moment magnitude Mw - M0Mw(wfdat, None, None, None, nllocfile, picks, \ - parameter.getParam('rho'), parameter.getParam('vp')) + finalpicks = M0Mw(wfdat, None, None, parameter.getParam('iplot'), \ + nllocfile, picks, parameter.getParam('rho'), \ + parameter.getParam('vp'), parameter.getParam('invdir')) else: print("autoPyLoT: No NLLoc-location file available!") print("No source parameter estimation possible!") @@ -177,8 +178,9 @@ def autoPyLoT(inputfile): nlloccounter = maxnumit # calculating seismic moment Mo and moment magnitude Mw - finalpicks = M0Mw(wfdat, None, None, None, nllocfile, picks, \ - parameter.getParam('rho'), parameter.getParam('vp')) + finalpicks = M0Mw(wfdat, None, None, parameter.getParam('iplot'), \ + nllocfile, picks, parameter.getParam('rho'), \ + parameter.getParam('vp'), parameter.getParam('invdir')) else: print("autoPyLoT: No NLLoc-location file available! Stop iteration!") ########################################################## @@ -236,8 +238,9 @@ def autoPyLoT(inputfile): # get latest NLLOc-location file if several are available nllocfile = max(glob.glob(locsearch), key=os.path.getctime) # calculating seismic moment Mo and moment magnitude Mw - M0Mw(wfdat, None, None, None, nllocfile, picks, \ - parameter.getParam('rho'), parameter.getParam('vp')) + finalpicks = M0Mw(wfdat, None, None, parameter.getParam('iplot'), \ + nllocfile, picks, parameter.getParam('rho'), \ + parameter.getParam('vp'), parameter.getParam('invdir')) else: print("autoPyLoT: No NLLoc-location file available!") print("No source parameter estimation possible!") @@ -274,8 +277,9 @@ def autoPyLoT(inputfile): nlloccounter = maxnumit # calculating seismic moment Mo and moment magnitude Mw - finalpicks = M0Mw(wfdat, None, None, None, nllocfile, picks, \ - parameter.getParam('rho'), parameter.getParam('vp')) + finalpicks = M0Mw(wfdat, None, None, parameter.getParam('iplot'), \ + nllocfile, picks, parameter.getParam('rho'), \ + parameter.getParam('vp'), parameter.getParam('invdir')) else: print("autoPyLoT: No NLLoc-location file available! Stop iteration!") ##########################################################