Repository navigation
Merge the tomography branch into develop - #402
Merged
Merged
Conversation
…end with the new API. Updated the run script to the most recent version of GLASS
… density at runtime.
… for harmonic space estimators
…k to the config file.
Pulling updates to the tomo branch.
…o-tomography Bringing the develop branch to the tomo-pseudo-cl branch
Revert "Tomographic pseudo-cl"
…AG test Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0138Efdjkma53ysbYhhXDgxW
The tomography branch inserts _tomo_bin_all into CosmologyValidation.basename, but inference.smk and covariance.smk still hard-coded the pre-tomography rho_stats/tau_stats/cov_tau names, so they could never match what rho_tau_stats writes. cv_rho_stats, cv_tau_stats and a new cv_cov_tau now live in common.py (cosmo_val.smk is only included with a cosmo_val config, so its helpers were invisible to the compute rules) and take the binning explicitly: CV_FIDUCIAL in cosmo_val, the wildcards in inference_prep, FIDUCIAL for the glass-mock rules. cv_objectwise_leakage reads every version's rho/tau FITS through _load_alpha_leakage but declared no inputs; it now declares them so it is scheduled after rho_tau_stats. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…es it Reverts d603c5c. The CAMB/CCL difference is mostly the non-linear model (mead2020 vs halofit), not an error, and the fiducial only sets the signal term of a Gaussian covariance. The one real defect, cs_util's CCL-to-CAMB conversion dropping m_nu, belongs in cs_util. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0138Efdjkma53ysbYhhXDgxW
…rectory The iNKA covariance was computed and moved into place, then the job failed removing its temporary directory: files still open leave .nfs placeholders. Also report the BB block's real shape (it printed 5x5 for a 32-bin block). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0138Efdjkma53ysbYhhXDgxW
…type is given A cov_type of None was formatted into the covariance file name (cov_tau_…_None.npy), so the workflow's tau plot failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0138Efdjkma53ysbYhhXDgxW
The rho/tau rule writes the covariance of cov_estimate_method next to the tau statistics; the plot now draws its error bars from it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0138Efdjkma53ysbYhhXDgxW
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
…riance Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
…files Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
Seed each draw with its index and use k-means++ so the initialization samples distinct layouts. Rebuild the shared-layout catalogues because TreeCorr caches patch catalogues independently of reassigned centres. Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
BE equals EB for the all/all auto-spectrum, so return a separate copy for the supported BE diagnostic. Tomographic cross-pair FITS readback retains its independent BE. Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
One supplied xi covariance describes one pair, not every auto/cross pair. Fail before measuring tomography rather than silently assigning the same uncertainties to different samples. Co-Authored-By: GPT-6.1 Sol <noreply@openai.com>
White shape noise is flat in ell; zeroing it below the first band understated the Gaussian covariance there. Sacha agreed in the #394 review that there was no reason for the zeros. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz
The fixture passed one cov_path for every bin pair, which COSEBIs now rejects for tomography. Four jackknife patches give each pair its own covariance; the assertion on per-pair results is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz
Merge develop into the tomography branch
The tomography branch carries develop up to 8db2aa5 through #394, plus the tomographic API reviewed in #307 and #394. The only conflict was uv.lock, re-resolved from develop's lock against the merged pyproject.toml. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz
The test touched rho/tau inputs under develop's old basename; the merged
rules name them with cv_basename, which carries the ('all','all') bin pair.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Step 4 of #375: this merges the tomography branch into
develop. After it lands, the tomography branch retires.Everything in it has already been reviewed. Develop up to 8db2aa5 and the tomographic API came in through #394 (approved by Sacha and Lisa), and the leakage work came in through #307. Since 8db2aa5, develop has moved only by dependency updates (#397, #398) and the GLASS fiducial-suite configuration (2eb573e and two DAG-test fixes), which merge without textual conflict. One of them, develop's GLASS-suite DAG test, named its ρ/τ placeholders with the old basename; fee38cc names them through
cv_basename, as the merged rules do.The only conflict was
uv.lock. It was re-resolved from develop's lock against the mergedpyproject.toml:cosmology.compat.camb, and Sacha's OneCovariance fork (levin) is added.After merge
develop.develop. It was written against the old analysis core and conflicts in 18 files.Part of #375.
— Claude Opus 5.5 on behalf of Cail
🤖 Generated with Claude Code
https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz