Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
867e33c
add darkemulator.py
RyoTerasawa Nov 5, 2023
0df32e9
add darkemulator mass function
RyoTerasawa Nov 5, 2023
a37dcca
Linting
RyoTerasawa Nov 6, 2023
efcdc7f
delete darkemulator.py
RyoTerasawa Nov 6, 2023
2ee5ba5
add dependency on dark_emulator
RyoTerasawa Nov 6, 2023
ad83f2a
Update environment.yml
RyoTerasawa Nov 6, 2023
a691491
Merge pull request #1141 from LSSTDESC/master
RyoTerasawa Dec 4, 2023
9b7450d
Merge remote-tracking branch 'origin/master' into SSC
RyoTerasawa Mar 10, 2024
e43186e
Merge pull request #1166 from LSSTDESC/master
RyoTerasawa Mar 10, 2024
5f131cb
Local updates
YueNan-c Jun 3, 2024
273c214
Local updates
YueNan-c Jun 3, 2024
dcc98c6
Update test_pkresponse.py
YueNan-c Jun 3, 2024
26b4aa8
Add files via upload
YueNan-c Jun 3, 2024
43d5eb5
Delete benchmarks/test_ssc_terasawa_accuracy.py
YueNan-c Jun 3, 2024
f76b69f
Merge branch 'master' into SSC
damonge Jun 18, 2024
4b5f3a6
try bumping python
damonge Jun 18, 2024
a382551
try george in conda
damonge Jun 18, 2024
5f8d35d
Merge branch 'master' into SSC
damonge Jun 18, 2024
ca3dcd9
add unit test and benchmark test
RyoTerasawa Jun 22, 2024
0341150
lint
RyoTerasawa Jun 22, 2024
12fe1d1
Merge branch 'master' into SSC
RyoTerasawa Dec 1, 2024
a25862e
Add References to the equations
RyoTerasawa Dec 1, 2024
08af485
switch to MassFuncNishimichi19
RyoTerasawa Dec 1, 2024
46e92de
add dependency to extra_parameters
RyoTerasawa Dec 1, 2024
d4a21ca
make sure the cosmology object is exactly the same
RyoTerasawa Dec 1, 2024
f7347fe
create pkresponse.npz
RyoTerasawa Dec 1, 2024
896f812
update benchmark
RyoTerasawa Dec 2, 2024
59ea6ea
add documentation
RyoTerasawa Dec 3, 2024
a205e5e
make utility functions private and add unit tests for them
RyoTerasawa Dec 3, 2024
de64ba3
update test_pkresponse.py
RyoTerasawa Dec 3, 2024
1928d7c
lint
RyoTerasawa Dec 3, 2024
2925dac
switched to halo model integral
RyoTerasawa Dec 8, 2024
2f5417a
Merge pull request #1217 from LSSTDESC/master
RyoTerasawa Dec 8, 2024
b26134a
rerun Github jobs
RyoTerasawa Feb 10, 2025
937bf8f
Merge remote-tracking branch 'origin/SSC' into SSC
RyoTerasawa Feb 10, 2025
f79e4c8
change to Miniforge3
RyoTerasawa Feb 10, 2025
3ed8434
Update ci.yml
RyoTerasawa Feb 12, 2025
d0e7fbe
Merge pull request #1225 from LSSTDESC/master
RyoTerasawa Feb 13, 2025
03845c0
Merge remote-tracking branch 'origin/SSC' into SSC
RyoTerasawa Mar 8, 2025
fdd1a9f
update benchmark
RyoTerasawa Mar 8, 2025
4a9e8bb
add comments in benchmark
RyoTerasawa Mar 12, 2025
45d8c0f
Merge pull request #1239 from LSSTDESC/master
RyoTerasawa Apr 4, 2025
9f1d1d7
update pkresponse.py
RyoTerasawa Apr 29, 2025
83b42c1
Merge remote-tracking branch 'origin/SSC' into SSC
RyoTerasawa Apr 29, 2025
1bb5f5c
dealt with coveralls
RyoTerasawa Apr 29, 2025
8ae5708
update test_pkresponse.py
RyoTerasawa Apr 29, 2025
9a919cf
update pkresponse.py
RyoTerasawa Apr 29, 2025
44d6c4f
update CCLWarning import
RyoTerasawa Apr 29, 2025
6345bd0
update pkresponse.py
RyoTerasawa Apr 29, 2025
6580ccb
Make wanings into ValueError
RyoTerasawa May 3, 2025
053a807
Merge pull request #1245 from LSSTDESC/master
RyoTerasawa May 3, 2025
3ad0df1
lint
RyoTerasawa May 3, 2025
2f8fbba
Merge remote-tracking branch 'origin/SSC' into SSC
RyoTerasawa May 3, 2025
ff8152d
re-add lk_arr and a_arr options
RyoTerasawa Jun 19, 2025
fd24b45
update spline
RyoTerasawa Jun 19, 2025
9a22ba4
renamed module and functions
RyoTerasawa Jul 3, 2025
dc930fa
fix typo
RyoTerasawa Jul 3, 2025
3d8f651
add docs for khmin
Jul 30, 2025
c06ec05
Merge branch 'SSC' of https://github.com/LSSTDESC/CCL into SSC
YueNan-c May 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .github/environment.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,6 @@ tests/benchmark/codes/.ipynb_checkpoints/*

# notebook checkpoints
benchmarks/data/codes/.ipynb_checkpoints/*
benchmarks/test_ssc_terasawa_accuracy.py
pyccl/__init__.py
benchmarks/test_ssc_terasawa_accuracy.py
41 changes: 41 additions & 0 deletions benchmarks/data/Fig4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
0.01256637 3.224893 2.1570355
0.01777153 3.219759 2.271651
0.02176559 3.217178 2.3583743
0.02750596 3.216398 2.4660706
0.0307812 3.219064 2.5157458
0.0370831 3.209114 2.555767
0.04111144 3.205895 2.5446517
0.04644893 3.203159 2.4978731
0.05282921 3.21045 2.4520426
0.05926639 3.195566 2.4340882
0.06642477 3.198577 2.5031177
0.0747433 3.200992 2.6455037
0.08421239 3.205414 2.7708972
0.09469034 3.226319 2.7646918
0.1059869 3.238131 2.6177011
0.1187764 3.238637 2.5634598
0.1332777 3.245067 2.7294425
0.1498589 3.287256 2.8333936
0.1681857 3.331532 2.7376376
0.1889443 3.340198 2.767348
0.212111 3.381067 2.8486717
0.237798 3.425495 2.8379013
0.2668243 3.465537 2.8833716
0.2993631 3.513124 2.908352
0.3358317 3.557004 2.93946
0.3765776 3.599833 2.9663232
0.4224484 3.643651 2.9942566
0.4739281 3.680075 3.016836
0.5318645 3.713066 3.035884
0.5968594 3.7332 3.047054
0.6697705 3.74773 3.053969
0.7515581 3.748289 3.051873
0.8431464 3.733191 3.039886
0.9460552 3.707075 3.019288
1.06148 3.663243 2.9875916
1.190867 3.595632 2.9412489
1.336204 3.511797 2.8820968
1.499246 3.412625 2.8137235
1.682185 3.307403 2.740672
1.887502 3.193688 2.6627996
2.117809 3.086994 2.5877641
19 changes: 19 additions & 0 deletions benchmarks/data/Fig6.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
0.01779928 26911.8104494978 26 55787759.6127307 56499286.4614575 2.2708115
0.03251477 19764.8854464286 96 7954021.87082643 8873723.79433972 2.5124618
0.04821939 13461.8196526228 242 1563566.10089899 1751480.72487479 2.4904215
0.06355376 10815.6962681362 374 647910.341783922 765112.207170602 2.4737425
0.08071725 8172.97633454241 764 188027.334435776 269781.381050931 2.7189057
0.1012865 5687.78694252232 1442 53562.2471945582 89814.1039725 2.6846957
0.1273924 4374.93912360491 2942 16654.368708983 39793.0518113637 2.6569766
0.1603813 3109.81637834821 5866 5855.54439489784 17630.8237877074 2.782291
0.2021667 2290.20343917411 11830 2355.40032414422 9021.53959865057 2.8104493
0.2547376 1686.87256891741 23506 1157.17402807842 4965.7852556975 2.8627482
0.3206741 1269.42911690848 46796 666.711748191464 2888.57970079844 2.9254559
0.4035222 975.176405747768 93122 428.159532402864 1809.39946330757 2.9818604
0.5079783 764.38889015067 186406 277.901263232353 1156.62394354486 3.02749
0.6396373 608.394094196429 372032 175.376258430393 746.390281423641 3.050931
0.8051724 487.749245479911 740728 105.689553281062 473.362815118766 3.045177
1.013564 389.282894335937 1479286 57.5448405237943 285.422626596399 3.001622
1.276023 305.646363504464 2951714 27.2622740890947 158.353863155413 2.9084193
1.606413 233.664604575893 5888614 11.1819110417932 80.3238974586167 2.7734706
2.022342 172.557543610491 11749776 4.07984656653466 37.3959132117498 2.6218504
57 changes: 57 additions & 0 deletions benchmarks/data/Terasawa+2022/Pk_AP.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
0.00628319 4524.15 6514.045 10176.2 18083.199999999997
0.00888577 5454.46 7853.275 12267.55 21796.95
0.0108828 5916.305 8516.96 13300.5 23618.0
0.013753 6279.405000000001 9038.685 14112.55 25049.5
0.0153906 6368.530000000001 9165.235 14305.150000000001 25372.55
0.0185416 6335.389999999999 9116.744999999999 14227.2 25225.800000000003
0.0205557 6213.735000000001 8942.349999999999 13956.849999999999 24754.35
0.0232244 5963.165 8578.195 13378.400000000001 23690.199999999997
0.0264146 5583.54 8029.955 12517.15 22141.550000000003
0.0296332 5165.360000000001 7428.725 11580.45 20486.8
0.0332124 4700.385 6759.395 10535.4 18632.55
0.0373717 4210.71 6056.82 9444.795 16721.949999999997
0.0421062 3736.94 5370.27 8359.765 14747.05
0.0473452 3347.04 4808.68 7481.885 13185.75
0.0529934 3056.575 4391.71 6833.9 12046.7
0.0593882 2823.02 4057.0699999999997 6315.6900000000005 11143.4
0.0666388 2598.7200000000003 3733.3450000000003 5807.57 10230.75
0.0749294 2309.475 3313.545 5142.74 9018.71
0.0840928 1955.06 2807.165 4362.48 7672.18
0.0944721 1593.75 2294.355 3581.6400000000003 6354.65
0.106055 1323.065 1911.0 2999.885 5378.8099999999995
0.118899 1164.31 1681.365 2638.24 4726.75
0.133412 1026.6399999999999 1480.72 2319.38 4150.35
0.149682 843.3405 1223.005 1931.905 3503.0
0.167916 680.023 994.196 1590.8000000000002 2948.01
0.188289 587.0065 860.2425000000001 1382.0500000000002 2581.7700000000004
0.211224 490.10450000000003 722.3395 1170.5749999999998 2218.245
0.236964 398.12850000000003 592.637 974.731 1890.925
0.265932 333.788 499.4835 829.5635 1639.94
0.29843 274.913 416.648 703.7860000000001 1422.71
0.334885 228.82049999999998 350.326 600.9235 1243.28
0.375779 190.047 294.83450000000005 514.9525000000001 1091.075
0.421573 158.18599999999998 248.769 442.90099999999995 963.2545
0.473028 131.8585 210.5755 382.85699999999997 856.0185
0.53074 110.872 179.86950000000002 333.5655 762.9825000000001
0.595434 93.07560000000001 153.74450000000002 291.66700000000003 684.628
0.668102 78.55105 132.072 255.92000000000002 615.2570000000001
0.749623 66.75345 114.15950000000001 225.327 551.439
0.841093 56.946799999999996 99.1489 199.1535 496.3365
0.943751 48.81595 86.55160000000001 176.5915 444.5165
1.0589 42.09115 75.7912 156.65449999999998 396.799
1.18812 36.45295 66.6157 138.9325 352.3555
1.33309 31.7057 58.65945 122.8005 310.63599999999997
1.49573 27.64835 51.6178 108.09899999999999 271.387
1.67825 24.1685 45.3697 94.54485 234.7385
1.88302 21.139 39.72585 82.025 201.17000000000002
2.11277 18.4731 34.61755 70.50675 170.772
2.37057 16.101550000000003 29.959249999999997 59.98865 143.733
2.65984 13.9771 25.70635 50.5489 119.9885
2.98439 12.0566 21.8515 42.16975 99.44135
3.34853 10.3253 18.3899 34.866699999999994 81.9288
3.75711 8.76906 15.32925 28.60105 67.1294
4.21555 7.391245 12.684000000000001 23.3209 54.8287
4.72993 6.206049999999999 10.4572 19.0042 44.80675
5.30706 5.256005 8.699455 15.657399999999999 37.04915
5.95462 4.65238 7.5692 13.51565 32.100300000000004
6.35917 4.54087 7.32144 13.019549999999999 30.97705
23 changes: 23 additions & 0 deletions benchmarks/data/Terasawa+2022/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Totalresp.txt contains the total response to $\delta_b$ at redshift z \sim {1.5,1.0,0.5,0.0}.

The file is formatted as:

Col1: $k[h_f/\mathrm{Mpc}]$ where $h_f = 0.6727$

Col2: total response at z = 1.5 (mean of 10 realizations)

Col3: error of response at z = 1.5 (std of 10 realizations)

Col4: total response at z = 1.0

Col5: error of response at z = 1.0

Col6: total response at z = 0.5

Col7: error of response at z = 0.5

Col8: total response at z = 0.0

Col9: error of response at z = 0.0

Col2-9 are log responses and their error, so they are all dimensionless.
Binary file added benchmarks/data/Terasawa+2022/T_b10_mean_conc.npy
Binary file not shown.
Binary file added benchmarks/data/Terasawa+2022/T_b10_std_conc.npy
Binary file not shown.
Binary file added benchmarks/data/Terasawa+2022/T_h10_mean_conc.npy
Binary file not shown.
Binary file added benchmarks/data/Terasawa+2022/T_h10_std_conc.npy
Binary file not shown.
26 changes: 26 additions & 0 deletions benchmarks/data/Terasawa+2022/Totalresp.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
0.0108828 2.867639231953908 1.2189407851763006 2.8688436592651625 1.2225692104452035 2.870870038421916 1.228287346212318 2.875324901882053 1.2379299796782395
0.0144808 1.8702171450865226 0.7541393670548477 1.8720389090997354 0.7571816061302183 1.8744402268671294 0.7612660116427464 1.8790971729734522 0.7671888710802868
0.0185415 2.3372892528673015 0.38053193383475253 2.3382355088442432 0.38113551475677343 2.339090736103132 0.382240589602013 2.3404953073630295 0.3833622285765932
0.0220569 2.698348987119139 0.6819329539948116 2.6986168728851214 0.6827310428572896 2.6990809568160667 0.6839153610158271 2.7003072411234124 0.6861408116308166
0.0282433 2.3583426230715476 0.39447520083225157 2.357896319725341 0.3944515831413953 2.3573058658447463 0.394375378569615 2.356372749450025 0.3946257828567864
0.0355304 2.455300045726111 0.2585502406578593 2.453647597299187 0.2580716172694723 2.451048441380096 0.2575135746576653 2.446779920356942 0.25652673623530314
0.0450114 2.6307171452255327 0.20554655835865734 2.62873195852901 0.20607795339124854 2.625443743069618 0.20695174530770158 2.6196552133813853 0.20854181034134228
0.0567436 2.4383210538000055 0.13126801667468815 2.436008983437662 0.13237632354300424 2.4325724343048263 0.13411094922973918 2.427232576980344 0.13717193237055333
0.0715163 2.5956538593070206 0.07739921621847926 2.591300280842293 0.07849149315479459 2.583969851613001 0.08038995954717196 2.5713373940068274 0.08348134340673495
0.0903332 2.755246004847513 0.07446124242430582 2.7475288486972107 0.0734029796263616 2.734716436475781 0.07153393665544776 2.7111804007552793 0.0684023900193036
0.113656 2.7139212961723045 0.0665860746048692 2.709383671800075 0.06525586711682423 2.7021457318729496 0.06296480654390028 2.6900106686294016 0.059214927717287175
0.142953 2.682999350267614 0.04166367775542175 2.678506785084339 0.04067616896385025 2.671695648701605 0.03953033656241487 2.662257049272208 0.03775136088613394
0.179818 2.899556777937942 0.04140068264827309 2.8881947713329548 0.040483698183825176 2.8699313914520306 0.03781849323221875 2.838962020941527 0.029805965913498773
0.226261 2.785643411502032 0.02162697478642839 2.7852429136856114 0.019568363888370178 2.7836083243266896 0.017105013199991588 2.779777995152808 0.019086155240631206
0.284909 2.9369064119604347 0.01178052842552949 2.933786438202337 0.012209222775915815 2.9253238733118474 0.014377402900194928 2.903126885521313 0.018221203932366585
0.35879 2.94925142039403 0.011314134681733864 2.9497419333156802 0.011122125168535855 2.945342949635265 0.010806968167632908 2.9283225256493757 0.014676445228035307
0.451732 3.0431512133137266 0.009559604107254968 3.043400925898271 0.009921795979516063 3.031967434371744 0.009733257373354865 2.9862515881871343 0.01254155915773452
0.568619 3.1018221012522584 0.005107607162320858 3.100783995036652 0.007317336059907856 3.0833977365320893 0.009412830463077695 3.0157411021519662 0.014366981004680696
0.715801 3.1921310010433204 0.006525169457635117 3.1771756706796115 0.006898233820919513 3.1375972702691834 0.012798759038556897 3.0202845583133753 0.017600336907324755
0.901188 3.2683486327387534 0.005215667479908845 3.233650341372374 0.005931700885731399 3.1605268593666347 0.0075928948177178615 2.989115273150594 0.018409310998243455
1.13456 3.3431390714643165 0.00612332304192172 3.271016526579345 0.009458001375464766 3.1498355219546545 0.00862243827490046 2.914329889421311 0.020691247599123542
1.42832 3.394851863449147 0.005385097322571368 3.2728905957685597 0.007884254288338407 3.0918489155425215 0.0105082094614988 2.8050394551120013 0.01539094369066491
1.79813 3.4124784791726057 0.0076558176631453135 3.229190363299955 0.006889679463240198 2.9913890381755044 0.008020928725032298 2.671134697108866 0.010369634398644276
2.26372 3.3865131184077697 0.007292026763038742 3.1289700470412054 0.007801135371238502 2.8525970233203917 0.012788947642228111 2.5264651434667806 0.012145851570607838
2.84985 3.3063411064781647 0.007543192848206105 2.985859003348456 0.006613406561061755 2.7005458636521404 0.013682138775157204 2.3851142651456803 0.014047411705111373
3.58775 3.1748263508353523 0.008692763278022313 2.8166112376972983 0.006167878787757466 2.549903158169943 0.01619839740613872 2.2618129356728423 0.020286476091113247
Binary file added benchmarks/data/Terasawa+2022/k_b_conc.npy
Binary file not shown.
Binary file added benchmarks/data/Terasawa+2022/k_h_conc.npy
Binary file not shown.
Binary file added benchmarks/data/pkresponse.npz
Binary file not shown.
6 changes: 6 additions & 0 deletions benchmarks/high_prec_pk_benchmarks.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
"z2 = old_benchmark['z2']"
]
},
{
"attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": []
},
{
"cell_type": "code",
"execution_count": null,
Expand Down
Loading