Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions snapatac2-core/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,24 @@ pub fn clip_peak(mut peak: NarrowPeak, chrom_sizes: &crate::genome::ChromSizes)
peak
}

pub fn score_per_million(mut peaks: Vec<NarrowPeak>) -> Result<Vec<NarrowPeak>> {

let total_signal: f64 = peaks.iter().filter_map(|p| p.p_value).sum();

if total_signal == 0.0 {
// Prevent division by zero; just return peaks as-is.
return Ok(peaks);
}
let factor = 1_000_000.0 / total_signal;
for peak in &mut peaks {
if let Some(score) = peak.p_value.as_mut() {
*score *= factor;
}
}

Ok(peaks)
}

#[derive(Debug, Clone, Copy)]
pub enum Compression {
Gzip,
Expand Down
5 changes: 4 additions & 1 deletion snapatac2/tools/_call_peaks.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ def merge_peaks(
peaks: dict[str, 'polars.DataFrame'],
chrom_sizes: dict[str, int] | Genome,
half_width: int = 250,
normalize: bool = False,
) -> 'polars.DataFrame':
"""Merge peaks from different groups.

Expand All @@ -218,6 +219,8 @@ def merge_peaks(
chromosome sizes will be obtained from the genome.
half_width
Half width of the merged peaks.
normalize
Score per million normalization. Maybe useful when sequencing depth varies, DOI: 10.1126/science.aav1898.

Returns
-------
Expand All @@ -232,7 +235,7 @@ def merge_peaks(
import polars as pl
chrom_sizes = chrom_sizes.chrom_sizes if isinstance(chrom_sizes, Genome) else chrom_sizes
peaks = { k: pl.from_pandas(v) if isinstance(v, pd.DataFrame) else v for k, v in peaks.items()}
return _snapatac2.py_merge_peaks(peaks, chrom_sizes, half_width)
return _snapatac2.py_merge_peaks(peaks, chrom_sizes, half_width, normalize)

def _par_map(mapper, args, nprocs):
import time
Expand Down
12 changes: 10 additions & 2 deletions src/call_peaks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use pyo3::ffi::c_str;
use snapatac2_core::utils::{self, Compression};
use snapatac2_core::{
preprocessing::Fragment,
utils::{clip_peak, merge_peaks, open_file_for_write},
utils::{clip_peak, merge_peaks, open_file_for_write,score_per_million},
SnapData,
};

Expand All @@ -35,6 +35,7 @@ pub fn py_merge_peaks<'py>(
peaks: HashMap<String, PyDataFrame>,
chrom_sizes: HashMap<String, u64>,
half_width: u64,
normalize: bool,
) -> Result<PyDataFrame> {
let peak_list: Vec<_> = peaks
.into_iter()
Expand All @@ -43,7 +44,14 @@ pub fn py_merge_peaks<'py>(
Ok((key, ps))
})
.collect::<Result<_>>()?;

let peak_list = if normalize {
peak_list
.into_iter()
.map(|(key, peaks)| Ok((key, score_per_million(peaks)?)))
.collect::<Result<Vec<_>>>()?
} else {
peak_list
};
let chrom_sizes = chrom_sizes.into_iter().collect();
let peaks: Vec<_> = merge_peaks(peak_list.iter().flat_map(|x| x.1.clone()), half_width)
.flatten()
Expand Down