CosmoWAP 0.0.2__tar.gz → 0.0.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. {cosmowap-0.0.2 → cosmowap-0.0.3}/PKG-INFO +1 -1
  2. {cosmowap-0.0.2 → cosmowap-0.0.3}/pyproject.toml +1 -1
  3. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/RR2.py +12 -6
  4. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/main.py +0 -21
  5. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmowap.egg-info/PKG-INFO +1 -1
  6. {cosmowap-0.0.2 → cosmowap-0.0.3}/LICENSE.txt +0 -0
  7. {cosmowap-0.0.2 → cosmowap-0.0.3}/README.md +0 -0
  8. {cosmowap-0.0.2 → cosmowap-0.0.3}/setup.cfg +0 -0
  9. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/__init__.py +0 -0
  10. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/GR0.py +0 -0
  11. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/GR1.py +0 -0
  12. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/GR2.py +0 -0
  13. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/GR_0.py +0 -0
  14. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/GR_1.py +0 -0
  15. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/GR_2.py +0 -0
  16. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/PNG_terms.py +0 -0
  17. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/RR1.py +0 -0
  18. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/RR_1.py +0 -0
  19. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/WA1.py +0 -0
  20. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/WA2.py +0 -0
  21. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/WARR.py +0 -0
  22. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/WA_1.py +0 -0
  23. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/WA_2.py +0 -0
  24. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/WSGR.py +0 -0
  25. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/__init__.py +0 -0
  26. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/bk/cov.py +0 -0
  27. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/data_library/SKAO1Data.txt +0 -0
  28. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/data_library/SKAO2Data.txt +0 -0
  29. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/data_library/snr_surveyparams.txt +0 -0
  30. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/integrate.py +0 -0
  31. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/peak_background_bias.py +0 -0
  32. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/pk/Pk_0.py +0 -0
  33. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/pk/Pk_WS.py +0 -0
  34. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/pk/Pk_WSGR.py +0 -0
  35. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/pk/__init__.py +0 -0
  36. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/survey_params.py +0 -0
  37. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmo_wap/useful_funcs.py +0 -0
  38. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmowap.egg-info/SOURCES.txt +0 -0
  39. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmowap.egg-info/dependency_links.txt +0 -0
  40. {cosmowap-0.0.2 → cosmowap-0.0.3}/src/cosmowap.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cosmowap
3
- Version: 0.0.2
3
+ Version: 0.0.3
4
4
  Summary: package for computing power spectra and bispectra
5
5
  Author-email: Chris Addis <c.l.j.addis@qmul.ac.uk>
6
6
  License: MIT
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "cosmowap"
7
- version = "0.0.2"
7
+ version = "0.0.3"
8
8
  authors = [
9
9
  { name="Chris Addis", email="c.l.j.addis@qmul.ac.uk" },
10
10
  ]
@@ -3,9 +3,12 @@ import numpy as np
3
3
 
4
4
  #1st order terms
5
5
  class RR2:
6
- def l0(params,derivs,r=0,s=0):
7
- k1,k2,k3,theta,Pk1,Pk2,Pk3,Pkd1,Pkd2,Pkd3,Pkdd1,Pkdd2,Pkdd3,d,K,C,f,D1,b1,b2,g2 = params
8
- fd,Dd,gd2,bd2,bd1,fdd,Ddd,gdd2,bdd2,bdd1 = derivs
6
+ def l0(cosmo_functions,k1,k2,k3=None,theta=None,zz=0,r=0,s=0,nonlin=False,growth2=False):
7
+
8
+ #get generic cosmology parameters
9
+ k1,k2,k3,theta,Pk1,Pk2,Pk3,Pkd1,Pkd2,Pkd3,Pkdd1,Pkdd2,Pkdd3,d,K,C,f,D1,b1,b2,g2 = cosmo_functions.get_params(k1,k2,k3,theta,zz,nonlin=nonlin,growth2=growth2)
10
+
11
+ fd,Dd,gd2,bd2,bd1,fdd,Ddd,gdd2,bdd2,bdd1 = cosmo_funcs.get_derivs(zz)
9
12
 
10
13
  st = np.sin(theta)
11
14
  ct= np.cos(theta)
@@ -16,9 +19,12 @@ class RR2:
16
19
 
17
20
  return np.sqrt((4*np.pi))*(perm12+perm13+perm23)
18
21
 
19
- def l2(params,derivs,r=0,s=0):
20
- k1,k2,k3,theta,Pk1,Pk2,Pk3,Pkd1,Pkd2,Pkd3,Pkdd1,Pkdd2,Pkdd3,d,K,C,f,D1,b1,b2,g2 = params
21
- fd,Dd,gd2,bd2,bd1,fdd,Ddd,gdd2,bdd2,bdd1 = derivs
22
+ def l2(cosmo_functions,k1,k2,k3=None,theta=None,zz=0,r=0,s=0,nonlin=False,growth2=False):
23
+
24
+ #get generic cosmology parameters
25
+ k1,k2,k3,theta,Pk1,Pk2,Pk3,Pkd1,Pkd2,Pkd3,Pkdd1,Pkdd2,Pkdd3,d,K,C,f,D1,b1,b2,g2 = cosmo_functions.get_params(k1,k2,k3,theta,zz,nonlin=nonlin,growth2=growth2)
26
+
27
+ fd,Dd,gd2,bd2,bd1,fdd,Ddd,gdd2,bdd2,bdd1 = cosmo_funcs.get_derivs(zz)
22
28
 
23
29
  st = np.sin(theta)
24
30
  ct= np.cos(theta)
@@ -61,27 +61,6 @@ class CosmoWAP:
61
61
 
62
62
  #setup surveys and compute all bias params including for multi tracer case...
63
63
  self = self.setup_survey(survey_params, compute_bias, cosmo_functions)
64
-
65
- # get bias funcs for given surveys
66
- if len(survey_params) == 1:
67
- survey_params = survey_params[0]
68
-
69
- if compute_bias:
70
- print("Computing bias params...")
71
- self.survey = PBBias(cosmo_functions)
72
- self.survey = SurveyFunctions(survey_params,False)
73
- else:
74
- self.survey = SurveyFunctions(survey_params)
75
-
76
- try survey1 = survey_params[1]:
77
- if compute_bias:
78
- print("Computing bias params...")
79
- self.survey1 = PBBias(cosmo_functions,"survey1")
80
- self.survey1 = SurveyFunctions(survey1,False)
81
- else:
82
- self.survey1 = SurveyFunctions(survey1)
83
- except:
84
- self.survey1 = self.survey
85
64
 
86
65
  #get ranges of cross survey
87
66
  z_min = max([self.survey.z_survey[0],self.survey1.z_survey[0]])
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cosmowap
3
- Version: 0.0.2
3
+ Version: 0.0.3
4
4
  Summary: package for computing power spectra and bispectra
5
5
  Author-email: Chris Addis <c.l.j.addis@qmul.ac.uk>
6
6
  License: MIT
File without changes
File without changes
File without changes