diffsky 0.3.3__tar.gz → 0.3.4__tar.gz

{diffsky-0.3.3 → diffsky-0.3.4}/.github/workflows/mock_generation_test.yaml

@@ -71,7 +71,7 @@ jobs:
 
           # Download data
           cd dsps_drn
-          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/ssp_data_fsps_v3.2_lgmet_age.h5
+          wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/ssp_data_fsps_v3.2_emlines.hdf5
           cd filters
           wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_u_transmission.h5
           wget https://portal.nersc.gov/project/hacc/aphearin/DSPS_data/filters/lsst_g_transmission.h5
@@ -115,7 +115,7 @@ jobs:
       - name: validate mock
         shell: bash -l {0}
         run: |
-          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/synthetic_cores/smdpl_dr1
+          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/smdpl_dr1
 
       - name: remove sfh_model mock
         shell: bash -l {0}
@@ -137,7 +137,7 @@ jobs:
             1 \
             ci_test_output \
             ci_test_mock \
-            -cosmos_fit cosmos260105 \
+            -cosmos_fit cosmos_260120_UM \
             -synthetic_cores 1 \
             -lgmp_min 12.0 \
             -lgmp_max 13.0 \
@@ -151,7 +151,43 @@ jobs:
       - name: validate mock
         shell: bash -l {0}
         run: |
-          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/synthetic_cores/cosmos260105
+          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/cosmos_260120_UM
+
+      - name: remove cosmos_fit mock
+        shell: bash -l {0}
+        run: |
+          rm -rf ci_test_output
+
+      - name: create mock with no_dbk option
+        shell: bash -l {0}
+        run: |
+          # Create output directory
+          mkdir -p ci_test_output
+
+          # Run mock production script
+          mpiexec -n 1 python scripts/LJ_LC_MOCKS/make_ou26_mock_batch.py \
+            poboy \
+            0.01 \
+            0.2 \
+            0 \
+            1 \
+            ci_test_output \
+            ci_test_mock \
+            -cosmos_fit cosmos_260120_UM \
+            -synthetic_cores 1 \
+            -lgmp_min 12.0 \
+            -lgmp_max 13.0 \
+            --lsst_only --no_dbk
+
+      - name: verify script completed
+        shell: bash -l {0}
+        run: |
+          echo "sfh_model mock generated successfully"
+
+      - name: validate mock
+        shell: bash -l {0}
+        run: |
+          python scripts/LJ_LC_MOCKS/inspect_lc_mock.py ci_test_output/cosmos_260120_UM --no_dbk
 
       - name: remove cosmos_fit mock
         shell: bash -l {0}

{diffsky-0.3.3 → diffsky-0.3.4}/.github/workflows/tests_cron.yaml

@@ -50,6 +50,7 @@ jobs:
             "setuptools_scm>=7,<8" \
             matplotlib \
             astropy \
+            readme_renderer \
             python-build
           pip uninstall diffmah --yes
           pip uninstall diffstar --yes

{diffsky-0.3.3 → diffsky-0.3.4}/.gitignore

