Skip to content

Commit

Permalink
#25 Merge pull request from deshima-dev/astropenguin/issue4
Browse files Browse the repository at this point in the history
Ignore zero divided warning in make_divided_data.py
  • Loading branch information
astropenguin authored Oct 16, 2023
2 parents 5444e55 + 207ea47 commit 88e4da0
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions dmerge/dmerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
import os
import sys
from warnings import catch_warnings, simplefilter
import numpy as np
import scipy
import scipy.signal
Expand Down Expand Up @@ -287,18 +288,20 @@ def residue(p, x):
v = {k: v for (k, v) in p.valuesdict().items() if k in gaolinbg_param_names}
return complex_to_cartesian2darray(gaolinbg_func(x, **v)) - ys

params = lmfit.Parameters()
params.add('arga', initial_params['arga'])
params.add('absa', initial_params['absa'])
params.add('tau', initial_params['tau'])
params.add('fr', initial_params['fr'])
params.add('Qr', initial_params['Qr'])
params.add('Qc', initial_params['Qc'])
params.add('phi0', initial_params['phi0'])
params.add('c', initial_params['c'])
params.add('Qi', expr='1/(1/Qr - 1/Qc*cos(phi0))')
minimizer_result = lmfit.minimize(residue, params, args=(sweepdata.x[s],), **kws)
return minimizer_result, s # fit結果, フィット範囲
with catch_warnings():
simplefilter("ignore")
params = lmfit.Parameters()
params.add('arga', initial_params['arga'])
params.add('absa', initial_params['absa'])
params.add('tau', initial_params['tau'])
params.add('fr', initial_params['fr'])
params.add('Qr', initial_params['Qr'])
params.add('Qc', initial_params['Qc'])
params.add('phi0', initial_params['phi0'])
params.add('c', initial_params['c'])
params.add('Qi', expr='1/(1/Qr - 1/Qc*cos(phi0))')
minimizer_result = lmfit.minimize(residue, params, args=(sweepdata.x[s],), **kws)
return minimizer_result, s # fit結果, フィット範囲

def search_peak(sweepdata, peaks):
"""複数のピークが見つかった場合は中心周波数に一番近いピークを採用する
Expand Down

0 comments on commit 88e4da0

Please sign in to comment.