From af425f345de3f23bfaac32dccc177a1441bed241 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Sun, 31 Mar 2013 17:01:44 -0400 Subject: [PATCH] Better hubble constant decoding in SDF --- c_tools/mock/loaders/sdf_loader.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/c_tools/mock/loaders/sdf_loader.cpp b/c_tools/mock/loaders/sdf_loader.cpp index b716536..bb1f5f3 100644 --- a/c_tools/mock/loaders/sdf_loader.cpp +++ b/c_tools/mock/loaders/sdf_loader.cpp @@ -216,11 +216,14 @@ SimulationLoader *sdfLoader(const std::string& snapshot, int flags, hdr = new SimuData; SDFgetintOrDefault(sdfp, "version", &fileversion, 1); + double h0; if (fileversion == 1) { SDFgetfloatOrDie(sdfp, "Omega0", &hdr->Omega_M); SDFgetfloatOrDie(sdfp, "Lambda_prime", &hdr->Omega_Lambda); SDFgetfloatOrDie(sdfp, "H0", &hdr->Hubble); + hdr->Hubble *= 1000.*(one_kpc/one_Gyr); + h0 = hdr->Hubble / 100.; } else { @@ -232,12 +235,10 @@ SimulationLoader *sdfLoader(const std::string& snapshot, int flags, hdr->Omega_M += Or; hdr->Omega_Lambda += Of; - SDFgetfloatOrDie(sdfp, "H0", &hdr->Hubble); - + SDFgetfloatOrDie(sdfp, "h_100", &hdr->Hubble); + hdr->Hubble *= 100.; + h0 = hdr->Hubble / 100.; } - double h0; - hdr->Hubble *= 1000.0*(one_kpc/one_Gyr); - h0 = hdr->Hubble/100.; if (SDFhasname("R0", sdfp)) {