@@ -12,6 +12,7 @@ scripts/*.cfg
 scripts/*.cfg~
 
 .DS_Store
+**/.DS_Store
 
 docs/source/drn_dsps_temp/*
 

{diffsky-0.3.3 → diffsky-0.3.4}/CHANGES.rst

@@ -1,4 +1,13 @@
-0.3.3 (unreleased)
+0.3.4 (2026-02-05)
+-------------------
+- Reduce mock filesize by 10x by omitting redundant dust parameters (https://github.com/ArgonneCPAC/diffsky/pull/317)
+- Add feature to make mocks with/out disk/bulge/knot decomposition (https://github.com/ArgonneCPAC/diffsky/pull/317)
+- Require Numpy>=2 (https://github.com/ArgonneCPAC/diffsky/pull/331)
+- Include emission line fluxes in output mock (https://github.com/ArgonneCPAC/diffsky/pull/335)
+- Mock galaxies populating both synthetic and simulated halos are written out to the same directory (https://github.com/ArgonneCPAC/diffsky/pull/336)
+
+
+0.3.3 (2026-01-06)
 -------------------
 - Fix bug in elliptical projections
     - https://github.com/ArgonneCPAC/diffsky/pull/297

{diffsky-0.3.3 → diffsky-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.3.3
+Version: 0.3.4
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License
@@ -38,7 +38,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.rst
-Requires-Dist: numpy
+Requires-Dist: numpy>=2
 Requires-Dist: jax
 Requires-Dist: diffmah>=0.7.3
 Requires-Dist: diffstar>=1.0.1

diffsky-0.3.4/diffsky/_version.py

@@ -0,0 +1 @@
+__version__ = '0.3.4'

diffsky-0.3.4/diffsky/data_loaders/__init__.py

@@ -0,0 +1,6 @@
+""""""
+
+# flake8: noqa
+
+from .io_utils import load_flat_hdf5
+from .load_ssp_data import load_fake_ssp_data, load_ssp_templates

{diffsky-0.3.3 → diffsky-0.3.4}/diffsky/data_loaders/hacc_utils/data_validation/validate_lc_mock.py

@@ -29,7 +29,7 @@ BNPAT_LC_MOCK = "data-{0}.{1}.diffsky_gals.hdf5"
 HLINE = "----------"
 
 
-def get_lc_mock_data_report(fn_lc_mock):
+def get_lc_mock_data_report(fn_lc_mock, *, no_dbk, no_sed):
     report = dict()
     data = load_flat_hdf5(fn_lc_mock, dataset="data")
 
@@ -49,17 +49,27 @@ def get_lc_mock_data_report(fn_lc_mock):
     if len(msg) > 0:
         report["column_metadata"] = msg
 
-    msg = check_consistent_disk_bulge_knot_luminosities(fn_lc_mock, data=data)
+    msg = check_column_shapes(fn_lc_mock, data=data)
     if len(msg) > 0:
-        report["disk_bulge_knot_inconsistency"] = msg
-
-    msg = check_recomputed_photometry(fn_lc_mock)
-    if len(msg) > 0:
-        report["recomputed_photometry"] = msg
-
-    msg = check_has_t_table(fn_lc_mock)
-    if len(msg) > 0:
-        report["t_table_metadata"] = msg
+        report["column_shapes"] = msg
+
+    if no_dbk or no_sed:
+        pass
+    else:
+        msg = check_consistent_disk_bulge_knot_luminosities(fn_lc_mock, data=data)
+        if len(msg) > 0:
+            report["disk_bulge_knot_inconsistency"] = msg
+
+        msg = check_has_t_table(fn_lc_mock)
+        if len(msg) > 0:
+            report["t_table_metadata"] = msg
+
+    if no_sed:
+        pass
+    else:
+        msg = check_recomputed_photometry(fn_lc_mock, no_dbk=no_dbk)
+        if len(msg) > 0:
+            report["recomputed_photometry"] = msg
 
     return report
 
@@ -290,7 +300,28 @@ def check_consistent_disk_bulge_knot_luminosities(
     return msg
 
 
-def check_recomputed_photometry(fn_lc_mock, n_test=200, return_results=False):
+def check_column_shapes(fn_lc_mock, data=None):
+    if data is None:
+        data = load_flat_hdf5(fn_lc_mock, dataset="data")
+
+    msg = []
+    allowed_multdim_columns = ("delta_mag_ssp_scatter",)
+
+    shapes = [data[key].shape for key in data.keys()]
+    for key, shape in zip(data.keys(), shapes):
+        if len(shape) > 1:
+            if key in allowed_multdim_columns:
+                pass
+            else:
+                s = f"`{key}` column has unexpected shape={shape}"
+                msg.append(s)
+
+    return msg
+
+
+def check_recomputed_photometry(
+    fn_lc_mock, n_test=200, return_results=False, *, no_dbk=False
+):
     """Recompute first N_TEST=50 galaxies photometry and enforce agreement"""
     with h5py.File(fn_lc_mock, "r") as hdf:
         mock_version_name = hdf["metadata"].attrs["mock_version_name"]
@@ -320,42 +351,70 @@ def check_recomputed_photometry(fn_lc_mock, n_test=200, return_results=False):
     )
 
     mc_is_q = np.where(mock["mc_sfh_type"] == 0, True, False)
-    args = (
-        mc_is_q,
-        mock["uran_av"],
-        mock["uran_delta"],
-        mock["uran_funo"],
-        mock["uran_pburst"],
-        mock["delta_mag_ssp_scatter"],
-        sfh_params,
-        mock["redshift_true"],
-        t_obs,
-        mah_params,
-        mock["fknot"],
-        ssp_data,
-        precomputed_ssp_mag_table,
-        z_phot_table,
-        wave_eff_table,
-        param_collection.mzr_params,
-        param_collection.spspop_params,
-        param_collection.scatter_params,
-        param_collection.ssperr_params,
-        sim_info.cosmo_params,
-        sim_info.fb,
-    )
-    _res = dbk_phot_from_mock._reproduce_mock_dbk_kern(*args)
-    (
-        phot_info,
-        phot_randoms,
-        disk_bulge_history,
-        obs_mags_bulge,
-        obs_mags_disk,
-        obs_mags_knots,
-    ) = _res
-    phot_info = phot_info._asdict()
-    phot_info["obs_mags_bulge"] = obs_mags_bulge
-    phot_info["obs_mags_disk"] = obs_mags_disk
-    phot_info["obs_mags_knots"] = obs_mags_knots
+    if no_dbk:
+        args = (
+            mc_is_q,
+            mock["uran_av"],
+            mock["uran_delta"],
+            mock["uran_funo"],
+            mock["uran_pburst"],
+            mock["delta_mag_ssp_scatter"],
+            sfh_params,
+            mock["redshift_true"],
+            t_obs,
+            mah_params,
+            ssp_data,
+            precomputed_ssp_mag_table,
+            z_phot_table,
+            wave_eff_table,
+            param_collection.mzr_params,
+            param_collection.spspop_params,
+            param_collection.scatter_params,
+            param_collection.ssperr_params,
+            sim_info.cosmo_params,
+            sim_info.fb,
+        )
+        _res = dbk_phot_from_mock._reproduce_mock_phot_kern(*args)
+        phot_info, phot_randoms = _res
+        phot_info = phot_info._asdict()
+
+    else:
+        args = (
+            mc_is_q,
+            mock["uran_av"],
+            mock["uran_delta"],
+            mock["uran_funo"],
+            mock["uran_pburst"],
+            mock["delta_mag_ssp_scatter"],
+            sfh_params,
+            mock["redshift_true"],
+            t_obs,
+            mah_params,
+            mock["fknot"],
+            ssp_data,
+            precomputed_ssp_mag_table,
+            z_phot_table,
+            wave_eff_table,
+            param_collection.mzr_params,
+            param_collection.spspop_params,
+            param_collection.scatter_params,
+            param_collection.ssperr_params,
+            sim_info.cosmo_params,
+            sim_info.fb,
+        )
+        _res = dbk_phot_from_mock._reproduce_mock_dbk_kern(*args)
+        (
+            phot_info,
+            phot_randoms,
+            disk_bulge_history,
+            obs_mags_bulge,
+            obs_mags_disk,
+            obs_mags_knots,
+        ) = _res
+        phot_info = phot_info._asdict()
+        phot_info["obs_mags_bulge"] = obs_mags_bulge
+        phot_info["obs_mags_disk"] = obs_mags_disk
+        phot_info["obs_mags_knots"] = obs_mags_knots
 
     if return_results:
         return mock, phot_info, tcurves
@@ -410,5 +469,10 @@ def check_recomputed_photometry(fn_lc_mock, n_test=200, return_results=False):
             )
         except AssertionError:
             msg.append("Inconsistent recalculation of disk/bulge/knot obs_mags")
+        except KeyError:
+            if no_dbk is True:
+                pass
+            else:
+                msg.append("Missing disk/bulge/knot photometry")
 
     return msg

{diffsky-0.3.3 → diffsky-0.3.4}/diffsky/data_loaders/hacc_utils/lc_mock.py

@@ -1,30 +1,28 @@
 # flake8: noqa: E402
 """Kernels used to produce the SFH mock lightcone"""
+import jax
+
+jax.config.update("jax_enable_x64", True)
 
 import os
 from collections import namedtuple
 
-import jax
-from dsps.data_loaders import load_transmission_curve
-from dsps.data_loaders.load_filter_data import TransmissionCurve
-from dsps.data_loaders.load_ssp_data import SSPData
-
-from ...param_utils import diffsky_param_wrapper as dpw
-from .. import io_utils as iou
-
-jax.config.update("jax_enable_x64", True)
 import h5py
 import numpy as np
 from diffmah import DEFAULT_MAH_PARAMS, logmh_at_t_obs
 from diffstar import DEFAULT_DIFFSTAR_PARAMS
 from diffstar.defaults import T_TABLE_MIN
 from dsps.cosmology import flat_wcdm
+from dsps.data_loaders import load_transmission_curve
+from dsps.data_loaders.load_filter_data import TransmissionCurve
 from dsps.sfh.diffburst import DEFAULT_BURST_PARAMS
 from jax import jit as jjit
 from jax import numpy as jnp
 from jax import random as jran
 from jax import vmap
 
+from diffsky.data_loaders import load_ssp_data
+
 from ...dustpop.tw_dust import DEFAULT_DUST_PARAMS
 from ...ellipsoidal_shapes import bulge_shapes, disk_shapes, ellipse_proj_kernels
 from ...experimental.black_hole_modeling import black_hole_mass as bhm
@@ -38,7 +36,8 @@ from ...experimental.size_modeling import disk_bulge_sizes as dbs
 from ...fake_sats import halo_boundary_functions as hbf
 from ...fake_sats import nfw_config_space as nfwcs
 from ...fake_sats import vector_utilities as vecu
-from .. import load_flat_hdf5
+from ...param_utils import diffsky_param_wrapper as dpw
+from .. import io_utils as iou
 from . import lightcone_utils as hlu
 from . import load_lc_cf
 
@@ -105,8 +104,6 @@ DIFFSKY_DATA_KEYS_OUT = (
     "logmp_obs",
     *TOP_HOST_SHAPE_KEYS,
     *DEFAULT_MAH_PARAMS._fields,
-    *SIZE_KEYS,
-    *ORIENTATION_KEYS,
 )
 
 PHOT_INFO_KEYS_OUT = (
@@ -127,6 +124,13 @@ BLACK_HOLE_KEYS_OUT = (
     "black_hole_accretion_rate",
 )
 
+DBK_KEYS = (
+    "fknot",
+    *ORIENTATION_KEYS,
+    *SIZE_KEYS,
+    *MORPH_KEYS_OUT,
+    *BLACK_HOLE_KEYS_OUT,
+)
 
 interp_vmap = jjit(vmap(jnp.interp, in_axes=(0, None, 0)))
 
@@ -136,20 +140,27 @@ BNPAT_SSP_DATA = "diffsky_{0}_ssp_data.hdf5"
 BNPAT_PARAM_COLLECTION = "diffsky_{0}_param_collection.hdf5"
 
 
+def get_output_mock_columns(no_dbk, no_sed):
+    if no_sed:
+        raise NotImplementedError("sfh-only mock")
+    else:
+        if no_dbk:
+            raise NotImplementedError("SED-only mock")
+        else:
+            raise NotImplementedError("DBK SED mock")
+
+
 def write_diffsky_ssp_data_to_disk(drn_out, mock_version_name, ssp_data):
     """"""
     bn_ssp_data = BNPAT_SSP_DATA.format(mock_version_name)
-    with h5py.File(os.path.join(drn_out, bn_ssp_data), "w") as hdf_out:
-        for name, arr in zip(ssp_data._fields, ssp_data):
-            hdf_out[name] = arr
+    fn_ssp_data = os.path.join(drn_out, bn_ssp_data)
+    load_ssp_data.write_ssp_templates_to_disk(fn_ssp_data, ssp_data)
 
 
 def load_diffsky_ssp_data(drn_mock, mock_version_name):
     bn_ssp_data = BNPAT_SSP_DATA.format(mock_version_name)
     fn_ssp_data = os.path.join(drn_mock, bn_ssp_data)
-    ssp_data_dict = load_flat_hdf5(fn_ssp_data)
-
-    ssp_data = SSPData(*[ssp_data_dict[key] for key in SSPData._fields])
+    ssp_data = load_ssp_data.load_ssp_templates(fn=fn_ssp_data)
     return ssp_data
 
 
@@ -253,24 +264,6 @@ def load_diffsky_z_phot_table(fn_mock):
     return z_phot_table
 
 
-def write_lc_sfh_mock_to_disk(fnout, lc_data, diffsky_data):
-    with h5py.File(fnout, "w") as hdf_out:
-
-        hdf_out.require_group("data")
-
-        ra, dec = hlu._get_lon_lat_from_theta_phi(lc_data["theta"], lc_data["phi"])
-        hdf_out["data/ra"] = ra
-        hdf_out["data/dec"] = dec
-
-        for key in LC_DATA_KEYS_OUT:
-            key_out = "data/" + key
-            hdf_out[key_out] = lc_data[key]
-
-        for key in DIFFSKY_DATA_KEYS_OUT:
-            key_out = "data/" + key
-            hdf_out[key_out] = diffsky_data[key]
-
-
 def get_imputed_velocity(vx, vy, vz, ran_key, std_v=500.0):
     """Overwrite zero-valued velocities with random normal data"""
     msk_imputed = (vx == 0) & (vy == 0) & (vz == 0)
@@ -296,14 +289,20 @@ def write_batched_lc_sfh_mock_to_disk(fnout, lc_data, diffsky_data):
 
 
 def write_batched_lc_sed_mock_to_disk(
-    fnout, phot_info, lc_data, diffsky_data, filter_nicknames
+    fnout, phot_info, lc_data, diffsky_data, filter_nicknames, lineflux_nicknames
 ):
     write_batched_lc_sfh_mock_to_disk(fnout, lc_data, diffsky_data)
 
-    phot_dict = dict()
+    specphot_dict = dict()
     for iband, name in enumerate(filter_nicknames):
-        phot_dict[name] = phot_info["obs_mags"][:, iband]
-    write_batched_mock_data(fnout, phot_dict, list(phot_dict.keys()), dataset="data")
+        specphot_dict[name] = phot_info["obs_mags"][:, iband]
+
+    for linename in lineflux_nicknames:
+        specphot_dict[linename] = phot_info[linename]
+
+    write_batched_mock_data(
+        fnout, specphot_dict, list(specphot_dict.keys()), dataset="data"
+    )
 
     phot_info_colnames = [
         *DEFAULT_BURST_PARAMS._fields,
@@ -313,55 +312,14 @@ def write_batched_lc_sed_mock_to_disk(
     ]
     write_batched_mock_data(fnout, phot_info, phot_info_colnames, dataset="data")
 
-    diffsky_data_colnames = [*MORPH_KEYS_OUT, *BLACK_HOLE_KEYS_OUT]
-    write_batched_mock_data(fnout, diffsky_data, diffsky_data_colnames, dataset="data")
-
-
-def write_lc_sed_mock_to_disk(
-    fnout, phot_info, lc_data, diffsky_data, filter_nicknames
-):
-    write_lc_sfh_mock_to_disk(fnout, lc_data, diffsky_data)
-
-    with h5py.File(fnout, "a") as hdf_out:
-        for iband, name in enumerate(filter_nicknames):
-            hdf_out["data"][name] = phot_info["obs_mags"][:, iband]
-
-        for burst_pname in DEFAULT_BURST_PARAMS._fields:
-            hdf_out["data"][burst_pname] = phot_info[burst_pname]
-
-        for dust_pname in DEFAULT_DUST_PARAMS._fields:
-            hdf_out["data"][dust_pname] = phot_info[dust_pname]
-
-        hdf_out["data"]["mc_sfh_type"] = phot_info["mc_sfh_type"]
-
-        for name in PHOT_INFO_KEYS_OUT:
-            hdf_out["data"][name] = phot_info[name]
-
-        for name in MORPH_KEYS_OUT:
-            hdf_out["data"][name] = diffsky_data[name]
-
-        for name in BLACK_HOLE_KEYS_OUT:
-            hdf_out["data"][name] = diffsky_data[name]
-
-
-def write_lc_dbk_sed_mock_to_disk(
-    fnout, phot_info, lc_data, diffsky_data, filter_nicknames
-):
-    write_lc_sed_mock_to_disk(fnout, phot_info, lc_data, diffsky_data, filter_nicknames)
-    with h5py.File(fnout, "a") as hdf_out:
-        for iband, name in enumerate(filter_nicknames):
-            hdf_out["data"][name + "_bulge"] = phot_info["obs_mags_bulge"][:, iband]
-            hdf_out["data"][name + "_disk"] = phot_info["obs_mags_disk"][:, iband]
-            hdf_out["data"][name + "_knots"] = phot_info["obs_mags_knots"][:, iband]
-        hdf_out["data"]["fknot"] = phot_info["fknot"]
-
 
 def write_batched_lc_dbk_sed_mock_to_disk(
-    fnout, phot_info, lc_data, diffsky_data, filter_nicknames
+    fnout, phot_info, lc_data, diffsky_data, filter_nicknames, lineflux_nicknames
 ):
     write_batched_lc_sed_mock_to_disk(
-        fnout, phot_info, lc_data, diffsky_data, filter_nicknames
+        fnout, phot_info, lc_data, diffsky_data, filter_nicknames, lineflux_nicknames
     )
+
     dbk_phot_dict = dict()
     for iband, name in enumerate(filter_nicknames):
         dbk_phot_dict[name + "_bulge"] = phot_info["obs_mags_bulge"][:, iband]
@@ -372,6 +330,14 @@ def write_batched_lc_dbk_sed_mock_to_disk(
         fnout, dbk_phot_dict, list(dbk_phot_dict.keys()), dataset="data"
     )
 
+    diffsky_data_colnames = [
+        *MORPH_KEYS_OUT,
+        *BLACK_HOLE_KEYS_OUT,
+        *ORIENTATION_KEYS,
+        *SIZE_KEYS,
+    ]
+    write_batched_mock_data(fnout, diffsky_data, diffsky_data_colnames, dataset="data")
+
 
 def add_peculiar_velocity_to_mock(
     lc_data, diffsky_data, ran_key=None, impute_vzero=True
@@ -450,15 +416,22 @@ def add_dbk_phot_quantities_to_mock(
         [diffsky_data[key] for key in DEFAULT_MAH_PARAMS._fields]
     )
 
-    dbk_phot_info, dbk_weights = mcpk._mc_lc_dbk_phot_kern(
+    precomputed_ssp_lineflux_cgs_table = np.array(
+        [emline.line_flux for emline in ssp_data.emlines]
+    )
+    line_wave_table = np.array([emline.line_wave for emline in ssp_data.emlines])
+
+    dbk_phot_info, dbk_weights = mcpk._mc_dbk_specphot_kern(
         ran_key,
         lc_data["redshift_true"],
         diffsky_data["t_obs"],
         mah_params,
         ssp_data,
         precomputed_ssp_mag_table,
+        precomputed_ssp_lineflux_cgs_table,
         z_phot_table,
         wave_eff_table,
+        line_wave_table,
         param_collection.diffstarpop_params,
         param_collection.mzr_params,
         param_collection.spspop_params,
@@ -475,6 +448,51 @@ def add_dbk_phot_quantities_to_mock(
     return dbk_phot_info, lc_data, diffsky_data
 
 
+def add_phot_quantities_to_mock(
+    sim_info,
+    lc_data,
+    diffsky_data,
+    ssp_data,
+    param_collection,
+    precomputed_ssp_mag_table,
+    z_phot_table,
+    wave_eff_table,
+    ran_key,
+):
+    ran_key, mah_key = jran.split(ran_key, 2)
+    diffsky_data = add_diffmah_properties_to_mock(
+        diffsky_data, lc_data["redshift_true"], sim_info, mah_key
+    )
+
+    mah_params = DEFAULT_MAH_PARAMS._make(
+        [diffsky_data[key] for key in DEFAULT_MAH_PARAMS._fields]
+    )
+
+    phot_info, phot_randoms = mcpk._mc_phot_kern(
+        ran_key,
+        lc_data["redshift_true"],
+        diffsky_data["t_obs"],
+        mah_params,
+        ssp_data,
+        precomputed_ssp_mag_table,
+        z_phot_table,
+        wave_eff_table,
+        param_collection.diffstarpop_params,
+        param_collection.mzr_params,
+        param_collection.spspop_params,
+        param_collection.scatter_params,
+        param_collection.ssperr_params,
+        sim_info.cosmo_params,
+        sim_info.fb,
+    )
+
+    # Discard columns storing non-tabular data
+    phot_info = phot_info._asdict()
+    phot_info.pop("t_table")
+
+    return phot_info, lc_data, diffsky_data
+
+
 def add_morphology_quantities_to_diffsky_data(
     sim_info, phot_info, lc_data, diffsky_data, morph_key
 ):