Skip to content

Commit

Permalink
Changed labels.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tilmantroester
tilmantroester committed Oct 12, 2020
1 parent ff0aaed commit bd014ed
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 23 deletions.
Binary file modified Parameter_Plots/cosmology/S8_comparison_blindC.pdf
View file
Binary file not shown.
Binary file modified Parameter_Plots/cosmology/omegam_sigma8_h_blind_C.pdf
View file
Binary file not shown.
Binary file modified Parameter_Plots/cosmology/omegam_sigma8_s8_ns_h_a_baryon_a_ia_b1l_b1h_blind_C.pdf
View file
Binary file not shown.
Binary file modified Parameter_Plots/cosmology/omegam_sigma8_survey_comparison.pdf
View file
Binary file not shown.
Binary file modified Parameter_Plots/systematics/GC_ns_prior.pdf
View file
Binary file not shown.
Binary file modified Parameter_Plots/systematics/S8_comparison_blindC.pdf
View file
Binary file not shown.
Binary file modified Parameter_Plots/systematics/blind_C_EE_nE_w_systematics_chains.pdf
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions Section_Results.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ \section{Results}
\begin{figure}
\begin{center}
\includegraphics[width=\columnwidth]{Parameter_Plots/cosmology/S8_comparison_blindC}
\caption{Constraints on the structure growth parameter $S_{8} = \sigma_8 \sqrt{\Omega_{\rm m}/0.3}$ for different probe combinations: $3\times2$pt, cosmic shear with galaxy-galaxy lensing (GGL), and cosmic shear with galaxy clustering, along with the single probe analyses. Our fiducial and preferred MAP with PJ-HPD credible interval (solid) can be compared to the standard, but shifted, marginal posterior mode with M-HPD credible intervals (dotted). Our results can also be compared to weak lensing measurements from the literature, which typically quote the mean of the marginal posterior mode with tail credible intervals (dashed).
\caption{Constraints on the structure growth parameter $S_{8} = \sigma_8 \sqrt{\Omega_{\rm m}/0.3}$ for different probe combinations: $3\times2$pt, KiDS-1000 cosmic shear, BOSS galaxy clustering, cosmic shear with galaxy-galaxy lensing (GGL), and cosmic shear with galaxy clustering. Our fiducial and preferred MAP with PJ-HPD credible interval (solid) can be compared to the standard, but shifted, marginal posterior mode with M-HPD credible intervals (dotted). Our results can also be compared to weak lensing measurements from the literature, which typically quote the mean of the marginal posterior mode with tail credible intervals (dashed).
\label{fig:S8comp}}
\end{center}
\end{figure}
Expand Down Expand Up @@ -60,11 +60,11 @@ \section{Results}
Probe & $\chi^2_{\rm MAP}$ & Data DoF & Model DoF & PTE & Model DoF & PTE \\
& & &\citep{joachimi/etal:inprep} & & \citep{Raveri2019} & \\
\midrule
Cosmic shear & $152.1$ & $120$ &4.5 & 0.013 &3.0 & 0.016 \\
Galaxy clustering & $167.7$ & $168$ &-- & -- &10.6 & 0.272 \\
KiDS-1000 cosmic shear & $152.1$ & $120$ &4.5 & 0.013 &3.0 & 0.016 \\
BOSS galaxy clustering & $167.7$ & $168$ &-- & -- &10.6 & 0.272 \\
Cosmic shear + GGL & $178.7$ & $142$ &8.7 & 0.005 &7.3 & 0.007 \\
Cosmic shear + galaxy clustering & $319.9$ & $288$ &-- & -- &11.9 & 0.036 \\
KiDS-1000 $3\times2$pt & $356.2$ & $310$ &-- & -- &12.5 & 0.011 \\
$3\times2$pt & $356.2$ & $310$ &-- & -- &12.5 & 0.011 \\

\bottomrule
\end{tabular}
Expand Down
44 changes: 25 additions & 19 deletions scripts/make_contour_plots.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def load_chains(chain_path):
{"root_dir" : os.path.join(base_dir,
"cosmology/multinest_blindC_EE_nE_w"),
"name" : "multinest_blindC_EE_nE_w",
"label" : "KiDS-1000 $3\\times2$pt",
"label" : "$3\\times2$pt",
"blind" : "C",
"probes" : ("EE", "nE", "w"),
"MAP_path" : [os.path.join(base_dir, "MAP/run_1/cosmology/MAP_*_blindC_EE_nE_w_Powell/chain/samples_MAP_*_blindC_EE_nE_w_Powell.txt"),
Expand Down Expand Up @@ -361,7 +361,7 @@ def load_chains(chain_path):
{"root_dir" : os.path.join(base_dir,
"cosmology/multinest_blindC_EE"),
"name" : "multinest_blindC_EE",
"label" : "Cosmic shear",
"label" : "KiDS-1000 cosmic shear",
"blind" : "C",
"probes" : ("EE",),
"MAP_path" : [os.path.join(base_dir, "MAP/run_1/cosmology/MAP_*_blindC_EE_Powell/chain/samples_MAP_*_blindC_EE_Powell.txt")],
Expand All @@ -372,7 +372,7 @@ def load_chains(chain_path):
{"root_dir" : os.path.join(base_dir,
"cosmology/multinest_blindC_w"),
"name" : "multinest_w",
"label" : "Galaxy clustering",
"label" : "BOSS galaxy clustering",
"blind" : "None",
"probes" : ("w",),
"MAP_path" : [os.path.join(base_dir, "MAP/run_1/cosmology/MAP_*_blindC_w_Powell/chain/samples_MAP_*_blindC_w_Powell.txt"),
Expand All @@ -397,7 +397,7 @@ def load_chains(chain_path):
{"root_dir" : os.path.join(base_dir,
"cosmology/multinest_Planck"),
"name" : "multinest_Planck",
"label" : "Planck 2018 TTTEEE+lowE",
"label" : "\\textit{Planck} TTTEEE+lowE",
"blind" : "None",
"probes" : ("CMB",),
"MAP_path" : [os.path.join(base_dir, "MAP/run_1/cosmology_with_Planck/MAP_*_blindC_Planck_Powell/chain/samples_MAP_*_blindC_Planck_Powell.txt")],
Expand Down Expand Up @@ -514,7 +514,7 @@ def plot_systematics_contours(chains, plot_settings, text_width):
params=params_to_plot,
filled_compare=True,
contour_colors=chain_colors,
legend_labels=chain_labels,
legend_labels=["No baryon", "No z-bin 1+2", "No z-bin 4", "No z-bin 5", "No higher order GC", "Fiducial $3\\times2$pt"],
diag1d_kwargs={"normalized" : True},
param_limits={"h" : (0.64, 0.78),
"a_ia" : (-0.2,2.5),},
Expand Down Expand Up @@ -570,7 +570,8 @@ def plot_3x2pt_contours_small(chains, plot_settings, column_width):
params=params_to_plot,
filled_compare=True,
contour_colors=chain_colors,
legend_labels=chain_labels,
legend_labels=["KiDS-1000 cosmic shear", "BOSS galaxy clustering", "$3\\times2$pt",
"\\textit{Planck} TTTEEE+lowE"],
diag1d_kwargs={"normalized" : True},
param_limits={"omegam" : (0.2, 0.4),
"sigma8" : (0.55, 0.9),
Expand Down Expand Up @@ -619,14 +620,17 @@ def plot_3x2pt_contours_big(chains, plot_settings, text_width):
params=params_to_plot,
filled_compare=True,
contour_colors=chain_colors,
legend_labels=chain_labels,
legend_labels=["KiDS-1000 cosmic shear", "BOSS galaxy clustering",
"Cosmic shear + GGL", "Cosmic shear + galaxy clustering",
"$3\\times2$pt",
"\\textit{Planck} TTTEEE+lowE"],
diag1d_kwargs={"normalized" : True},
param_limits={"h" : (0.64, 0.78),
"a_ia" : (0,2),
"b1l" : (0.5, 4.5),
"b1h" : (0.5, 4.5),
},
legend_ncol=3,
legend_ncol=2,
)

process_chains.plot_CI(g, chains_to_plot, params_to_plot,
Expand Down Expand Up @@ -682,7 +686,9 @@ def plot_survey_contours(chains, boss_kv450_samples, des_3x2pt_samples, planck_s
colors=chain_colors, lims=[0.2,0.38, 0.6, 1.1], _no_finish=True)


g.add_legend(chain_labels, figure=False, #legend_loc="upper left",
g.add_legend(["BOSS+KV450 (Tröster et al. 2020)", "DES Y1 $3\\times2$pt (DES Collaboration 2018)",
"KiDS-1000+BOSS+2dFLenS $3\\times2$pt",
"\\textit{Planck} TTTEEE+lowE",], figure=False, #legend_loc="upper left",
fontsize=8, frameon=False)
#g.finish_plot()

Expand All @@ -704,10 +710,10 @@ def plot_S8_shifts(chains, planck_samples, boss_kv450_samples, des_3x2pt_samples

blind = "C"
chain_selection = [{"probes" : ("EE", "nE", "w"), "blind" : blind, "type" : "cosmology"},
{"probes" : ("EE", "nE"), "blind" : blind, "type" : "cosmology"},
{"probes" : ("EE", "w"), "blind" : blind, "type" : "cosmology"},
{"probes" : ("EE",), "blind" : blind, "type" : "cosmology"},
{"probes" : ("w",), "blind" : "None", "type" : "cosmology"},
{"probes" : ("EE",), "blind" : blind, "type" : "cosmology"},
{"probes" : ("w",), "blind" : "None", "type" : "cosmology"},
{"probes" : ("EE", "nE"), "blind" : blind, "type" : "cosmology"},
{"probes" : ("EE", "w"), "blind" : blind, "type" : "cosmology"},
]

spacing_idx = []
Expand Down Expand Up @@ -850,7 +856,7 @@ def plot_clustering_ns(chains, BOSS_fixed, BOSS_fixed_wide_ns, plot_settings, co
params=params_to_plot,
filled_compare=True,
contour_colors=["C1", "C0"],
legend_labels=["Galaxy clustering, wide $n_s$ prior", "Galaxy clustering, fiducial"],
legend_labels=["BOSS galaxy clustering, wide $n_s$ prior", "BOSS galaxy clustering, fiducial"],
diag1d_kwargs={"normalized" : True},
)

Expand Down Expand Up @@ -1357,7 +1363,7 @@ def create_parameter_constraint_table(chains):
"color" : "darkslategrey",
"type" : "external",
"prones" : ("CMB",),
"label" : "Planck 2018 TTTEEE+lowE"}
"label" : "\\textit{Planck} TTTEEE+lowE"}

hsc_xipm_samples = getdist.loadMCSamples(os.path.join(external_chain_path, "HSC/xipm/HSC_hamana2020_fiducial/hsc_hamana2020_fiducial"),
)
Expand Down Expand Up @@ -1476,8 +1482,8 @@ def create_parameter_constraint_table(chains):
kv450_samples, des_cs_samples, hsc_pCl_samples, hsc_xipm_samples,
plot_settings, column_width)

calculate_1d_tension(chains, planck_samples)
stats_chain, stats_nested = calculate_nd_tension(chains, KiDS1000_chain_path)
# calculate_1d_tension(chains, planck_samples)
# stats_chain, stats_nested = calculate_nd_tension(chains, KiDS1000_chain_path)

create_goodness_of_fit_table(chains, stats_chain)
create_parameter_constraint_table(chains)
# create_goodness_of_fit_table(chains, stats_chain)
# create_parameter_constraint_table(chains)

0 comments on commit bd014ed

Please sign in to comment.