diffsky 0.3.1__tar.gz → 0.3.2__tar.gz

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/linting.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: conda-incubator/setup-miniconda@v3
         with:

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/mock_generation_test.yaml

@@ -12,18 +12,26 @@ on:
 
 jobs:
   mock-generation:
-    name: python make_dbk_sed_lc_mock_lj.py -synthetic_cores 1
+    name: python make_ou26_mock.py -synthetic_cores 1
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - name: free disk space
+        uses: endersonmenezes/free-disk-space@v3
+        with:
+          remove_android: true
+          remove_dotnet: true
+          remove_haskell: true
+          rm_cmd: "rmz"
+    
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: 3.11
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: strict
           show-channel-urls: true
           miniforge-version: latest
@@ -38,21 +46,21 @@ jobs:
           conda config --set always_yes yes
           conda install --quiet \
             --file=requirements.txt
-          conda install -y -q \
+          conda install --quiet \
             pip \
             setuptools \
             "setuptools_scm>=7,<8" \
             matplotlib \
             astropy \
             h5py \
-            mpi4py
-          pip install git+https://github.com/ArgonneCPAC/HACCyTrees.git
-          pip uninstall diffmah --yes
-          pip uninstall diffstar --yes
-          pip uninstall dsps --yes
-          pip install --no-deps git+https://github.com/ArgonneCPAC/diffmah.git
-          pip install --no-deps git+https://github.com/ArgonneCPAC/diffstar.git
-          pip install --no-deps git+https://github.com/ArgonneCPAC/dsps.git
+            mpi4py \
+            mpich
+          conda uninstall diffmah --force
+          conda uninstall diffstar --force
+          conda uninstall dsps --force
+          pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/diffmah.git
+          pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/diffstar.git
+          pip install --no-deps --no-build-isolation git+https://github.com/ArgonneCPAC/dsps.git
           python -m pip install --no-build-isolation --no-deps -e .
 
       - name: download dsps data
@@ -85,7 +93,7 @@ jobs:
           mkdir -p ci_test_output
 
           # Run mock production script
-          mpiexec -n 1 python scripts/LJ_LC_MOCKS/make_dbk_sed_lc_mock_lj.py \
+          mpiexec -n 1 python scripts/LJ_LC_MOCKS/make_ou26_mock.py \
             poboy \
             0.01 \
             0.2 \
@@ -97,7 +105,8 @@ jobs:
             -sfh_model smdpl_dr1 \
             -synthetic_cores 1 \
             -lgmp_min 12.0 \
-            -lgmp_max 13.0
+            -lgmp_max 13.0 \
+            --lsst_only
 
       - name: verify script completed
         shell: bash -l {0}

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/monthly-warning-test.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/test_latest_releases.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/test_main_branch.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/test_new_diffstar.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

{diffsky-0.3.1 → diffsky-0.3.2}/.github/workflows/tests_cron.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

{diffsky-0.3.1 → diffsky-0.3.2}/.gitignore

