Upgrade to diffsky's gd_specphot...

diffhtwo/experimental/conftest.py

@@ -52,16 +52,13 @@ def feniks(ran_key, fake_subset_ssp_data):
 
 
 @pytest.fixture(scope="session")
-def hizels(ran_key, fake_subset_ssp_data, feniks_tcurves):
+def hizels_fitting_data(ran_key, fake_subset_ssp_data, feniks_tcurves):
     ssp_data, emline_wave_aa = fake_subset_ssp_data
 
-    hizels = load_hizels.get_hizels_data(
-        HIZELS_DRN,
-        ran_key,
-        ssp_data,
-        feniks_tcurves,
+    hizels_fitting_data = load_hizels.get_hizels_data(
+        HIZELS_DRN, ran_key, ssp_data, feniks_tcurves, emline_wave_aa
     )
-    return hizels
+    return hizels_fitting_data
 
 
 @pytest.fixture(scope="session")

diffhtwo/experimental/data/hizels/halpha_LF_z0p4.dat

@@ -1,23 +1,20 @@
 # z = 0.40
-# Columns:
-# logLHa  logLHa_binw_full  logphi_obs  logphi_obs_err  logphi_corr  logphi_corr_err
-logLHa logLHa_binw_full logphi_obs logphi_obs_err logphi_corr logphi_corr_err
-40.50 0.10 -1.84 0.04 -1.66 0.04
-40.60 0.10 -1.78 0.04 -1.70 0.04
-40.70 0.10 -1.87 0.04 -1.81 0.04
-40.80 0.10 -2.01 0.05 -1.93 0.05
-40.90 0.10 -2.20 0.06 -1.96 0.07
-41.00 0.10 -2.21 0.06 -2.03 0.07
-41.10 0.10 -2.41 0.08 -2.12 0.09
-41.20 0.10 -2.39 0.08 -2.27 0.08
-41.30 0.10 -2.43 0.08 -2.29 0.09
-41.40 0.10 -2.55 0.10 -2.42 0.10
-41.50 0.10 -2.55 0.10 -2.46 0.11
-41.60 0.10 -2.71 0.12 -2.57 0.13
-41.70 0.10 -2.94 0.17 -2.69 0.19
-41.80 0.10 -2.90 0.16 -2.73 0.17
-41.90 0.10 -3.04 0.19 -2.88 0.20
-42.00 0.10 -3.34 0.30 -3.03 0.35
-42.20 0.20 -3.45 0.36 -3.56 0.51
-42.50 0.30 -3.64 0.53 -3.71 0.71
-
+logLHa logLHa_binw_full nsources logphi_obs logphi_obs_err logphi_corr logphi_corr_err vol_1e4Mpc3
+40.50 0.10 128 -1.84 0.04 -1.66 0.04 8.8
+40.60 0.10 147 -1.78 0.04 -1.70 0.04 8.8
+40.70 0.10 118 -1.87 0.04 -1.81 0.04 8.8
+40.80 0.10 86 -2.01 0.05 -1.93 0.05 8.8
+40.90 0.10 56 -2.20 0.06 -1.96 0.07 8.8
+41.00 0.10 54 -2.21 0.06 -2.03 0.07 8.8
+41.10 0.10 34 -2.41 0.08 -2.12 0.09 8.8
+41.20 0.10 36 -2.39 0.08 -2.27 0.08 8.8
+41.30 0.10 33 -2.43 0.08 -2.29 0.09 8.8
+41.40 0.10 25 -2.55 0.10 -2.42 0.10 8.8
+41.50 0.10 25 -2.55 0.10 -2.46 0.11 8.8
+41.60 0.10 17 -2.71 0.12 -2.57 0.13 8.8
+41.70 0.10 10 -2.94 0.17 -2.69 0.19 8.8
+41.80 0.10 11 -2.90 0.16 -2.73 0.17 8.8
+41.90 0.10 8 -3.04 0.19 -2.88 0.20 8.8
+42.00 0.10 4 -3.34 0.30 -3.03 0.35 8.8
+42.20 0.20 3 -3.45 0.36 -3.56 0.51 8.8
+42.50 0.30 2 -3.64 0.53 -3.71 0.71 8.8

diffhtwo/experimental/data/hizels/halpha_LF_z0p84.dat

@@ -1,11 +1,11 @@
 # z = 0.84
-logLHa logLHa_binw_full logphi_obs logphi_obs_err logphi_corr logphi_corr_err
-41.70 0.15 -2.12 0.03 -1.93 0.03
-41.85 0.15 -2.11 0.03 -2.02 0.03
-42.00 0.15 -2.43 0.04 -2.18 0.04
-42.15 0.15 -2.72 0.06 -2.43 0.06
-42.30 0.15 -3.38 0.15 -2.73 0.17
-42.45 0.15 -3.46 0.17 -3.01 0.17
-42.60 0.15 -3.61 0.21 -3.27 0.21
-42.75 0.15 -4.16 0.53 -3.79 0.55
-42.90 0.15 -4.46 0.90 -4.13 1.51
+logLHa logLHa_binw_full nsources logphi_obs logphi_obs_err logphi_corr logphi_corr_err vol_1e4Mpc3
+41.70 0.15 218 -2.12 0.03 -1.93 0.03 19.1
+41.85 0.15 222 -2.11 0.03 -2.02 0.03 19.1
+42.00 0.15 107 -2.43 0.04 -2.18 0.04 19.1
+42.15 0.15 54 -2.72 0.06 -2.43 0.06 19.1
+42.30 0.15 12 -3.38 0.15 -2.73 0.17 19.1
+42.45 0.15 10 -3.46 0.17 -3.01 0.17 19.1
+42.60 0.15 7 -3.61 0.21 -3.27 0.21 19.1
+42.75 0.15 2 -4.16 0.53 -3.79 0.55 19.1
+42.90 0.15 1 -4.46 0.90 -4.13 1.51 19.1

diffhtwo/experimental/data/hizels/halpha_LF_z1p47.dat

@@ -1,16 +1,15 @@
 # z = 1.47
-logLHa logLHa_binw_full logphi_obs logphi_obs_err logphi_corr logphi_corr_err
-42.10 0.10 -2.20 0.10 -2.13 0.10
-42.20 0.10 -2.37 0.08 -2.25 0.09
-42.30 0.10 -2.55 0.06 -2.34 0.06
-42.40 0.10 -2.67 0.05 -2.47 0.05
-42.50 0.10 -2.78 0.05 -2.62 0.05
-42.60 0.10 -2.83 0.04 -2.73 0.04
-42.70 0.10 -3.23 0.07 -2.91 0.08
-42.80 0.10 -3.50 0.10 -3.18 0.11
-42.90 0.10 -3.91 0.18 -3.55 0.18
-43.00 0.10 -4.17 0.26 -3.81 0.26
-43.10 0.10 -4.39 0.37 -4.22 0.38
-43.20 0.10 -4.57 0.53 -4.55 0.55
-43.40 0.30 -4.57 0.53 -4.86 0.55
-
+logLHa logLHa_binw_full nsources logphi_obs logphi_obs_err logphi_corr logphi_corr_err vol_1e4Mpc3
+42.10 0.10 25 -2.20 0.10 -2.13 0.10 4.0
+42.20 0.10 32 -2.37 0.08 -2.25 0.09 7.5
+42.30 0.10 62 -2.55 0.06 -2.34 0.06 22.1
+42.40 0.10 86 -2.67 0.05 -2.47 0.05 40.2
+42.50 0.10 101 -2.78 0.05 -2.62 0.05 60.4
+42.60 0.10 106 -2.83 0.04 -2.73 0.04 71.4
+42.70 0.10 43 -3.23 0.07 -2.91 0.08 73.6
+42.80 0.10 23 -3.50 0.10 -3.18 0.11 73.6
+42.90 0.10 9 -3.91 0.18 -3.55 0.18 73.6
+43.00 0.10 5 -4.17 0.26 -3.81 0.26 73.6
+43.10 0.10 3 -4.39 0.37 -4.22 0.38 73.6
+43.20 0.10 2 -4.57 0.53 -4.55 0.55 73.6
+43.40 0.30 2 -4.57 0.53 -4.86 0.55 73.6

diffhtwo/experimental/data/hizels/halpha_LF_z2p23.dat

@@ -1,18 +1,17 @@
 # z = 2.23
-logLHa logLHa_binw_full logphi_obs logphi_obs_err logphi_corr logphi_corr_err
-42.00 0.15 -2.18 0.19 -1.93 0.19
-42.15 0.15 -2.34 0.16 -2.07 0.16
-42.30 0.10 -2.24 0.07 -2.19 0.07
-42.40 0.10 -2.36 0.05 -2.31 0.05
-42.50 0.10 -2.48 0.04 -2.41 0.05
-42.60 0.10 -2.60 0.04 -2.50 0.04
-42.70 0.10 -2.68 0.04 -2.59 0.05
-42.80 0.10 -2.89 0.05 -2.73 0.06
-42.90 0.10 -3.18 0.07 -2.88 0.14
-43.00 0.10 -3.41 0.09 -3.09 0.17
-43.10 0.10 -3.68 0.12 -3.33 0.22
-43.20 0.10 -4.04 0.21 -3.67 0.31
-43.30 0.10 -4.41 0.37 -4.01 0.51
-43.40 0.10 -4.59 0.53 -4.22 0.68
-43.60 0.30 -4.41 0.37 -4.63 0.41
-
+logLHa logLHa_binw_full nsources logphi_obs logphi_obs_err logphi_corr logphi_corr_err vol_1e4Mpc3
+42.00 0.15 8 -2.18 0.19 -1.93 0.19 0.8
+42.15 0.15 11 -2.34 0.16 -2.07 0.16 1.6
+42.30 0.10 47 -2.24 0.07 -2.19 0.07 6.7
+42.40 0.10 91 -2.36 0.05 -2.31 0.05 20.9
+42.50 0.10 107 -2.48 0.04 -2.41 0.05 32.7
+42.60 0.10 158 -2.60 0.04 -2.50 0.04 63.3
+42.70 0.10 163 -2.68 0.04 -2.59 0.05 77.2
+42.80 0.10 100 -2.89 0.05 -2.73 0.06 77.2
+42.90 0.10 51 -3.18 0.07 -2.88 0.14 77.2
+43.00 0.10 30 -3.41 0.09 -3.09 0.17 77.2
+43.10 0.10 16 -3.68 0.12 -3.33 0.22 77.2
+43.20 0.10 7 -4.04 0.21 -3.67 0.31 77.2
+43.30 0.10 3 -4.41 0.37 -4.01 0.51 77.2
+43.40 0.10 2 -4.59 0.53 -4.22 0.68 77.2
+43.60 0.30 3 -4.41 0.37 -4.63 0.41 77.2

diffhtwo/experimental/data_loaders/load_hizels.py

@@ -7,9 +7,18 @@
 
 from ..lightcone_generators import generate_lc_data
 
-HiZELS = namedtuple(
-    "HiZELS",
-    ["lg_Lbin_edges", "lg_LF", "z", "dz", "lc_data"],
+Hizels = namedtuple(
+    "Hizels",
+    [
+        "line_wave_aa",
+        "lg_Lbin_edges",
+        "N_data",
+        "vol_Mpc3_data",
+        "lg_phi_data",
+        "z",
+        "dz",
+        "lc_data",
+    ],
 )
 DELTA_L_HALPHA = -0.4  # uncorrect HiZELS h-alpha L for dust (A_halpha = 1 mag)
 
@@ -19,23 +28,29 @@ def get_hizels_data(
     ran_key,
     ssp_data,
     tcurves,
-    num_halos=500,
+    halpha_wave_aa,
+    num_halos=250,
     lgmp_min=10.0,
     lgmp_max=15.0,
     lc_sky_area_degsq=100,
     n_z_phot_table=15,
 ):
     (
         hizels_lg_halpha_Lbin_edges_data,
-        hizels_lg_halpha_LF_data,
-        hizels_halpha_LF_z_data,
-        hizels_halpha_LF_delta_z_data,
+        hizels_halpha_N_data,
+        hizels_halpha_vol_Mpc3,
+        hizels_halpha_lg_phi_data,
+        hizels_halpha_z_data,
+        hizels_halpha_delta_z_data,
     ) = get_hizels_halpha(drn)
 
+    line_wave_aa = [halpha_wave_aa]
     lg_Lbin_edges = [hizels_lg_halpha_Lbin_edges_data]
-    lg_LF = [hizels_lg_halpha_LF_data]
-    z = [hizels_halpha_LF_z_data]
-    dz = [hizels_halpha_LF_delta_z_data]
+    N_data = [hizels_halpha_N_data]
+    vol_Mpc3_data = [hizels_halpha_vol_Mpc3]
+    lg_phi_data = [hizels_halpha_lg_phi_data]
+    z = [hizels_halpha_z_data]
+    dz = [hizels_halpha_delta_z_data]
 
     lc_data = []
     for line in range(0, len(z)):
@@ -66,10 +81,12 @@ def get_hizels_data(
             line_lc_data.append(generate_lc_data(*lc_args))
         lc_data.append(line_lc_data)
 
-    return HiZELS(lg_Lbin_edges, lg_LF, z, dz, lc_data)
+    return Hizels(
+        line_wave_aa, lg_Lbin_edges, N_data, vol_Mpc3_data, lg_phi_data, z, dz, lc_data
+    )
 
 
-def get_lgL_bin_edges(
+def _get_lgL_bin_edges(
     table, L_colname, bin_width_full_colname, delta_L_halpha=DELTA_L_HALPHA
 ):
     edges = []
@@ -109,53 +126,89 @@ def pad_dummy_lg_LF_data(lg_halpha_LF_data, lg_halpha_LF_dummy_err, max_length=1
     return jnp.vstack((lg_halpha_LF_data_padded, lg_halpha_LF_err_padded))
 
 
-def lg_phi_h0p7_to_hdefault(lg_phi_h0p7):
+def _lg_phi_h0p7_to_hdefault(lg_phi_h0p7):
     phi_h1p0 = (10**lg_phi_h0p7) / (0.7**3)
     return np.log10(phi_h1p0 * (DEFAULT_COSMOLOGY.h**3))
 
 
+def _vol_h0p7_to_hdefault(vol_1e4Mpc3):
+    vol_Mpc3_h1p0 = 1e4 * vol_1e4Mpc3 * (0.7**3)
+    vol_Mpc3 = vol_Mpc3_h1p0 / (DEFAULT_COSMOLOGY.h**3)
+    return vol_Mpc3
+
+
+def _lg_phi_corr_to_N_corr(lg_phi_corr, vol_1e4Mpc3):
+    phi_corr = 10**lg_phi_corr
+    vol_Mpc3 = 1e4 * vol_1e4Mpc3
+    N_corr = phi_corr * vol_Mpc3
+    return N_corr
+
+
 def get_hizels_halpha(drn):
+    """z0p4"""
     HiZELS_halpha_z0p4 = ascii.read(drn / "halpha_LF_z0p4.dat")
-
-    lg_halpha_Lbin_edges_z0p4 = get_lgL_bin_edges(
+    lg_halpha_Lbin_edges_z0p4 = _get_lgL_bin_edges(
         HiZELS_halpha_z0p4, "logLHa", "logLHa_binw_full"
     )
-    lg_halpha_LF_data_z0p4 = jnp.vstack(
+    halpha_N_data_z0p4 = _lg_phi_corr_to_N_corr(
+        HiZELS_halpha_z0p4["logphi_corr"], HiZELS_halpha_z0p4["vol_1e4Mpc3"]
+    )
+    halpha_vol_Mpc3_z0p4 = _vol_h0p7_to_hdefault(HiZELS_halpha_z0p4["vol_1e4Mpc3"])
+
+    halpha_lg_phi_data_z0p4 = jnp.vstack(
         (
-            jnp.array(lg_phi_h0p7_to_hdefault(HiZELS_halpha_z0p4["logphi_corr"])),
+            jnp.array(_lg_phi_h0p7_to_hdefault(HiZELS_halpha_z0p4["logphi_corr"])),
             jnp.array(HiZELS_halpha_z0p4["logphi_corr_err"]),
         )
     )
 
+    """z0p84"""
     HiZELS_halpha_z0p84 = ascii.read(drn / "halpha_LF_z0p84.dat")
-    lg_halpha_Lbin_edges_z0p84 = get_lgL_bin_edges(
+    lg_halpha_Lbin_edges_z0p84 = _get_lgL_bin_edges(
         HiZELS_halpha_z0p84, "logLHa", "logLHa_binw_full"
     )
-    lg_halpha_LF_data_z0p84 = jnp.vstack(
+    halpha_N_data_z0p84 = _lg_phi_corr_to_N_corr(
+        HiZELS_halpha_z0p84["logphi_corr"], HiZELS_halpha_z0p84["vol_1e4Mpc3"]
+    )
+    halpha_vol_Mpc3_z0p84 = _vol_h0p7_to_hdefault(HiZELS_halpha_z0p84["vol_1e4Mpc3"])
+
+    halpha_lg_phi_data_z0p84 = jnp.vstack(
         (
-            jnp.array(lg_phi_h0p7_to_hdefault(HiZELS_halpha_z0p84["logphi_corr"])),
+            jnp.array(_lg_phi_h0p7_to_hdefault(HiZELS_halpha_z0p84["logphi_corr"])),
             jnp.array(HiZELS_halpha_z0p84["logphi_corr_err"]),
         )
     )
 
+    """z1p47"""
     HiZELS_halpha_z1p47 = ascii.read(drn / "halpha_LF_z1p47.dat")
-    lg_halpha_Lbin_edges_z1p47 = get_lgL_bin_edges(
+    lg_halpha_Lbin_edges_z1p47 = _get_lgL_bin_edges(
         HiZELS_halpha_z1p47, "logLHa", "logLHa_binw_full"
     )
-    lg_halpha_LF_data_z1p47 = jnp.vstack(
+    halpha_N_data_z1p47 = _lg_phi_corr_to_N_corr(
+        HiZELS_halpha_z1p47["logphi_corr"], HiZELS_halpha_z1p47["vol_1e4Mpc3"]
+    )
+    halpha_vol_Mpc3_z1p47 = _vol_h0p7_to_hdefault(HiZELS_halpha_z1p47["vol_1e4Mpc3"])
+
+    halpha_lg_phi_data_z1p47 = jnp.vstack(
         (
-            jnp.array(lg_phi_h0p7_to_hdefault(HiZELS_halpha_z1p47["logphi_corr"])),
+            jnp.array(_lg_phi_h0p7_to_hdefault(HiZELS_halpha_z1p47["logphi_corr"])),
             jnp.array(HiZELS_halpha_z1p47["logphi_corr_err"]),
         )
     )
 
+    """z2p23"""
     HiZELS_halpha_z2p23 = ascii.read(drn / "halpha_LF_z2p23.dat")
-    lg_halpha_Lbin_edges_z2p23 = get_lgL_bin_edges(
+    lg_halpha_Lbin_edges_z2p23 = _get_lgL_bin_edges(
         HiZELS_halpha_z2p23, "logLHa", "logLHa_binw_full"
     )
-    lg_halpha_LF_data_z2p23 = jnp.vstack(
+    halpha_N_data_z2p23 = _lg_phi_corr_to_N_corr(
+        HiZELS_halpha_z2p23["logphi_corr"], HiZELS_halpha_z2p23["vol_1e4Mpc3"]
+    )
+    halpha_vol_Mpc3_z2p23 = _vol_h0p7_to_hdefault(HiZELS_halpha_z2p23["vol_1e4Mpc3"])
+
+    halpha_lg_phi_data_z2p23 = jnp.vstack(
         (
-            jnp.array(lg_phi_h0p7_to_hdefault(HiZELS_halpha_z2p23["logphi_corr"])),
+            jnp.array(_lg_phi_h0p7_to_hdefault(HiZELS_halpha_z2p23["logphi_corr"])),
             jnp.array(HiZELS_halpha_z2p23["logphi_corr_err"]),
         )
     )
@@ -167,21 +220,35 @@ def get_hizels_halpha(drn):
         lg_halpha_Lbin_edges_z2p23,
     ]
 
-    hizels_lg_halpha_LF_data = [
-        lg_halpha_LF_data_z0p4,
-        lg_halpha_LF_data_z0p84,
-        lg_halpha_LF_data_z1p47,
-        lg_halpha_LF_data_z2p23,
+    hizels_halpha_N_data = [
+        halpha_N_data_z0p4,
+        halpha_N_data_z0p84,
+        halpha_N_data_z1p47,
+        halpha_N_data_z2p23,
+    ]
+
+    hizels_halpha_vol_Mpc3 = [
+        halpha_vol_Mpc3_z0p4,
+        halpha_vol_Mpc3_z0p84,
+        halpha_vol_Mpc3_z1p47,
+        halpha_vol_Mpc3_z2p23,
+    ]
+
+    hizels_halpha_lg_phi_data = [
+        halpha_lg_phi_data_z0p4,
+        halpha_lg_phi_data_z0p84,
+        halpha_lg_phi_data_z1p47,
+        halpha_lg_phi_data_z2p23,
     ]
 
-    hizels_halpha_LF_z_data = [
+    hizels_halpha_z_data = [
         jnp.float64(0.40),
         jnp.float64(0.84),
         jnp.float64(1.47),
         jnp.float64(2.23),
     ]
 
-    hizels_halpha_LF_delta_z_data = [
+    hizels_halpha_delta_z_data = [
         0.02,
         0.03,
         0.032,
@@ -190,7 +257,9 @@ def get_hizels_halpha(drn):
 
     return (
         hizels_lg_halpha_Lbin_edges_data,
-        hizels_lg_halpha_LF_data,
-        hizels_halpha_LF_z_data,
-        hizels_halpha_LF_delta_z_data,
+        hizels_halpha_N_data,
+        hizels_halpha_vol_Mpc3,
+        hizels_halpha_lg_phi_data,
+        hizels_halpha_z_data,
+        hizels_halpha_delta_z_data,
     )