mirror of
https://github.com/Findus23/halo_comparison.git
synced 2024-09-19 16:03:50 +02:00
Merge branch 'main' of github.com:Findus23/halo_comparison
This commit is contained in:
commit
a91d31fb23
9 changed files with 164 additions and 116 deletions
|
@ -4,7 +4,9 @@ from enum import Enum
|
|||
from pathlib import Path
|
||||
from typing import List
|
||||
|
||||
import h5py
|
||||
import numpy as np
|
||||
import pandas as pd
|
||||
from matplotlib import pyplot as plt
|
||||
from matplotlib.axes import Axes
|
||||
from matplotlib.colors import LogNorm
|
||||
|
@ -13,7 +15,7 @@ from matplotlib.figure import Figure
|
|||
from cic import cic_from_radius
|
||||
from halo_mass_profile import halo_mass_profile
|
||||
from paths import auriga_dir, richings_dir
|
||||
from readfiles import read_file, read_halo_file
|
||||
from readfiles import read_file, read_halo_file, ParticlesMeta
|
||||
from utils import read_swift_config
|
||||
|
||||
|
||||
|
@ -46,7 +48,7 @@ ax2.set_ylabel("density [$\\frac{10^{10} \\mathrm{M}_\\odot}{Mpc^3}$]")
|
|||
|
||||
part_numbers = []
|
||||
|
||||
reference_file = Path("auriga_reference.pickle")
|
||||
reference_file = Path(f"auriga_reference_{mode}.pickle")
|
||||
|
||||
|
||||
@dataclass
|
||||
|
@ -69,12 +71,6 @@ for i, dir in enumerate(sorted(dirs)):
|
|||
print(levelmin, levelmin_TF, levelmax)
|
||||
# if levelmax != 12:
|
||||
# continue
|
||||
Xc_adrian = 56.50153741810241
|
||||
Yc_adrian = 49.40761085700951
|
||||
Zc_adrian = 49.634393647291695
|
||||
Xc = 58.25576087992683
|
||||
Yc = 51.34632916228137
|
||||
Zc = 51.68749302578122
|
||||
|
||||
input_file = dir / "output_0007.hdf5"
|
||||
if mode == Mode.richings:
|
||||
|
@ -91,23 +87,32 @@ for i, dir in enumerate(sorted(dirs)):
|
|||
# raise ValueError(f"softening length for levelmax {levelmax} should be {ideal_softening_length} "
|
||||
# f"but is {softening_length}")
|
||||
print(input_file)
|
||||
df, particles_meta = read_file(input_file)
|
||||
df_halos = read_halo_file(input_file.with_name("fof_" + input_file.name))
|
||||
# halos = read_velo_halos(dir, veloname="velo_out")
|
||||
# particles_in_halo = df.loc[df["FOFGroupIDs"] == 3]
|
||||
if mode == Mode.richings and is_by_adrian:
|
||||
h = 0.6777
|
||||
with h5py.File(dir / "Richings_object_z0.h5") as f:
|
||||
df = pd.DataFrame(f["Coordinates"][:] / h, columns=["X", "Y", "Z"])
|
||||
particles_meta = ParticlesMeta(particle_mass=1.1503e7 / 1e10)
|
||||
center = np.array([60.7, 29, 64]) / h
|
||||
softening_length = None
|
||||
else:
|
||||
df, particles_meta = read_file(input_file)
|
||||
df_halos = read_halo_file(input_file.with_name("fof_" + input_file.name))
|
||||
# halos = read_velo_halos(dir, veloname="velo_out")
|
||||
# particles_in_halo = df.loc[df["FOFGroupIDs"] == 3]
|
||||
|
||||
halo_id = 1
|
||||
while True:
|
||||
particles_in_halo = df.loc[df["FOFGroupIDs"] == halo_id]
|
||||
if len(particles_in_halo) > 1:
|
||||
break
|
||||
halo_id += 1
|
||||
halo_id = 1
|
||||
while True:
|
||||
particles_in_halo = df.loc[df["FOFGroupIDs"] == halo_id]
|
||||
if len(particles_in_halo) > 1:
|
||||
break
|
||||
halo_id += 1
|
||||
|
||||
halo = df_halos.loc[halo_id]
|
||||
part_numbers.append(len(df) * particles_meta.particle_mass)
|
||||
# halo = halos.loc[1]
|
||||
halo = df_halos.loc[halo_id]
|
||||
part_numbers.append(len(df) * particles_meta.particle_mass)
|
||||
# halo = halos.loc[1]
|
||||
center = np.array([halo.X, halo.Y, halo.Z])
|
||||
log_radial_bins, bin_masses, bin_densities, center = halo_mass_profile(
|
||||
df, halo, particles_meta, plot=False, num_bins=100,
|
||||
df, center, particles_meta, plot=False, num_bins=100,
|
||||
vmin=0.002, vmax=6.5
|
||||
)
|
||||
if is_by_adrian:
|
||||
|
@ -117,7 +122,7 @@ for i, dir in enumerate(sorted(dirs)):
|
|||
|
||||
ax2.loglog(log_radial_bins[:-1], bin_densities, label=str(dir.name), c=f"C{i}")
|
||||
|
||||
if reference_file.exists() and not is_by_adrian and mode == Mode.auriga6:
|
||||
if reference_file.exists() and not is_by_adrian:
|
||||
with reference_file.open("rb") as f:
|
||||
data: List[np.ndarray] = pickle.load(f)
|
||||
ref_log_radial_bins, ref_bin_masses, ref_bin_densities = data
|
||||
|
@ -137,8 +142,7 @@ for i, dir in enumerate(sorted(dirs)):
|
|||
ax.axvline(4 * softening_length, color=f"C{i}", linestyle="dotted")
|
||||
|
||||
X, Y, Z = df.X.to_numpy(), df.Y.to_numpy(), df.Z.to_numpy()
|
||||
print()
|
||||
print(Yc - Yc_adrian)
|
||||
|
||||
# shift: (-6, 0, -12)
|
||||
# if not is_by_adrian:
|
||||
# xshift = Xc - Xc_adrian
|
||||
|
@ -169,8 +173,8 @@ ax2.legend()
|
|||
|
||||
# fig3: Figure = plt.figure(figsize=(9, 9))
|
||||
# axes: List[Axes] = fig3.subplots(3, 3, sharex=True, sharey=True).flatten()
|
||||
fig3: Figure = plt.figure(figsize=(6, 3))
|
||||
axes: List[Axes] = fig3.subplots(1, 2, sharex=True, sharey=True).flatten()
|
||||
fig3: Figure = plt.figure(figsize=(6, 9))
|
||||
axes: List[Axes] = fig3.subplots(3, 2, sharex=True, sharey=True).flatten()
|
||||
|
||||
for result, ax in zip(images, axes):
|
||||
data = 1.1 + result.rho
|
||||
|
@ -185,8 +189,8 @@ fig3.subplots_adjust(right=0.825)
|
|||
cbar_ax = fig3.add_axes([0.85, 0.15, 0.05, 0.7])
|
||||
fig3.colorbar(img, cax=cbar_ax)
|
||||
|
||||
fig1.savefig(Path(f"~/tmp/auriga1_{8}.pdf").expanduser())
|
||||
fig2.savefig(Path(f"~/tmp/auriga2_{8}.pdf").expanduser())
|
||||
fig1.savefig(Path(f"~/tmp/auriga1.pdf").expanduser())
|
||||
fig2.savefig(Path(f"~/tmp/auriga2.pdf").expanduser())
|
||||
fig3.savefig(Path("~/tmp/auriga3.pdf").expanduser())
|
||||
|
||||
plt.show()
|
||||
|
|
|
@ -29,4 +29,5 @@ def find_center(df: pd.DataFrame, center: np.ndarray, initial_radius=1):
|
|||
# plt.scatter(center_history[::, 0], center_history[::, 1], c=range(len(center_history[::, 1])))
|
||||
# plt.colorbar(label="step")
|
||||
# plt.show()
|
||||
print()
|
||||
return center
|
||||
|
|
|
@ -87,8 +87,8 @@ def main():
|
|||
lower_error_limit,
|
||||
upper_error_limit, alpha=.5, linewidth=0, step='post')
|
||||
|
||||
break
|
||||
break
|
||||
# break
|
||||
# break
|
||||
plt.legend()
|
||||
plt.show()
|
||||
|
||||
|
|
|
@ -15,9 +15,8 @@ def V(r):
|
|||
return 4 / 3 * np.pi * r ** 3
|
||||
|
||||
|
||||
def halo_mass_profile(particles: pd.DataFrame, halo: pd.Series,
|
||||
def halo_mass_profile(particles: pd.DataFrame, center: np.ndarray,
|
||||
particles_meta: ParticlesMeta, vmin: float, vmax: float, plot=False, num_bins=30):
|
||||
center = np.array([halo.X, halo.Y, halo.Z])
|
||||
center = find_center(particles, center)
|
||||
positions = particles[["X", "Y", "Z"]].to_numpy()
|
||||
distances = np.linalg.norm(positions - center, axis=1)
|
||||
|
|
23
matplotlibrc
Normal file
23
matplotlibrc
Normal file
|
@ -0,0 +1,23 @@
|
|||
text.usetex: True
|
||||
|
||||
font.family : serif
|
||||
font.serif : Computer Modern Roman
|
||||
font.sans-serif: Computer Modern Sans Serif
|
||||
font.monospace : Computer Modern Typewriter
|
||||
|
||||
axes.axisbelow: False
|
||||
axes.titlesize: 24
|
||||
axes.labelsize: 20
|
||||
|
||||
lines.linewidth: 2
|
||||
|
||||
xtick.labelsize: 16
|
||||
ytick.labelsize: 16
|
||||
xtick.major.size: 10
|
||||
ytick.major.size: 10
|
||||
xtick.minor.size: 5
|
||||
ytick.minor.size: 5
|
||||
xtick.direction: in
|
||||
ytick.direction: in
|
||||
|
||||
legend.fontsize: x-large
|
96
poetry.lock
generated
96
poetry.lock
generated
|
@ -105,7 +105,7 @@ tifffile = ["tifffile"]
|
|||
|
||||
[[package]]
|
||||
name = "kiwisolver"
|
||||
version = "1.4.2"
|
||||
version = "1.4.3"
|
||||
description = "A fast implementation of the Cassowary constraint solver"
|
||||
category = "main"
|
||||
optional = false
|
||||
|
@ -352,7 +352,7 @@ cpu = ["psutil", "mkl"]
|
|||
|
||||
[[package]]
|
||||
name = "setuptools"
|
||||
version = "62.3.2"
|
||||
version = "62.6.0"
|
||||
description = "Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
category = "main"
|
||||
optional = false
|
||||
|
@ -430,7 +430,7 @@ url = "https://github.com/pyvista/pyvista-wheels/raw/main/vtk-9.1.0.dev0-cp310-c
|
|||
[metadata]
|
||||
lock-version = "1.1"
|
||||
python-versions = "^3.9,<3.11"
|
||||
content-hash = "33a9a1ef640e87125af6637b5bb5b154f8e1ef79710d2e5e70300fcb3a41d37e"
|
||||
content-hash = "a3a5bf21de2d4dab0888da26cdfa8a5391b125d5b6f91bc0ce78af1e85c6278c"
|
||||
|
||||
[metadata.files]
|
||||
appdirs = [
|
||||
|
@ -522,49 +522,49 @@ imageio = [
|
|||
{file = "imageio-2.19.3.tar.gz", hash = "sha256:0c9df80e42f2ee68bea92001e7fcf612aa149910efe040eb757f5ce323250ae1"},
|
||||
]
|
||||
kiwisolver = [
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6e395ece147f0692ca7cdb05a028d31b83b72c369f7b4a2c1798f4b96af1e3d8"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0b7f50a1a25361da3440f07c58cd1d79957c2244209e4f166990e770256b6b0b"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3c032c41ae4c3a321b43a3650e6ecc7406b99ff3e5279f24c9b310f41bc98479"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1dcade8f6fe12a2bb4efe2cbe22116556e3b6899728d3b2a0d3b367db323eacc"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0e45e780a74416ef2f173189ef4387e44b5494f45e290bcb1f03735faa6779bf"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d2bb56309fb75a811d81ed55fbe2208aa77a3a09ff5f546ca95e7bb5fac6eff"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:69b2d6c12f2ad5f55104a36a356192cfb680c049fe5e7c1f6620fc37f119cdc2"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:262c248c60f22c2b547683ad521e8a3db5909c71f679b93876921549107a0c24"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-win32.whl", hash = "sha256:1008346a7741620ab9cc6c96e8ad9b46f7a74ce839dbb8805ddf6b119d5fc6c2"},
|
||||
{file = "kiwisolver-1.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:6ece2e12e4b57bc5646b354f436416cd2a6f090c1dadcd92b0ca4542190d7190"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b978afdb913ca953cf128d57181da2e8798e8b6153be866ae2a9c446c6162f40"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f88c4b8e449908eeddb3bbd4242bd4dc2c7a15a7aa44bb33df893203f02dc2d"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e348f1904a4fab4153407f7ccc27e43b2a139752e8acf12e6640ba683093dd96"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c839bf28e45d7ddad4ae8f986928dbf5a6d42ff79760d54ec8ada8fb263e097c"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8ae5a071185f1a93777c79a9a1e67ac46544d4607f18d07131eece08d415083a"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c222f91a45da9e01a9bc4f760727ae49050f8e8345c4ff6525495f7a164c8973"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-win32.whl", hash = "sha256:a4e8f072db1d6fb7a7cc05a6dbef8442c93001f4bb604f1081d8c2db3ca97159"},
|
||||
{file = "kiwisolver-1.4.2-cp37-cp37m-win_amd64.whl", hash = "sha256:be9a650890fb60393e60aacb65878c4a38bb334720aa5ecb1c13d0dac54dd73b"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:8ec2e55bf31b43aabe32089125dca3b46fdfe9f50afbf0756ae11e14c97b80ca"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d1078ba770d6165abed3d9a1be1f9e79b61515de1dd00d942fa53bba79f01ae"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cbb5eb4a2ea1ffec26268d49766cafa8f957fe5c1b41ad00733763fae77f9436"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e6cda72db409eefad6b021e8a4f964965a629f577812afc7860c69df7bdb84a"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b1605c7c38cc6a85212dfd6a641f3905a33412e49f7c003f35f9ac6d71f67720"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81237957b15469ea9151ec8ca08ce05656090ffabc476a752ef5ad7e2644c526"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:240009fdf4fa87844f805e23f48995537a8cb8f8c361e35fda6b5ac97fcb906f"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:240c2d51d098395c012ddbcb9bd7b3ba5de412a1d11840698859f51d0e643c4f"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-win32.whl", hash = "sha256:8b6086aa6936865962b2cee0e7aaecf01ab6778ce099288354a7229b4d9f1408"},
|
||||
{file = "kiwisolver-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:0d98dca86f77b851350c250f0149aa5852b36572514d20feeadd3c6b1efe38d0"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:91eb4916271655dfe3a952249cb37a5c00b6ba68b4417ee15af9ba549b5ba61d"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fa4d97d7d2b2c082e67907c0b8d9f31b85aa5d3ba0d33096b7116f03f8061261"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:71469b5845b9876b8d3d252e201bef6f47bf7456804d2fbe9a1d6e19e78a1e65"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:8ff3033e43e7ca1389ee59fb7ecb8303abb8713c008a1da49b00869e92e3dd7c"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89b57c2984f4464840e4b768affeff6b6809c6150d1166938ade3e22fbe22db8"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffbdb9a96c536f0405895b5e21ee39ec579cb0ed97bdbd169ae2b55f41d73219"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8a830a03970c462d1a2311c90e05679da56d3bd8e78a4ba9985cb78ef7836c9f"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f74f2a13af201559e3d32b9ddfc303c94ae63d63d7f4326d06ce6fe67e7a8255"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-win32.whl", hash = "sha256:e677cc3626287f343de751e11b1e8a5b915a6ac897e8aecdbc996cd34de753a0"},
|
||||
{file = "kiwisolver-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:b3e251e5c38ac623c5d786adb21477f018712f8c6fa54781bd38aa1c60b60fc2"},
|
||||
{file = "kiwisolver-1.4.2-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0c380bb5ae20d829c1a5473cfcae64267b73aaa4060adc091f6df1743784aae0"},
|
||||
{file = "kiwisolver-1.4.2-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:484f2a5f0307bc944bc79db235f41048bae4106ffa764168a068d88b644b305d"},
|
||||
{file = "kiwisolver-1.4.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e8afdf533b613122e4bbaf3c1e42c2a5e9e2d1dd3a0a017749a7658757cb377"},
|
||||
{file = "kiwisolver-1.4.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:42f6ef9b640deb6f7d438e0a371aedd8bef6ddfde30683491b2e6f568b4e884e"},
|
||||
{file = "kiwisolver-1.4.2.tar.gz", hash = "sha256:7f606d91b8a8816be476513a77fd30abe66227039bd6f8b406c348cb0247dcc9"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fd2842a0faed9ab9aba0922c951906132d9384be89690570f0ed18cd4f20e658"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:caa59e2cae0e23b1e225447d7a9ddb0f982f42a6a22d497a484dfe62a06f7c0e"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1d2c744aeedce22c122bb42d176b4aa6d063202a05a4abdacb3e413c214b3694"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:afe173ac2646c2636305ab820cc0380b22a00a7bca4290452e7166b4f4fa49d0"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40240da438c0ebfe2aa76dd04b844effac6679423df61adbe3437d32f23468d9"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21a3a98f0a21fc602663ca9bce2b12a4114891bdeba2dea1e9ad84db59892fca"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:51078855a16b7a4984ed2067b54e35803d18bca9861cb60c60f6234b50869a56"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c16635f8dddbeb1b827977d0b00d07b644b040aeb9ff8607a9fc0997afa3e567"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-win32.whl", hash = "sha256:2d76780d9c65c7529cedd49fa4802d713e60798d8dc3b0d5b12a0a8f38cca51c"},
|
||||
{file = "kiwisolver-1.4.3-cp310-cp310-win_amd64.whl", hash = "sha256:3a297d77b3d6979693f5948df02b89431ae3645ec95865e351fb45578031bdae"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ca3eefb02ef17257fae8b8555c85e7c1efdfd777f671384b0e4ef27409b02720"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d248c46c0aa406695bda2abf99632db991f8b3a6d46018721a2892312a99f069"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cb55258931448d61e2d50187de4ee66fc9d9f34908b524949b8b2b93d0c57136"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:86bcf0009f2012847a688f2f4f9b16203ca4c835979a02549aa0595d9f457cc8"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e7cf940af5fee00a92e281eb157abe8770227a5255207818ea9a34e54a29f5b2"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:dd22085446f3eca990d12a0878eeb5199dc9553b2e71716bfe7bed9915a472ab"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-win32.whl", hash = "sha256:d2578e5149ff49878934debfacf5c743fab49eca5ecdb983d0b218e1e554c498"},
|
||||
{file = "kiwisolver-1.4.3-cp37-cp37m-win_amd64.whl", hash = "sha256:5fb73cc8a34baba1dfa546ae83b9c248ef6150c238b06fc53d2773685b67ec67"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f70f3d028794e31cf9d1a822914efc935aadb2438ec4e8d4871d95eb1ce032d6"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:71af5b43e4fa286a35110fc5bb740fdeae2b36ca79fbcf0a54237485baeee8be"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:26b5a70bdab09e6a2f40babc4f8f992e3771751e144bda1938084c70d3001c09"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1858ad3cb686eccc7c6b7c5eac846a1cfd45aacb5811b2cf575e80b208f5622a"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4dc350cb65fe4e3f737d50f0465fa6ea0dcae0e5722b7edf5d5b0a0e3cd2c3c7"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:007799c7fa934646318fc128b033bb6e6baabe7fbad521bfb2279aac26225cd7"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:46fb56fde006b7ef5f8eaa3698299b0ea47444238b869ff3ced1426aa9fedcb5"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b9eb88593159a53a5ee0b0159daee531ff7dd9c87fa78f5d807ca059c7eb1b2b"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-win32.whl", hash = "sha256:3b1dcbc49923ac3c973184a82832e1f018dec643b1e054867d04a3a22255ec6a"},
|
||||
{file = "kiwisolver-1.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:7118ca592d25b2957ff7b662bc0fe4f4c2b5d5b27814b9b1bc9f2fb249a970e7"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:747190fcdadc377263223f8f72b038381b3b549a8a3df5baf4d067da4749b046"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fd628e63ffdba0112e3ddf1b1e9f3db29dd8262345138e08f4938acbc6d0805a"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:22ccba48abae827a0f952a78a7b1a7ff01866131e5bbe1f826ce9bda406bf051"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:af24b21c2283ca69c416a8a42cde9764dc36c63d3389645d28c69b0e93db3cd7"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:547111ef7cf13d73546c2de97ce434935626c897bdec96a578ca100b5fcd694b"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:84f85adfebd7d3c3db649efdf73659e1677a2cf3fa6e2556a3f373578af14bf7"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ffd7cf165ff71afb202b3f36daafbf298932bee325aac9f58e1c9cd55838bef0"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6b3136eecf7e1b4a4d23e4b19d6c4e7a8e0b42d55f30444e3c529700cdacaa0d"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-win32.whl", hash = "sha256:46c6e5018ba31d5ee7582f323d8661498a154dea1117486a571db4c244531f24"},
|
||||
{file = "kiwisolver-1.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:8395064d63b26947fa2c9faeea9c3eee35e52148c5339c37987e1d96fbf009b3"},
|
||||
{file = "kiwisolver-1.4.3-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:325fa1b15098e44fe4590a6c5c09a212ca10c6ebb5d96f7447d675f6c8340e4e"},
|
||||
{file = "kiwisolver-1.4.3-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:654280c5f41831ddcc5a331c0e3ce2e480bbc3d7c93c18ecf6236313aae2d61a"},
|
||||
{file = "kiwisolver-1.4.3-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ae7aa0784aeadfbd693c27993727792fbe1455b84d49970bad5886b42976b18"},
|
||||
{file = "kiwisolver-1.4.3-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:130c6c35eded399d3967cf8a542c20b671f5ba85bd6f210f8b939f868360e9eb"},
|
||||
{file = "kiwisolver-1.4.3.tar.gz", hash = "sha256:ab8a15c2750ae8d53e31f77a94f846d0a00772240f1c12817411fa2344351f86"},
|
||||
]
|
||||
llvmlite = [
|
||||
{file = "llvmlite-0.38.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a7dd2bd1d6406e7789273e3f8a304ed5d9adcfaa5768052fca7dc233a857be98"},
|
||||
|
@ -901,8 +901,8 @@ scooby = [
|
|||
{file = "scooby-0.5.12.tar.gz", hash = "sha256:874828e38834c1ccb2236a7491e0739675086608c6588abf132cdd0049458192"},
|
||||
]
|
||||
setuptools = [
|
||||
{file = "setuptools-62.3.2-py3-none-any.whl", hash = "sha256:68e45d17c9281ba25dc0104eadd2647172b3472d9e01f911efa57965e8d51a36"},
|
||||
{file = "setuptools-62.3.2.tar.gz", hash = "sha256:a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7"},
|
||||
{file = "setuptools-62.6.0-py3-none-any.whl", hash = "sha256:c1848f654aea2e3526d17fc3ce6aeaa5e7e24e66e645b5be2171f3f6b4e5a178"},
|
||||
{file = "setuptools-62.6.0.tar.gz", hash = "sha256:990a4f7861b31532871ab72331e755b5f14efbe52d336ea7f6118144dd478741"},
|
||||
]
|
||||
setuptools-scm = [
|
||||
{file = "setuptools_scm-6.4.2-py3-none-any.whl", hash = "sha256:acea13255093849de7ccb11af9e1fb8bde7067783450cee9ef7a93139bddf6d4"},
|
||||
|
|
|
@ -21,6 +21,12 @@ PyYAML = "^6.0"
|
|||
|
||||
[tool.poetry.dev-dependencies]
|
||||
|
||||
[[tool.poetry.source]]
|
||||
name = "vtk"
|
||||
url = "https://wheels.pyvista.org/"
|
||||
default = false
|
||||
secondary = false
|
||||
|
||||
[build-system]
|
||||
requires = ["poetry-core>=1.0.0"]
|
||||
build-backend = "poetry.core.masonry.api"
|
||||
|
|
|
@ -78,6 +78,7 @@ def cross_run(waveforms: list, resolutions: list, Lbox: int, time: str):
|
|||
|
||||
|
||||
if __name__ == '__main__':
|
||||
input("are you sure you want to run this? This might need a large amount of memory")
|
||||
Lbox = 100
|
||||
k0 = 2 * 3.14159265358979323846264338327950 / Lbox
|
||||
resolutions = [128, 256, 512]
|
||||
|
|
|
@ -1,16 +1,38 @@
|
|||
import numpy as np
|
||||
import matplotlib.pyplot as plt
|
||||
import itertools
|
||||
import pandas as pd
|
||||
from pathlib import Path
|
||||
from sys import argv
|
||||
|
||||
import matplotlib.pyplot as plt
|
||||
import pandas as pd
|
||||
from matplotlib.axes import Axes
|
||||
from matplotlib.figure import Figure
|
||||
|
||||
from paths import base_dir
|
||||
|
||||
Lbox = 100
|
||||
k0 = 2 * 3.14159265358979323846264338327950 / Lbox
|
||||
resolutions = [128, 256, 512]
|
||||
waveforms = ["DB2", "DB4", "DB8", "shannon"]
|
||||
|
||||
# Careful: k is actually in Mpc^-1, the column is just named weirdly.
|
||||
columns = [
|
||||
"k [Mpc]",
|
||||
"Pcross",
|
||||
"P1",
|
||||
"err. P1",
|
||||
"P2",
|
||||
"err. P2",
|
||||
"P2-1",
|
||||
"err. P2-1",
|
||||
"modes in bin",
|
||||
]
|
||||
|
||||
# linestyles = ["solid", "dashed", "dotted"]
|
||||
colors = ["C1", "C2", "C3", "C4"]
|
||||
|
||||
|
||||
def spectra_data(
|
||||
waveform: str, resolution_1: int, resolution_2: int, Lbox: int, time: str
|
||||
waveform: str, resolution_1: int, resolution_2: int, Lbox: int, time: str
|
||||
):
|
||||
dir = base_dir / f"spectra/{waveform}_{Lbox}"
|
||||
|
||||
|
@ -41,32 +63,9 @@ def spectra_data(
|
|||
return spectra_data
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
Lbox = 100
|
||||
k0 = 2 * 3.14159265358979323846264338327950 / Lbox
|
||||
resolutions = [128, 256, 512]
|
||||
waveforms = ["DB2", "DB4", "DB8", "shannon"]
|
||||
|
||||
# Careful: k is actually in Mpc^-1, the column is just named weirdly.
|
||||
columns = [
|
||||
"k [Mpc]",
|
||||
"Pcross",
|
||||
"P1",
|
||||
"err. P1",
|
||||
"P2",
|
||||
"err. P2",
|
||||
"P2-1",
|
||||
"err. P2-1",
|
||||
"modes in bin",
|
||||
]
|
||||
|
||||
# linestyles = ["solid", "dashed", "dotted"]
|
||||
colors = ["C1", "C2", "C3", "C4"]
|
||||
|
||||
time = argv[1]
|
||||
|
||||
if argv[2] == "power":
|
||||
fig = plt.figure(figsize=(9, 9))
|
||||
def create_plot(mode, time, show=True):
|
||||
fig: Figure = plt.figure(figsize=(9, 9))
|
||||
if mode == "power":
|
||||
subfigs = fig.subplots(len(waveforms), 1, sharex=True, sharey=True).flatten()
|
||||
for i, waveform in enumerate(waveforms):
|
||||
ax: Axes = subfigs[i]
|
||||
|
@ -98,10 +97,8 @@ if __name__ == "__main__":
|
|||
|
||||
fig.suptitle(f"Power Spectra {time}")
|
||||
fig.tight_layout()
|
||||
plt.show()
|
||||
|
||||
elif argv[2] == "cross":
|
||||
fig: Figure = plt.figure(figsize=(9, 9))
|
||||
elif mode == "cross":
|
||||
combination_list = list(itertools.combinations(resolutions, 2))
|
||||
subfigs = fig.subplots(
|
||||
len(combination_list), 1, sharex=True, sharey=True
|
||||
|
@ -131,7 +128,24 @@ if __name__ == "__main__":
|
|||
|
||||
fig.suptitle(f"Cross Spectra {time}")
|
||||
fig.tight_layout()
|
||||
fig.savefig(Path(f"~/tmp/spectra_{time}_{mode}.pdf").expanduser())
|
||||
if show:
|
||||
plt.show()
|
||||
|
||||
else:
|
||||
raise ValueError("missing argv[2], should be (power|cross)")
|
||||
|
||||
def main():
|
||||
if len(argv) < 2:
|
||||
print("run spectra_plot.py [ics|end] [power|cross] or spectra_plot.py all")
|
||||
exit(1)
|
||||
if argv[1] == "all":
|
||||
for time in ["ics", "end"]:
|
||||
for mode in ["power", "cross"]:
|
||||
create_plot(mode, time, show=False)
|
||||
return
|
||||
time = argv[1]
|
||||
mode = argv[2]
|
||||
create_plot(mode, time)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
|
Loading…
Reference in a new issue