@@ -13,6 +13,8 @@ scripts/*.cfg~
 
 .DS_Store
 
+docs/source/drn_dsps_temp/*
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

{diffsky-0.3.1 → diffsky-0.3.2}/CHANGES.rst

@@ -1,3 +1,11 @@
+0.3.2 (2025-12-04)
+-------------------
+- Resolve bug in the treatment of scatter in the SSP errors.
+- Component vs composite SEDs now exactly agree
+- Improved CI and unit testing
+- See (https://github.com/ArgonneCPAC/diffsky/pull/284) for details.
+
+
 0.3.1 (2025-11-23)
 -------------------
 - Update diffsky to be compatible with diffstar v1.0.2 (https://github.com/ArgonneCPAC/diffsky/pull/277)

{diffsky-0.3.1 → diffsky-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffsky
-Version: 0.3.1
+Version: 0.3.2
 Summary: Library for differentiable generation of synthetic skies
 Author-email: Andrew Hearin <ahearin@anl.gov>
 License: BSD 3-Clause License

diffsky-0.3.2/diffsky/_version.py

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

{diffsky-0.3.1 → diffsky-0.3.2}/diffsky/data_loaders/hacc_utils/data_validation/validate_lc_mock.py

@@ -9,10 +9,10 @@ from diffstar import DEFAULT_DIFFSTAR_PARAMS
 from dsps.cosmology.flat_wcdm import age_at_z
 
 from .... import phot_utils
-from ....experimental import dbk_from_mock
+from ....experimental import dbk_from_mock2
 from ....experimental import precompute_ssp_phot as psspp
 from ....param_utils import diffsky_param_wrapper as dpw
-from .. import lc_mock_production as lcmp
+from .. import lc_mock_repro as lcmp
 from .. import load_flat_hdf5, load_lc_cf
 
 REQUIRED_METADATA_ATTRS = ("creation_date", "README", "mock_version_name")
@@ -95,6 +95,7 @@ def check_all_data_columns_have_metadata(fn_lc_mock):
 
     msg = []
     with h5py.File(fn_lc_mock, "r") as hdf:
+
         for key in hdf["data"].keys():
             try:
                 unit = hdf["data/" + key].attrs["unit"]
@@ -275,12 +276,10 @@ def check_recomputed_photometry(fn_lc_mock, n_test=200, return_results=False):
 
     drn_mock = os.path.dirname(fn_lc_mock)
     tcurves = lcmp.load_diffsky_tcurves(drn_mock, mock_version_name)
-    t_table = lcmp.load_diffsky_t_table(drn_mock, mock_version_name)
     ssp_data = lcmp.load_diffsky_ssp_data(drn_mock, mock_version_name)
     sim_info = lcmp.load_diffsky_sim_info(fn_lc_mock)
 
     mock = load_flat_hdf5(fn_lc_mock, dataset="data", iend=n_test)
-    n_gals = mock["redshift_true"].size
 
     mah_params = DEFAULT_MAH_PARAMS._make(
         [mock[key] for key in DEFAULT_MAH_PARAMS._fields]
@@ -291,11 +290,6 @@ def check_recomputed_photometry(fn_lc_mock, n_test=200, return_results=False):
     param_collection = lcmp.load_diffsky_param_collection(drn_mock, mock_version_name)
     t_obs = age_at_z(mock["redshift_true"], *sim_info.cosmo_params)
 
-    _msk_q = mock["mc_sfh_type"].reshape((n_gals, 1))
-    delta_scatter = np.where(
-        _msk_q == 0, mock["delta_scatter_q"], mock["delta_scatter_ms"]
-    )
-
     # Precompute photometry at each element of the redshift table
     z_phot_table = lcmp.load_diffsky_z_phot_table(fn_lc_mock)
     wave_eff_table = phot_utils.get_wave_eff_table(z_phot_table, tcurves)
@@ -304,31 +298,43 @@ def check_recomputed_photometry(fn_lc_mock, n_test=200, return_results=False):
         tcurves, ssp_data, z_phot_table, sim_info.cosmo_params
     )
 
+    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["logmp0"],
-        t_table,
+        mock["fknot"],
         ssp_data,
         precomputed_ssp_mag_table,
         z_phot_table,
         wave_eff_table,
-        sfh_params,
         param_collection.mzr_params,
         param_collection.spspop_params,
         param_collection.scatter_params,
         param_collection.ssperr_params,
         sim_info.cosmo_params,
         sim_info.fb,
-        mock["uran_av"],
-        mock["uran_delta"],
-        mock["uran_funo"],
-        delta_scatter,
-        mock["mc_sfh_type"],
-        mock["fknot"],
     )
-    phot_info = dbk_from_mock._disk_bulge_knot_phot_from_mock(*args)
+    _res = dbk_from_mock2._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

{diffsky-0.3.1 → diffsky-0.3.2}/diffsky/data_loaders/hacc_utils/lc_mock_production.py

@@ -31,7 +31,7 @@ from jax import vmap
 from ...dustpop.tw_dust import DEFAULT_DUST_PARAMS
 from ...ellipsoidal_shapes import bulge_shapes, disk_shapes, ellipse_proj_kernels
 from ...experimental import mc_diffsky_disk_bulge_knot_seds as mc_dbk_sed
-from ...experimental import mc_diffsky_seds
+from ...experimental import mc_diffsky_seds, mc_phot
 from ...experimental.black_hole_modeling import black_hole_mass as bhm
 from ...experimental.black_hole_modeling.black_hole_accretion_rate import (
     monte_carlo_bh_acc_rate,
@@ -435,36 +435,15 @@ def add_sed_quantities_to_mock(
     return phot_info, lc_data, diffsky_data
 
 
-def add_dbk_sed_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,
-):
-    (
-        diffstarpop_params,
-        mzr_params,
-        spspop_params,
-        scatter_params,
-        ssp_err_pop_params,
-    ) = param_collection
-
-    diffsky_data["t_obs"] = flat_wcdm.age_at_z(
-        lc_data["redshift_true"], *sim_info.cosmo_params
-    )
+def add_diffmah_properties_to_mock(diffsky_data, redshift_true, sim_info, ran_key):
+    diffsky_data["t_obs"] = flat_wcdm.age_at_z(redshift_true, *sim_info.cosmo_params)
 
     mah_params = DEFAULT_MAH_PARAMS._make(
         [diffsky_data[key] for key in DEFAULT_MAH_PARAMS._fields]
     )
 
-    ran_key, mah_key = jran.split(ran_key, 2)
     mah_params, msk_has_diffmah_fit = load_lc_cf.get_imputed_mah_params(
-        mah_key, diffsky_data, sim_info.lgt0
+        ran_key, diffsky_data, sim_info.lgt0
     )
     for pname, pval in zip(mah_params._fields, mah_params):
         diffsky_data[pname] = pval
@@ -481,6 +460,71 @@ def add_dbk_sed_quantities_to_mock(
         np.zeros(mah_params.logm0.size) + diffsky_data["t_obs"],
         sim_info.lgt0,
     )
+    return diffsky_data
+
+
+def add_dbk_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]
+    )
+
+    dbk_phot_info = mc_phot.mc_lc_dbk_phot(
+        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,
+        sim_info.cosmo_params,
+        sim_info.fb,
+    )
+
+    # Discard columns storing non-tabular data
+    dbk_phot_info = dbk_phot_info._asdict()
+    dbk_phot_info.pop("burstiness")
+    dbk_phot_info.pop("t_table")
+
+    return dbk_phot_info, lc_data, diffsky_data
+
+
+def add_dbk_sed_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]
+    )
 
     t_table = np.linspace(T_TABLE_MIN, 10**sim_info.lgt0, N_T_TABLE)
 
@@ -496,11 +540,7 @@ def add_dbk_sed_quantities_to_mock(
         precomputed_ssp_mag_table,
         z_phot_table,
         wave_eff_table,
-        diffstarpop_params,
-        mzr_params,
-        spspop_params,
-        scatter_params,
-        ssp_err_pop_params,
+        *param_collection,
         sim_info.cosmo_params,
         sim_info.fb,
     )
@@ -523,9 +563,6 @@ def add_morphology_quantities_to_diffsky_data(
         phot_info["bulge_to_total_history"],
     )
 
-    diffsky_data["sfh_bulge"] = phot_info["sfh_bulge"]
-    diffsky_data["sfh_disk"] = phot_info["sfh_table"] - diffsky_data["sfh_bulge"]
-
     morph_key, disk_size_key, bulge_size_key = jran.split(morph_key, 3)
     r50_disk, zscore_disk = dbs.mc_r50_disk_size(
         10 ** phot_info["logsm_obs"], lc_data["redshift_true"], disk_size_key
@@ -650,14 +687,23 @@ def concatenate_batched_phot_data(phot_batches):
 
     phot_info = dict()
     for key in phot_batches[0][0].keys():
-        phot_info[key] = np.concatenate([x[0][key] for x in phot_batches])
+        try:
+            phot_info[key] = np.concatenate([x[0][key] for x in phot_batches])
+        except ValueError:
+            raise ValueError(f"Unable to concatenate phot_info['{key}']")
 
     lc_data = dict()
     for key in phot_batches[0][1].keys():
-        lc_data[key] = np.concatenate([x[1][key] for x in phot_batches])
+        try:
+            lc_data[key] = np.concatenate([x[1][key] for x in phot_batches])
+        except ValueError:
+            raise ValueError(f"Unable to concatenate lc_data['{key}']")
 
     diffsky_data = dict()
     for key in phot_batches[0][2].keys():
-        diffsky_data[key] = np.concatenate([x[2][key] for x in phot_batches])
+        try:
+            diffsky_data[key] = np.concatenate([x[2][key] for x in phot_batches])
+        except ValueError:
+            raise ValueError(f"Unable to concatenate diffsky_data['{key}']")
 
     return phot_info, lc_data, diffsky_data