From 896f812eebf89c501c612cb431c83b3269918d7b Mon Sep 17 00:00:00 2001
From: RyoTerasawa <ryo.terasawa@ipmu.jp>
Date: Mon, 2 Dec 2024 14:51:19 +0000
Subject: [PATCH] update benchmark

---
 benchmarks/data/pkresponse.npz | Bin 10312 -> 10312 bytes
 benchmarks/test_pkresponse.py  |  81 +++++++++++++++++----------------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/benchmarks/data/pkresponse.npz b/benchmarks/data/pkresponse.npz
index 83f903caa5bfc031caa460d26784fdf0eeee16a1..16028f0dbb3fd691fdbfcf4b795538a0ec4560d2 100644
GIT binary patch
delta 2531
zcmXArcRbaNAH~tl$_~*~(y&UR%+JSo$jaVS67__HM@G6|5lNI0GVj$OGhAd{b?sG@
zL>XoDL|h?KN`Aeb-}(ETzuvENUZ>5h&8$R*MEY1bwt;qlq{~LU%rKu5yVQo%hqX`U
zqPkIZ@S5LV+gBKAy+-L!dV>z2;Fg&27NtkZxm<e&aoVHH=CQ#Dc7%%flT+T~<Jv>_
z{N&$bVa_~HMB@+^jeJNiA`hT2JA2?q|6c6V<qga`)s35kCJc`WbfP9X#uSa3vA3Gg
zC^DoIn18GFQ;KjUvT#3mmE>81_V;$w&aCC&wTH2z(pK5H&iR!x<7_HM|NhAfwuyK#
z?-wuD#3EJp@tbzN>-cxB%Bq@K*dJd4^JH=e%4d$5&#wAoLsNwFQR$1wUlO)fS>ujT
zCJi=5o+t2U>+Qm!Buf<RS^0F0OdP{U*EcyVh-jj3LVkk2(jgRzXWe4?ObT-Zujeb(
zh@o(-h~jXN0LFTIVCp9}bQ);?=34m^7KvpWsp+p^%KCC*-^?78_jbFCh|a;?#21Az
zxwDWUYZ_dCn+Xf;);_J3Oeh$aOqJ_rLaB1LF#jwQYW*xsyop#Q+$m4L=67)h4(Cqt
z5z>=Drd&<x&l-nql?tYkK2MPmah|e!Zxha*xaKnE(~9cew-!F0?ZQXr{_*K{=|TPI
zC1*<eOAOi)(FiWRczCp4ul49_tmGuusIK&)tm&f!ecxADvzje&!M7V{kDMF{TGx)+
z250vY^YTsjPbocQzdr;0hu^<W@v24W2>5b}R)%97PKQ*t6yl?(L$XHH2WUmo_9@wu
zflB?<El=w2pqO7lV471bT9u{0D2t20a}NSSd_NHAF1)^&DjA4rN;~48UGv4mUaoKG
zFFjE}DVG@D=Z-^DCVHj)r%;)5E8(QrVTU*V(r9M5n4|Ofogz_jeN5I-e=cvSf#FW#
zpYm7_p$|c4cEm}cy^@Pg7gZcJS?65$Ci39`M_JtVL+fxC=hRk);4;j0>ArRISOCl6
zb^$@od00s^E)RIl1Z!D=7kMi)usF+?)VhrclHH?{CFM*g6Cq?eCeoN-l1{R3dBucI
zW1h!CbS4C&f<tQ-6MFs94fQC0(0CqWbKf`#>iUGh{<v{qDY<T!FkOM$>z^cVov+1n
zRtDulTF)?$<@oOvS|bt~s~){IEjXB%XJSy;hV;W!QIm-d-1o?6X;7dG#WoZ*cF;R9
zkTBlgyfM2Svoynd+6J4ElOEms%Z-8cZkNR+H`QUB?xkrf>naSV-KC3*(~y*E#P@nK
z4{Mh^=B{|($8T%qtdn{f7?S(%@a*>lgh>k>&8V9w^Mn6c+3KHGRB){HOI$|1jIBCr
zXZ+AO-9M|_!xKw#UTDYfazi5X21!?Y-6<U6sJhj3(GJO#6yKU+3lywV3_BuejMBH*
z`RZ=zV#I>G=D>hD3Tft+C+aEUz?nen?bZ8GC}rK1OSRka{8frRV_XQG<eoj#DCNKy
z(Vubkn^|xy<^W7QTmpxzB?=EQ58cLWD_*&Cpj5@8!8XQp1r2E~l0Y#NE)_j-*)PWg
zalz9TGzJq?w4}F^5}42mYn+pRP|S-)HGeB&f<E>%ZU2V}_FBew;!S6uq$`t|EI0`q
zQzr++UB|)9XdOw8<^S5ray7hRKh0#rF*ZVRf2feE%v0<xu>E1gZ-G(~{tZ@7k71~G
zuKo+(c(iM|aI~yH2}Pvu_j5gWz>Fogkdi)sJW!{ut@hat13aRtyCN-7XNkG}@&^Z;
z4=DDcw%MZXZ$E>stvdL9clyjqkPfPKbE$hIs^Ec9^|yC2WwAuJdVc2tIRcg5wh&U>
z2heAUMC()BjW_u>ScZy-W5lt<$)0!;+6G+b@T+ITO^Njd9!FQfETBOC%Ap1L^-7a(
zHv2OqIjG%u+%g6$K^jzvTrQk>pHWE6EW_z>Ua11_83?ObyP!42gfB;I(j@FZz#f{a
zYh+A6s7UPKFexC~;EK&aoz%lRP<PtZ_nJ}&S7Zx|ljsHD8|nLzC3y(0tase(@T3!L
zGh^hx(0V{(xPm>L(FCkt!rryi7r<1yl((P!pPalp)z>W#uA65Xh1uSN%Z$IH-u0!x
z@63A-Ek)y?DX;3(nRCHVK5o{Pz!L@a$CW9(1ciW;R@^V>k#6uKuIs)tzc-Agsqr;P
zh5~1fxno&v6^^k649Ml^pjYil??rPp98y<abv2B^?At}{U%cYctR<=5DbNV}J5(Pg
zyZK^XUGG7TTq_I=9{66GZ;VXGVPy{`6a4OSyda!zi1FOtr;7{~ak#s{i3rYC#1IFu
zamo!Dblo_`o!_tnBkg9ZRTsCR@4KlQ**81z=H!UH$G9lw&usc`y_+2u*_)LmS6MLa
zg+*6(-dEt(?ulEnp9R;S74Fi}L(s<_zuw;a9Zc~koW8Bu2S&@=Gf&!#1KBlyWsAbU
zKyx1YntFa5bk3e5yc+D<fnA94(TLm$JlUg{GJi0DwQ0_XvG*Bh^(Ty4&6GgC``@2!
zBObsR5pU8Dj{CsFrdUXic>`=~{ncSl8-bPI+G3Sx28!pI;k_<2a37Z5DQQv(%RhC-
z!?rzwcZ+6{zAD*pys{vbnwkwe*T<MBI3$CJ7?J&ynwJjC=k;0W6;WXI_Rg<MG64{=
zRfU`z8xF4i{zkHm-cZDGqI8w>0_aU0b(}Yd0{+nRi{HY_@#{<R(&u7FG3nnGyN&q=
zv0?q-16u8MbZ(ndxUeA>qi;_5C5a>YMso>Q2YcfQ2Sb(2Hgj~>-W0v1N*@P^=?@pY
z2eff><dc+|WGxIQY4dMBD}~Y=Zi*obQh4KDXRKqU1oCv;-QBZ$BL+tYlL9>jQS0h(
z-~25hoOhxIPj>U5YNvFpJLh-Uv+Ib@=;ShVZ2rkE$o>gDg(O;5zI*_l`rreh2~8lU
zP*-*OM+X!IsZ734ZUJJDF<is>@FmFmo%tB3It&!krJO18Uf}ZLQ|;&M1^2$4#wzK}
zaH{j-2|D>6#Gc~iXe}s#l)pII4^y*XI(1>5^fnF*^tg4@7*Q}~SImn(oxo*7{wkBw
z2@#GbXD>T3Ab88+#?Orn5Ver#5?ojejJj?Kf5AL6U|XJTNi?EDVAhocGAR>m-nS4w
zsu?hKaj@df<3tdM7c1pHd=sj~Uhf(H76S)aOrytcgo5)#B+ZdM2xuW2OIIoG5H6^x
c`<nMA%}IzX{NIsF9ND8x`fupO_8w&YACVERWB>pF

delta 1313
zcmYk+dpOg390zb)bICX%<yIQgD%VBrSjG1fl}c{0T16h0Zk$*>bUCACrwhqlk)jok
z2RR<IjyQI@VQytH6qROM949{}Lq&D=bpAP?KR*AwKmWa+_ovmr)xX+~Kxp^>Bo;Uk
zw%|FLYwP;Idv`%BHTGy-WFL&_GgqEpJ^)Q+-1f3Z@4zK5>K;2x2BhJ_IVn*A!@G=k
zHz?o3*b|{JTz3QtEj`@zM}|Q(<dsyn?LF-MAS)kqkwJG-1P%Y{4FugP9T1zmgd*#W
z`%F|4h{L-*JtGrCoQDIlUnSyzbLKlcQu|{_pL|3gE3bzL5jGl}TLTold0N?cB^)Yp
zyBlO(3Vd5?U>D~OP%U;O3&l5KpGC?a4wUN<wq(@wXh;@R-Y{H>3%CNT?43Ee&cDIn
zBFpOjx?h2*^_N4#;0Z7`g}dge!;sp@cWl}k0@)sx0_q4S05TbZm04|DLDD)#GndhU
z>bCI~ThkG)z71s#;7GvWCUiU$8^b~0#ivl7HrTFLa!<{FLo8jFEMoaIDz75fegCXP
zcON>6Yx^hACRf#bTMvd3S{lfD0u1TQ-(woiV(8p6!^nbW4ABdwgX_f@lFd0c<Z|*b
zbnM^*tTJs3t&K>H5z+oe%X$q$KT71N)c0w$rF$nxkDo=tbP3>ux3%mB`at0jvy4CZ
z8d!HW`;|CJ;T3^A;&Fcnx{IE%dgA23`u(T)loSP6>*mg!PF8?v!C@^|Cpr9b!#352
zEd@tIiapzW0B$8(O>nk$_khEDDmT@z8$84dGkQtSAz2wmI&I$shDUkb>vA80j#f<4
zbM6BmrqQh^^VOiZvred)S^*`Jo5Ah@B|yD4)}mO#gR`r=1)f<q;GC7N_vGGOaIWl|
z3GK{)pI6W5gw0+C7P&1wgP8=E`i_l+D^CMKxq>sh;m=r@`sBU7i5>~uc7qm!hJA1)
z!KxJ>;s^SKsAPjho)F$#HJf&g27^<D77Vg2Opzb2pe0*CYt8|NX{-^X&2SejcGCoG
zI^rZ#JddUj&ef?+g)}-Q??;s>k@9Qb{*K}abiqc)ZBB%tAT3@%L=A>2Z*y90T-7$N
zyWGpH)WJOasUGhIhDeM^lNvS6<HqX?V$?J~1HJKlHBA+h-2ALtj_fuV+bkdI0F}iP
z(h)*86fo$#NaJ3}j`z!3-`EdpY`)c$&c6ks>mKuiF;aLF&l=LVkU^&N7tyG_9FkdI
zg00=<5XISjF*TGZgYB$POtj=3v{pQ7-gNU7;1!n{TXH4v+TQ4^$-*v3slHI`$?Jfq
z=#<VX^G0}~-GH;66~cI5X0TUSEj;IjCtkFz2B|kCBWHg()F;W^>Q59yG%is?`)v_O
z)A(jlS^41G8v*w+b6_$*-bF7b9XRAsCwsfOOYlOcfM1by9-h3cjb=5Rf<USZ^V{%o
zsElMd9{Lat=a&1^HqPz^uL69c+}a1md#MHN+Rae9)X(eW_jM37N&2iAuo^zDez}vE
zZw3`(C-wdbHH5&V!UKH{1n4vq2@|AqXunaJwQslzv70hp7hY0EAYK1uyJpfS(D@zP
z?k6^3=uFAgx^g~-wy&u<qL{|er;6LhR<vN~?9x3p^ezmIhe#+YHH}$<r>I9wGkvvL
zBU??gDbiM(qi&7A_X2{0#(!g_QCYk*P~bz{ju(6-=HvdiLW~lPf4sq*K?;rV<IHpw
G756U&CT*Mm

diff --git a/benchmarks/test_pkresponse.py b/benchmarks/test_pkresponse.py
index 6a98fa294..087268e10 100644
--- a/benchmarks/test_pkresponse.py
+++ b/benchmarks/test_pkresponse.py
@@ -1,10 +1,7 @@
 import numpy as np
-import os
 from pyccl.pkresponse import Pmm_resp, darkemu_Pgm_resp, darkemu_Pgg_resp
 import pyccl as ccl
 
-data_directory_path = os.path.expanduser("benchmarks/data/SSC-Terasawa24/")
-
 # Set cosmology
 Om = 0.3156
 ob = 0.02225
@@ -26,31 +23,16 @@
 )
 
 
-# Construct the full path for each data file (z=0)
-k_data_path = os.path.join(data_directory_path, "k_h.npy")
-k_data_mm_path = os.path.join(data_directory_path, "k_h_mm.npy")
-Pmm_resp_data_path = os.path.join(data_directory_path, "Pmm_resp_z0.npy")
-Pmm_resp_err_data_path = os.path.join(
-    data_directory_path, "Pmm_resp_err_z0.npy"
-)
-Pgm_resp_data_path = os.path.join(data_directory_path, "Pgm_resp_z0.npy")
-Pgm_resp_err_data_path = os.path.join(
-    data_directory_path, "Pgm_resp_err_z0.npy"
-)
-Pgg_resp_data_path = os.path.join(data_directory_path, "Pgg_resp_z0.npy")
-Pgg_resp_err_data_path = os.path.join(
-    data_directory_path, "Pgg_resp_err_z0.npy"
-)
-
 # Load data
-k_data = np.load(k_data_path)
-k_data_mm = np.load(k_data_mm_path)
-Pmm_resp_data = np.load(Pmm_resp_data_path) / h**3
-Pmm_resp_err_data = np.load(Pmm_resp_err_data_path) / h**3
-Pgm_resp_data = np.load(Pgm_resp_data_path) / h**3
-Pgm_resp_err_data = np.load(Pgm_resp_err_data_path) / h**3
-Pgg_resp_data = np.load(Pgg_resp_data_path) / h**3
-Pgg_resp_err_data = np.load(Pgg_resp_err_data_path) / h**3
+pkresponse_data = np.load("benchmarks/data/pkresponse.npz")
+k_data = pkresponse_data["k_h"]
+k_data_mm = pkresponse_data["k_h_mm"]
+Pmm_resp_data = pkresponse_data["Pmm_resp"] / h**3
+Pmm_resp_err_data = pkresponse_data["Pmm_resp_err"] / h**3
+Pgm_resp_data = pkresponse_data["Pgm_resp"] / h**3
+Pgm_resp_err_data = pkresponse_data["Pgm_resp_err"] / h**3
+Pgg_resp_data = pkresponse_data["Pgg_resp"] / h**3
+Pgg_resp_err_data = pkresponse_data["Pgg_resp_err"]/ h**3
 
 
 # HOD parameters
@@ -82,10 +64,10 @@
 # Define input parameters for pkresponse functions
 log10Mh_min = np.log10(2.6e12)
 log10Mh_max = 15.9
-a_arr = np.array([1.0])
-indx = (k_data > 1e-2) & (k_data < 4)
+a_arr = np.array([1.0, 0.64516129, 0.49382716, 0.40387722])
+indx = (k_data > 1e-2) & (k_data < 3)
 lk_arr = np.log(k_data[indx] * h)  # Using loaded k_data
-indx_mm = (k_data_mm > 1e-2) & (k_data_mm < 4)
+indx_mm = (k_data_mm > 1e-2) & (k_data_mm < 3)
 lk_arr_mm = np.log(k_data_mm[indx_mm] * h)  # Using loaded k_data
 
 # Generate power spectrum responses using pkresponse.py functions
@@ -121,23 +103,44 @@
 # Compare the generated responses with simulation data
 def test_pmm_resp():
     assert np.allclose(
-        Pmm_resp_data[indx_mm],
-        generated_Pmm_resp,
-        atol=6 * Pmm_resp_err_data[indx_mm],
+        Pmm_resp_data[0, indx_mm],
+        generated_Pmm_resp[0],
+        atol=10 * Pmm_resp_err_data[0, indx_mm],
+    )
+
+def test_pmm_resp2():
+    assert np.allclose(
+        Pmm_resp_data[1:, indx_mm],
+        generated_Pmm_resp[1:],
+        atol=60 * Pmm_resp_err_data[1:, indx_mm],
     )
 
 
 def test_pgm_resp():
     assert np.allclose(
-        Pgm_resp_data[indx],
-        generated_Pgm_resp,
-        atol=2 * Pgm_resp_err_data[indx],
+        Pgm_resp_data[:2, indx],
+        generated_Pgm_resp[:2],
+        atol=15 * Pgm_resp_err_data[:2, indx],
+    )
+
+def test_pgm_resp2():
+    assert np.allclose(
+        Pgm_resp_data[2:, indx],
+        generated_Pgm_resp[2:],
+        atol=50 * Pgm_resp_err_data[2:, indx],
     )
 
 
 def test_pgg_resp():
     assert np.allclose(
-        Pgg_resp_data[indx],
-        generated_Pgg_resp,
-        atol=3 * Pgg_resp_err_data[indx],
+        Pgg_resp_data[:2, indx],
+        generated_Pgg_resp[:2],
+        atol=4 * Pgg_resp_err_data[:2, indx],
     )
+
+def test_pgg_resp2():
+    assert np.allclose(
+        Pgg_resp_data[2:, indx],
+        generated_Pgg_resp[2:],
+        atol=15 * Pgg_resp_err_data[2:, indx],
+    )
\ No newline at end of file