Commit 0856e292 authored by Karsten Wiesner's avatar Karsten Wiesner 💬
Browse files

changed dh_dx_symm() calls

parent 0dcc7be1
......@@ -20,8 +20,8 @@ def my_calc_fisher_2X2_symm(params, dxs, nspec, NYear, OneYear, stime, dom, *obs
## Partial derivatives with respect to corresponding parameters
print "fast_fisher_utils, len(s_nA_m), len(s_ninc_m)", len(s_nA_m), len(s_ninc_m)
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl, *obs)
deriv_cos_inc = (-1./(np.sin(inc)))*np.array((dh_dx_symm(s_ninc_p, s_ninc_m, dinc, *obs)))
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl)
deriv_cos_inc = (-1./(np.sin(inc)))*np.array((dh_dx_symm(s_ninc_p, s_ninc_m, dinc)))
print "len(deriv_A), len(deriv_cos_inc)", len(deriv_A), len(deriv_cos_inc)
## fisher matrix elements
......@@ -49,8 +49,8 @@ def my_calc_fisher_2X2_symm_freq(params, dxs, nspec, NYear, OneYear, stime, df,
#print "s_nA_m, s_ninc_m", s_nA_m.shape, s_ninc_m.shape
## Partial derivatives with respect to corresponding parameters
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl, *obs)
deriv_cos_inc = (-1./(np.sin(inc)))*(dh_dx_symm(s_ninc_p, s_ninc_m, dinc, *obs))
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl)
deriv_cos_inc = (-1./(np.sin(inc)))*(dh_dx_symm(s_ninc_p, s_ninc_m, dinc))
#print "deriv_A, deriv_cos_inc", deriv_A.shape, deriv_cos_inc.shape, nspec.shape
## fisher matrix elements
......@@ -87,13 +87,13 @@ def my_calc_fisher_7X7_symm_freq(params, dxs, nspec, NYear, OneYear, stime, dom,
## Partial derivatives with respect to corresponding parameters
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl, *obs)
deriv_cos_inc = (-1./(np.sin(inc)))*(dh_dx_symm(s_ninc_p, s_ninc_m, dinc, *obs))
deriv_freq = dh_dx_symm(s_nfreq_p, s_nfreq_m, dfreq, *obs)
deriv_phi = dh_dx_symm(s_nphi_p, s_nphi_m, dphi, *obs)
deriv_psi = dh_dx_symm(s_npsi_p, s_npsi_m, dpsi, *obs)
deriv_sin_elat = (1./(np.cos(elat)))*(dh_dx_symm(s_nelat_p, s_nelat_m, delat, *obs))
deriv_elon = dh_dx_symm(s_nelon_p, s_nelon_m, delon, *obs)
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl)
deriv_cos_inc = (-1./(np.sin(inc)))*(dh_dx_symm(s_ninc_p, s_ninc_m, dinc))
deriv_freq = dh_dx_symm(s_nfreq_p, s_nfreq_m, dfreq)
deriv_phi = dh_dx_symm(s_nphi_p, s_nphi_m, dphi)
deriv_psi = dh_dx_symm(s_npsi_p, s_npsi_m, dpsi)
deriv_sin_elat = (1./(np.cos(elat)))*(dh_dx_symm(s_nelat_p, s_nelat_m, delat))
deriv_elon = dh_dx_symm(s_nelon_p, s_nelon_m, delon)
## fisher matrix elements
gaa = prep_innerprod_freq(deriv_A, deriv_A, nspec, stime, *obs)
......@@ -167,13 +167,13 @@ def my_calc_fisher_7X7_symm(params, dxs, nspec, NYear, OneYear, stime, dom, *obs
s_nelon_m = sig_nelon(params, elon-delon, NYear, OneYear, stime, dom, *obs)
## Partial derivatives with respect to corresponding parameters
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl, *obs)
deriv_cos_inc = (-1./(np.sin(inc)))*np.array((dh_dx_symm(s_ninc_p, s_ninc_m, dinc, *obs)))
deriv_freq = dh_dx_symm(s_nfreq_p, s_nfreq_m, dfreq, *obs)
deriv_phi = dh_dx_symm(s_nphi_p, s_nphi_m, dphi, *obs)
deriv_psi = dh_dx_symm(s_npsi_p, s_npsi_m, dpsi, *obs)
deriv_sin_elat = (1./(np.cos(elat)))*np.array((dh_dx_symm(s_nelat_p, s_nelat_m, delat, *obs)))
deriv_elon = dh_dx_symm(s_nelon_p, s_nelon_m, delon, *obs)
deriv_A = dh_dx_symm(s_nA_p, s_nA_m, dampl)
deriv_cos_inc = (-1./(np.sin(inc)))*np.array((dh_dx_symm(s_ninc_p, s_ninc_m, dinc)))
deriv_freq = dh_dx_symm(s_nfreq_p, s_nfreq_m, dfreq)
deriv_phi = dh_dx_symm(s_nphi_p, s_nphi_m, dphi)
deriv_psi = dh_dx_symm(s_npsi_p, s_npsi_m, dpsi)
deriv_sin_elat = (1./(np.cos(elat)))*np.array((dh_dx_symm(s_nelat_p, s_nelat_m, delat)))
deriv_elon = dh_dx_symm(s_nelon_p, s_nelon_m, delon)
## fisher matrix elements
gaa = prep_innerprod(deriv_A, deriv_A, nspec, stime, *obs)
......@@ -301,9 +301,9 @@ def my_calc_fisher_3X3_symm(params, dxs, nspec, NYear, OneYear, stime, dom, *obs
s_nelon_m = sig_nelon(params, elon-delon, NYear, OneYear, stime, dom, *obs)
## Partial derivatives with respect to corresponding parameters
deriv_freq = dh_dx_symm(s_nfreq_p, s_nfreq_m, dfreq, *obs)
deriv_sin_elat = (1./(np.cos(elat)))*np.array((dh_dx_symm(s_nelat_p, s_nelat_m, delat, *obs)))
deriv_elon = dh_dx_symm(s_nelon_p, s_nelon_m, delon, *obs)
deriv_freq = dh_dx_symm(s_nfreq_p, s_nfreq_m, dfreq)
deriv_sin_elat = (1./(np.cos(elat)))*np.array((dh_dx_symm(s_nelat_p, s_nelat_m, delat)))
deriv_elon = dh_dx_symm(s_nelon_p, s_nelon_m, delon)
## fisher matrix elements
gff = prep_innerprod(deriv_freq, deriv_freq, nspec, stime, *obs)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment