marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge branch 'develop' of ariadne:/data/git/pylot into develop

Browse Source
This commit is contained in:
Marcel Paffrath 2018-07-02 10:11:31 +02:00
commit e3e420a94b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
autoPyLoT.py
View File

@ -167,7 +167,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
ttpat = parameter.get('ttpatter') ttpat = parameter.get('ttpatter')
# pattern of NLLoc-output file # pattern of NLLoc-output file
nllocoutpatter = parameter.get('outpatter') nllocoutpatter = parameter.get('outpatter')
maxnumit = 3 # maximum number of iterations for re-picking maxnumit = 2 # maximum number of iterations for re-picking
else: else:
locflag = 0 locflag = 0
print(" !!! ") print(" !!! ")
@ -439,6 +439,13 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even
evt = local_mag.updated_event(magscaling) evt = local_mag.updated_event(magscaling)
net_ml = local_mag.net_magnitude(magscaling) net_ml = local_mag.net_magnitude(magscaling)
print("Network local magnitude: %4.1f" % net_ml.mag) print("Network local magnitude: %4.1f" % net_ml.mag)
if magscaling == None:
scaling = False
elif magscaling[0] != 0 and magscaling[1] != 0:
scaling = False
else:
scaling = True
if scaling:
print("Network local magnitude scaled with:") print("Network local magnitude scaled with:")
print("%f * Ml + %f" % (magscaling[0], magscaling[1])) print("%f * Ml + %f" % (magscaling[0], magscaling[1]))
else: else: