methylation: combine_neg option; oracle compares both background variants and logs sesame's negative controls
ci / test (3.12) (push) Failing after 9s
ci / test (3.13) (push) Failing after 11s

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01814GKVzZVL3FuF3DeiZXhv
This commit is contained in:
kemalandClaude Opus 5.5 committed 2026-09-29 00:36:44 +01:00
1 parent 916e2589fa
commit 86050ef2fc
3 files changed
+23 -13

No files matched your search

+11 -6
View File
@@ -38,9 +38,6 @@ def main() -> int:
for prefix in a.prefixes: for prefix in a.prefixes:
# min_beads=0: the oracle runs without bead-count masking (see sesame_oracle.R) # min_beads=0: the oracle runs without bead-count masking (see sesame_oracle.R)
s = sig.assemble(read_idat(prefix + "_Grn.idat"), read_idat(prefix + "_Red.idat"), man, min_beads=0) s = sig.assemble(read_idat(prefix + "_Grn.idat"), read_idat(prefix + "_Red.idat"), man, min_beads=0)
p = sig.detection_p(s)
n, fg, fr = sig.noob(s)
b = sig.beta_values(n)
rows = list(csv.DictReader((a.sesame / (Path(prefix).name + ".tsv")).open(), delimiter="\t")) rows = list(csv.DictReader((a.sesame / (Path(prefix).name + ".tsv")).open(), delimiter="\t"))
idx = np.array([pos[r["probe_id"]] for r in rows]) idx = np.array([pos[r["probe_id"]] for r in rows])
@@ -48,15 +45,22 @@ def main() -> int:
return np.array([float(r[name]) if r[name] not in ("NA", "") else np.nan for r in rows]) return np.array([float(r[name]) if r[name] not in ("NA", "") else np.nan for r in rows])
mask_s = np.array([r["mask"] == "TRUE" for r in rows]) mask_s = np.array([r["mask"] == "TRUE" for r in rows])
variants = {}
for neg in (True, False):
p = sig.detection_p(s, combine_neg=neg)
n, fg, fr = sig.noob(s, combine_neg=neg)
variants[neg] = (p, n, fg, fr, sig.beta_values(n))
keep = ~mask_s & ~s.masked[idx] keep = ~mask_s & ~s.masked[idx]
sp, sm, su, sb = col("pval"), col("m_noob"), col("u_noob"), col("beta_noob") sp, sm, su, sb = col("pval"), col("m_noob"), col("u_noob"), col("beta_noob")
op, om, ou, ob = p[idx], n.m[idx], n.u[idx], b[idx]
ana = man.analytical()[idx] & keep ana = man.analytical()[idx] & keep
res[Path(prefix).name] = { out: dict[str, object] = {
"probes": len(rows), "probes": len(rows),
"masked_sesame": int(mask_s.sum()), "masked_sesame": int(mask_s.sum()),
"masked_simurg": int(s.masked.sum()), "masked_simurg": int(s.masked.sum()),
"mask_agreement": float((mask_s == s.masked[idx]).mean()), }
for neg, (p, n, fg, fr, b) in variants.items():
op, om, ou, ob = p[idx], n.m[idx], n.u[idx], b[idx]
out[f"combine_neg={neg}"] = {
"noob_fit": {"green": vars(fg), "red": vars(fr)}, "noob_fit": {"green": vars(fg), "red": vars(fr)},
"pval_abs_diff": _q(np.abs(op - sp)[keep]), "pval_abs_diff": _q(np.abs(op - sp)[keep]),
"pval_identical_fraction": float((op[keep] == sp[keep]).mean()), "pval_identical_fraction": float((op[keep] == sp[keep]).mean()),
@@ -67,6 +71,7 @@ def main() -> int:
"beta_abs_diff": _q(np.abs(ob - sb)[keep]), "beta_abs_diff": _q(np.abs(ob - sb)[keep]),
"beta_corr": float(np.corrcoef(ob[keep & np.isfinite(sb)], sb[keep & np.isfinite(sb)])[0, 1]), "beta_corr": float(np.corrcoef(ob[keep & np.isfinite(sb)], sb[keep & np.isfinite(sb)])[0, 1]),
} }
res[Path(prefix).name] = out
a.out.write_text(json.dumps(res, indent=1)) a.out.write_text(json.dumps(res, indent=1))
print(json.dumps(res, indent=1)) print(json.dumps(res, indent=1))
return 0 return 0
+3
View File
@@ -32,6 +32,9 @@ for (prefix in args[-(1:3)]) {
sesameDataCache("idatSignature") sesameDataCache("idatSignature")
read() read()
}) })
neg <- tryCatch(negControls(sdf), error = function(e) NULL)
cat("negative controls found by sesame:", if (is.null(neg)) "error" else nrow(neg), "\n")
print(head(sdf[grepl("^ctl", sdf$Probe_ID), ], 3))
pv <- pOOBAH(sdf, return.pval = TRUE) pv <- pOOBAH(sdf, return.pval = TRUE)
sn <- noob(sdf) sn <- noob(sdf)
ib <- inband(sn) ib <- inband(sn)
+9 -7
View File
@@ -88,9 +88,9 @@ def _finite(a: F64) -> F64:
return a[np.isfinite(a)] return a[np.isfinite(a)]
def background(s: MethylSignals) -> tuple[F64, F64]: def background(s: MethylSignals, combine_neg: bool = True) -> tuple[F64, F64]:
"""Out-of-band background per channel (green, red): Infinium I OOB signal + negative controls.""" """Out-of-band background per channel (green, red): Infinium I OOB signal (+ negative controls)."""
neg = np.array([t.casefold() == "negative" for t in s.ctrl_type], dtype=np.bool_) neg = np.array([combine_neg and t.casefold() == "negative" for t in s.ctrl_type], dtype=np.bool_)
red_i, grn_i = s.col == "R", s.col == "G" red_i, grn_i = s.col == "R", s.col == "G"
oob_g = np.concatenate([s.oob_m[red_i], s.oob_u[red_i], s.ctrl_green[neg]]) oob_g = np.concatenate([s.oob_m[red_i], s.oob_u[red_i], s.ctrl_green[neg]])
oob_r = np.concatenate([s.oob_m[grn_i], s.oob_u[grn_i], s.ctrl_red[neg]]) oob_r = np.concatenate([s.oob_m[grn_i], s.oob_u[grn_i], s.ctrl_red[neg]])
@@ -118,9 +118,9 @@ def _ecdf(ref: F64): # type: ignore[no-untyped-def]
return f return f
def detection_p(s: MethylSignals) -> F64: def detection_p(s: MethylSignals, combine_neg: bool = True) -> F64:
"""pOOBAH detection p-value per probe; 1 where masked.""" """pOOBAH detection p-value per probe; 1 where masked."""
bg_g, bg_r = background(s) bg_g, bg_r = background(s, combine_neg)
fg, fr = _ecdf(bg_g), _ecdf(bg_r) fg, fr = _ecdf(bg_g), _ecdf(bg_r)
red_i, t2 = s.col == "R", s.col == "" red_i, t2 = s.col == "R", s.col == ""
m, u = np.nan_to_num(s.m, nan=0.0), np.nan_to_num(s.u, nan=0.0) m, u = np.nan_to_num(s.m, nan=0.0), np.nan_to_num(s.u, nan=0.0)
@@ -194,9 +194,11 @@ def noob_fit(ib: F64, oob: F64) -> NoobFit:
return NoobFit(mu, s, max(huber(ib)[0] - mu, 10.0)) return NoobFit(mu, s, max(huber(ib)[0] - mu, 10.0))
def noob(s: MethylSignals, offset: float = NOOB_OFFSET) -> tuple[MethylSignals, NoobFit, NoobFit]: def noob(
s: MethylSignals, offset: float = NOOB_OFFSET, combine_neg: bool = True
) -> tuple[MethylSignals, NoobFit, NoobFit]:
"""Background-corrected copy of ``s`` (probe and control signals); returns the green and red fits.""" """Background-corrected copy of ``s`` (probe and control signals); returns the green and red fits."""
bg_g, bg_r = background(s) bg_g, bg_r = background(s, combine_neg)
ib_g, ib_r = in_band(s) ib_g, ib_r = in_band(s)
fit_g, fit_r = noob_fit(ib_g, bg_g), noob_fit(ib_r, bg_r) fit_g, fit_r = noob_fit(ib_g, bg_g), noob_fit(ib_r, bg_r)