Merge pull request #481 from ArgonneCPAC/ra_dec_bugfix

Update `lc_cores-decomposition.txt` for Last Journey to fix bug in `{ra, dec}` of synthetic halos

Author: aphearin

diffsky/data_loaders/hacc_utils/data/LastJourney/lc_cores-decomposition.txt

@@ -326,11 +326,31 @@ def check_lc_cores_decomposition(fn_lc_mock, bn=BNAME_LC_PATCH_DECOMPOSITION):
         msg.append(s)
 
     try:
-        lightcone_utils.read_lc_ra_dec_patch_decomposition(fn)
+        _res = lightcone_utils.read_lc_ra_dec_patch_decomposition(fn)
+        patch_decomposition_from_mock, sky_frac_from_mock, solid_angles_from_mock = _res
     except:  # noqa
         s = f"Failure to read {fn} with read_lc_ra_dec_patch_decomposition"
         msg.append(s)
 
+    metadata = load_lc_mock.load_mock_metadata(fn_lc_mock)
+    sim_name = metadata["nbody_info"]["sim_name"]
+    _res = lightcone_utils.read_hacc_lc_patch_decomposition(sim_name)
+    patch_decomposition_from_src, sky_frac_from_src, solid_angles_from_src = _res
+
+    try:
+        assert len(patch_decomposition_from_mock) == len(patch_decomposition_from_src)
+        assert len(sky_frac_from_mock) == len(sky_frac_from_src)
+        assert len(solid_angles_from_mock) == len(solid_angles_from_src)
+
+        assert np.allclose(
+            patch_decomposition_from_mock, patch_decomposition_from_src, rtol=1e-4
+        )
+        assert np.allclose(sky_frac_from_mock, sky_frac_from_src, rtol=1e-4)
+        assert np.allclose(solid_angles_from_mock, solid_angles_from_src, rtol=1e-4)
+    except AssertionError:
+        s = f"Inconsistency between {fn} and file stored in source code"
+        msg.append(s)
+
     return msg
 
 

diffsky/data_loaders/hacc_utils/data_validation/validate_lc_mock.py

@@ -227,6 +227,11 @@ def load_diffsky_param_collection_merging(drn_mock, mock_version_name):
     return param_collection
 
 
+def infer_lc_patch_stepnum_from_bname(bn_mock):
+    stepnum, lc_patch = bn_mock.split("-")[1].split(".")[:2]
+    return int(stepnum), int(lc_patch)
+
+
 def write_diffsky_param_collection(drn_mock, mock_version_name, param_collection):
     """"""
     bn = BNPAT_PARAM_COLLECTION.format(mock_version_name)

diffsky/data_loaders/hacc_utils/lc_mock.py

@@ -220,3 +220,15 @@ def test_add_dbk_phot_quantities_to_mock():
             getattr(fbulge_params, pname),
             rtol=0.01,
         )
+
+
+def test_infer_lc_patch_stepnum_from_bname():
+    bn = "lc_cores-453.0.diffsky_gals.synthetic_halos.hdf5"
+    stepnum, lc_patch = lcmp_repro.infer_lc_patch_stepnum_from_bname(bn)
+    assert stepnum == 453
+    assert lc_patch == 0
+
+    bn = "lc_cores-453.0.diffsky_gals.hdf5"
+    stepnum, lc_patch = lcmp_repro.infer_lc_patch_stepnum_from_bname(bn)
+    assert stepnum == 453
+    assert lc_patch == 0

diffsky/data_loaders/hacc_utils/tests/test_lc_mock.py

@@ -44,11 +44,9 @@ def mc_lightcone_random_ra_dec(ran_key, npts, ra_min, ra_max, dec_min, dec_max):
         Random coords on the sphere within the input range
 
     """
-    phi_min = jnp.deg2rad(ra_min)
-    phi_max = jnp.deg2rad(ra_max)
-
-    theta_min = jnp.deg2rad(90.0 - dec_max)
-    theta_max = jnp.deg2rad(90.0 - dec_min)
+    theta_min, theta_max, phi_min, phi_max = _get_theta_phi_minmax_from_ra_dec_minmax(
+        ra_min, ra_max, dec_min, dec_max
+    )
 
     theta, phi = mc_lightcone_random_theta_phi(
         ran_key, npts, theta_min, theta_max, phi_min, phi_max
@@ -58,6 +56,28 @@ def mc_lightcone_random_ra_dec(ran_key, npts, ra_min, ra_max, dec_min, dec_max):
     return ra, dec
 
 
+@jjit
+def _get_ra_dec_minmax_from_theta_phi_minmax(theta_min, theta_max, phi_min, phi_max):
+    ra_min = jnp.rad2deg(phi_min)
+    ra_max = jnp.rad2deg(phi_max)
+
+    dec_min = 90.0 - jnp.rad2deg(theta_max)
+    dec_max = 90.0 - jnp.rad2deg(theta_min)
+
+    return ra_min, ra_max, dec_min, dec_max
+
+
+@jjit
+def _get_theta_phi_minmax_from_ra_dec_minmax(ra_min, ra_max, dec_min, dec_max):
+    phi_min = jnp.deg2rad(ra_min)
+    phi_max = jnp.deg2rad(ra_max)
+
+    theta_min = jnp.deg2rad(90.0 - dec_max)
+    theta_max = jnp.deg2rad(90.0 - dec_min)
+
+    return theta_min, theta_max, phi_min, phi_max
+
+
 @partial(jjit, static_argnames=["npts"])
 def mc_lightcone_random_theta_phi(
     ran_key, npts, theta_min, theta_max, phi_min, phi_max

diffsky/experimental/lc_utils.py

@@ -60,3 +60,42 @@ def test_get_z_obs_from_z_true():
     dz = z_obs - z_true
     assert np.allclose(np.mean(dz), 0.0, atol=1e-3)
     assert np.std(z_obs - z_true) < 0.01
+
+
+def test_consistent_ra_dec_theta_phi_minmax():
+    ran_key = jran.key(0)
+
+    n_tests = 1_000
+    for __ in range(n_tests):
+        ran_key, theta_key, phi_key = jran.split(ran_key, 3)
+        theta_min, theta_max = np.sort(
+            jran.uniform(theta_key, minval=0, maxval=np.pi, shape=(2,))
+        )
+        phi_min, phi_max = np.sort(
+            jran.uniform(phi_key, minval=0, maxval=2 * np.pi, shape=(2,))
+        )
+        ra_min, ra_max, dec_min, dec_max = lcu._get_ra_dec_minmax_from_theta_phi_minmax(
+            theta_min, theta_max, phi_min, phi_max
+        )
+
+        assert np.all(ra_min < ra_max)
+        assert np.all(ra_min >= 0.0)
+        assert np.all(ra_min <= 360.0)
+        assert np.all(ra_max >= 0.0)
+        assert np.all(ra_max <= 360.0)
+
+        assert np.all(dec_min < dec_max)
+        assert np.all(dec_min >= -90.0)
+        assert np.all(dec_min <= 90.0)
+        assert np.all(dec_max >= -90.0)
+        assert np.all(dec_max <= 90.0)
+
+        theta_min2, theta_max2, phi_min2, phi_max2 = (
+            lcu._get_theta_phi_minmax_from_ra_dec_minmax(
+                ra_min, ra_max, dec_min, dec_max
+            )
+        )
+        assert np.allclose(theta_min, theta_min2, rtol=1e-4)
+        assert np.allclose(theta_max, theta_max2, rtol=1e-4)
+        assert np.allclose(phi_min, phi_min2, rtol=1e-4)
+        assert np.allclose(phi_max, phi_max2, rtol=1e-4)

diffsky/experimental/tests/test_lc_utils.py

@@ -1,6 +1,6 @@
 machine: "poboy"
-z_min: 0.0
-z_max: 0.06
+z_min: 0.08
+z_max: 0.1
 istart: 0
 iend: 2
 batch_size: 200

scripts/LJ_LC_MOCKS/poboy_testing_lj_mock_config.yaml

@@ -2,7 +2,7 @@ machine: "lcrc"
 z_min: 0.08
 z_max: 0.1
 istart: 0
-iend: 1
+iend: 2
 drn_out: "ci_test_output"
 mock_nickname: "ci_test_mock"
 cosmos_fit: "c260710"