Skip to content

Merge the tomography branch into develop - #402

Merged
cailmdaley merged 125 commits into
developfrom
merge/tomo-into-develop
Oct 5, 2026
Merged

cailmdaley merged 125 commits into
developfrom
merge/tomo-into-develop

Conversation

@cailmdaley

@cailmdaley cailmdaley commented Oct 5, 2026 •

Copy link
Copy Markdown
Collaborator

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 merged pyproject.toml:

After merge

Part of #375.

— Claude Opus 5.5 on behalf of Cail

🤖 Generated with Claude Code

https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz

Sacha Guerrini and others added 30 commits July 1, 2026 13:43
…end with the new API. Updated the run script to the most recent version of GLASS
Pulling updates to the tomo branch.
…o-tomography

Bringing the develop branch to the tomo-pseudo-cl branch
cailmdaley and others added 24 commits October 3, 2026 17:28
…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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Claude-Session: https://claude.ai/code/session_0138Efdjkma53ysbYhhXDgxW
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Claude-Session: https://claude.ai/code/session_0133mw5vATUB7QfqbhYac7Fz
@cailmdaley
cailmdaley merged commit 5d9ef27 into develop Oct 5, 2026
4 checks passed
@LisaGoh
LisaGoh deleted the merge/tomo-into-develop branch October 20, 2026 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants