From bc70749e4a0086df7cb47b0883e2f28d0f97da85 Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Thu, 17 Jan 2019 11:05:21 +0100 Subject: [PATCH 1/9] We can now do combining fits with different values of bias_hcd --- py/picca/fitter2/pk.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index 39ae413ca..e963b0034 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -65,8 +65,12 @@ def pk_hcd_Rogers2018(k, pk_lin, tracer1, tracer2, **kwargs): """ bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) - - bias_hcd = kwargs["bias_hcd"] + + key = "bias_hcd_{}".format(kwargs['name']) + if key in kwargs : + bias_hcd = kwargs[key] + else : + bias_hcd = kwargs["bias_hcd"] beta_hcd = kwargs["beta_hcd"] L0 = kwargs["L0_hcd"] @@ -144,8 +148,11 @@ def pk_hcd_Rogers2018_uv(k, pk_lin, tracer1, tracer2, **kwargs): beta2 = beta2/(1 + bias_gamma/bias2*W/(1 + bias_prim*W)) bias2 = bias2 + bias_gamma*W/(1+bias_prim*W) - - bias_hcd = kwargs["bias_hcd"] + + if key in kwargs : + bias_hcd = kwargs[key] + else : + bias_hcd = kwargs["bias_hcd"] beta_hcd = kwargs["beta_hcd"] L0 = kwargs["L0_hcd"] @@ -233,7 +240,10 @@ def pk_hcd_Rogers2018_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) assert (tracer1['name']=="LYA" or tracer2['name']=="LYA") and (tracer1['name']!=tracer2['name']) - bias_hcd = kwargs["bias_hcd"] + if key in kwargs : + bias_hcd = kwargs[key] + else : + bias_hcd = kwargs["bias_hcd"] beta_hcd = kwargs["beta_hcd"] L0 = kwargs["L0_hcd"] @@ -311,8 +321,11 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): lambda_uv = kwargs["lambda_uv"] W = sp.arctan(k*lambda_uv)/(k*lambda_uv) - - bias_hcd = kwargs["bias_hcd"] + + if key in kwargs : + bias_hcd = kwargs[key] + else : + bias_hcd = kwargs["bias_hcd"] beta_hcd = kwargs["beta_hcd"] L0 = kwargs["L0_hcd"] From 45f9061d9c4a84989442e26c655cccb8acb7a442 Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Thu, 17 Jan 2019 11:27:19 +0100 Subject: [PATCH 2/9] corect variable --- py/picca/fitter2/pk.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index e963b0034..be98f6d23 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -149,10 +149,11 @@ def pk_hcd_Rogers2018_uv(k, pk_lin, tracer1, tracer2, **kwargs): beta2 = beta2/(1 + bias_gamma/bias2*W/(1 + bias_prim*W)) bias2 = bias2 + bias_gamma*W/(1+bias_prim*W) + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : - bias_hcd = kwargs["bias_hcd"] + bias_hcd = kwargs["bias_hcd"] beta_hcd = kwargs["beta_hcd"] L0 = kwargs["L0_hcd"] @@ -239,7 +240,8 @@ def pk_hcd_cross(k, pk_lin, tracer1, tracer2, **kwargs): def pk_hcd_Rogers2018_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) assert (tracer1['name']=="LYA" or tracer2['name']=="LYA") and (tracer1['name']!=tracer2['name']) - + + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : @@ -322,6 +324,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): W = sp.arctan(k*lambda_uv)/(k*lambda_uv) + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : From 02bdf40cd7f26564d8a740499e8c677fe86a0409 Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Fri, 18 Jan 2019 10:20:13 +0100 Subject: [PATCH 3/9] apply codacy requierements --- py/picca/fitter2/pk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index be98f6d23..9194a3432 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -66,7 +66,7 @@ def pk_hcd_Rogers2018(k, pk_lin, tracer1, tracer2, **kwargs): bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) - key = "bias_hcd_{}".format(kwargs['name']) + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : @@ -321,7 +321,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias_gamma = kwargs["bias_gamma"] bias_prim = kwargs["bias_prim"] lambda_uv = kwargs["lambda_uv"] - + W = sp.arctan(k*lambda_uv)/(k*lambda_uv) key = "bias_hcd_{}".format(kwargs['name']) From 8db971c80ba018f4310a0cc7ec1f7b91e0060db1 Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Fri, 18 Jan 2019 16:44:13 +0100 Subject: [PATCH 4/9] apply codacy requierements --- py/picca/fitter2/pk.py | 6 +++--- py/picca/fitter2/xi.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index 9194a3432..01fa6409b 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -153,7 +153,7 @@ def pk_hcd_Rogers2018_uv(k, pk_lin, tracer1, tracer2, **kwargs): if key in kwargs : bias_hcd = kwargs[key] else : - bias_hcd = kwargs["bias_hcd"] + bias_hcd = kwargs["bias_hcd"] beta_hcd = kwargs["beta_hcd"] L0 = kwargs["L0_hcd"] @@ -323,8 +323,8 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): lambda_uv = kwargs["lambda_uv"] W = sp.arctan(k*lambda_uv)/(k*lambda_uv) - - key = "bias_hcd_{}".format(kwargs['name']) + + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : diff --git a/py/picca/fitter2/xi.py b/py/picca/fitter2/xi.py index 0e52a9113..6cf688143 100644 --- a/py/picca/fitter2/xi.py +++ b/py/picca/fitter2/xi.py @@ -261,7 +261,6 @@ def broadband(r, mu, deg_r_min=None, deg_r_max=None, if rp_rt: r1 = (r/100)*mu r2 = (r/100)*sp.sqrt(1-mu**2) - r1_pows = sp.arange(deg_r_min, deg_r_max+1, ddeg_r) r2_pows = sp.arange(deg_mu_min, deg_mu_max+1, ddeg_mu) BB = [kwargs['{} ({},{})'.format(name,i,j)] for i in r1_pows From fa2fa2358fa1c6efa982d77383d587c5688cf2ff Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Sat, 19 Jan 2019 10:15:00 +0100 Subject: [PATCH 5/9] apply codacy --- py/picca/fitter2/pk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index 01fa6409b..16f9b6a51 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -241,7 +241,7 @@ def pk_hcd_Rogers2018_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) assert (tracer1['name']=="LYA" or tracer2['name']=="LYA") and (tracer1['name']!=tracer2['name']) - key = "bias_hcd_{}".format(kwargs['name']) + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : @@ -321,7 +321,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias_gamma = kwargs["bias_gamma"] bias_prim = kwargs["bias_prim"] lambda_uv = kwargs["lambda_uv"] - + W = sp.arctan(k*lambda_uv)/(k*lambda_uv) key = "bias_hcd_{}".format(kwargs['name']) From 56d24859b19c387c5e93971a27782ee8d33bb28b Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Sat, 19 Jan 2019 11:08:41 +0100 Subject: [PATCH 6/9] codacy --- py/picca/fitter2/pk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index 16f9b6a51..ecb09ba4c 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -149,7 +149,7 @@ def pk_hcd_Rogers2018_uv(k, pk_lin, tracer1, tracer2, **kwargs): beta2 = beta2/(1 + bias_gamma/bias2*W/(1 + bias_prim*W)) bias2 = bias2 + bias_gamma*W/(1+bias_prim*W) - key = "bias_hcd_{}".format(kwargs['name']) + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] else : @@ -321,7 +321,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias_gamma = kwargs["bias_gamma"] bias_prim = kwargs["bias_prim"] lambda_uv = kwargs["lambda_uv"] - + W = sp.arctan(k*lambda_uv)/(k*lambda_uv) key = "bias_hcd_{}".format(kwargs['name']) From 49df95fbef5d68826dcbbb590eba444ca9357c6e Mon Sep 17 00:00:00 2001 From: VictoriaSerret Date: Sat, 19 Jan 2019 11:18:57 +0100 Subject: [PATCH 7/9] codacy --- py/picca/fitter2/pk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index ecb09ba4c..314ccb5f8 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -320,8 +320,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias_gamma = kwargs["bias_gamma"] bias_prim = kwargs["bias_prim"] - lambda_uv = kwargs["lambda_uv"] - + lambda_uv = kwargs["lambda_uv"] W = sp.arctan(k*lambda_uv)/(k*lambda_uv) key = "bias_hcd_{}".format(kwargs['name']) From f52ddaec0d3808f8bc870118970a202ca7d4c052 Mon Sep 17 00:00:00 2001 From: londumas Date: Sat, 19 Jan 2019 07:07:12 -0700 Subject: [PATCH 8/9] remove trailing space --- py/picca/fitter2/pk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index 314ccb5f8..2f3be2fae 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -65,7 +65,7 @@ def pk_hcd_Rogers2018(k, pk_lin, tracer1, tracer2, **kwargs): """ bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) - + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] @@ -148,7 +148,7 @@ def pk_hcd_Rogers2018_uv(k, pk_lin, tracer1, tracer2, **kwargs): beta2 = beta2/(1 + bias_gamma/bias2*W/(1 + bias_prim*W)) bias2 = bias2 + bias_gamma*W/(1+bias_prim*W) - + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] @@ -240,7 +240,7 @@ def pk_hcd_cross(k, pk_lin, tracer1, tracer2, **kwargs): def pk_hcd_Rogers2018_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias1, beta1, bias2, beta2 = bias_beta(kwargs, tracer1, tracer2) assert (tracer1['name']=="LYA" or tracer2['name']=="LYA") and (tracer1['name']!=tracer2['name']) - + key = "bias_hcd_{}".format(kwargs['name']) if key in kwargs : bias_hcd = kwargs[key] @@ -320,7 +320,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias_gamma = kwargs["bias_gamma"] bias_prim = kwargs["bias_prim"] - lambda_uv = kwargs["lambda_uv"] + lambda_uv = kwargs["lambda_uv"] W = sp.arctan(k*lambda_uv)/(k*lambda_uv) key = "bias_hcd_{}".format(kwargs['name']) From 315923f17d43b50112d4bb084e665326f8e92227 Mon Sep 17 00:00:00 2001 From: londumas Date: Sat, 19 Jan 2019 07:14:42 -0700 Subject: [PATCH 9/9] remove commit changing spaces --- py/picca/fitter2/pk.py | 1 + py/picca/fitter2/xi.py | 1 + 2 files changed, 2 insertions(+) diff --git a/py/picca/fitter2/pk.py b/py/picca/fitter2/pk.py index 2f3be2fae..aa205f6a1 100644 --- a/py/picca/fitter2/pk.py +++ b/py/picca/fitter2/pk.py @@ -321,6 +321,7 @@ def pk_hcd_Rogers2018_uv_cross(k, pk_lin, tracer1, tracer2, **kwargs): bias_gamma = kwargs["bias_gamma"] bias_prim = kwargs["bias_prim"] lambda_uv = kwargs["lambda_uv"] + W = sp.arctan(k*lambda_uv)/(k*lambda_uv) key = "bias_hcd_{}".format(kwargs['name']) diff --git a/py/picca/fitter2/xi.py b/py/picca/fitter2/xi.py index 6cf688143..0e52a9113 100644 --- a/py/picca/fitter2/xi.py +++ b/py/picca/fitter2/xi.py @@ -261,6 +261,7 @@ def broadband(r, mu, deg_r_min=None, deg_r_max=None, if rp_rt: r1 = (r/100)*mu r2 = (r/100)*sp.sqrt(1-mu**2) + r1_pows = sp.arange(deg_r_min, deg_r_max+1, ddeg_r) r2_pows = sp.arange(deg_mu_min, deg_mu_max+1, ddeg_mu) BB = [kwargs['{} ({},{})'.format(name,i,j)] for i in r1_pows