Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merging error #91

Merged
merged 24 commits into from
Apr 18, 2024
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6dc231e
add tiny spatial test data
danilexn Jan 18, 2024
4f08526
no qc and prealignment stats of merged samples
danilexn Jan 18, 2024
02a4473
do not require R1 and R2 in merged samples
danilexn Jan 18, 2024
bca4239
support filtering of merged files in prealignment file generation
danilexn Jan 18, 2024
da56deb
compute union of passed spatial pucks in main smk workflow
danilexn Jan 18, 2024
1c18a36
support lists of one element when updating pucks
danilexn Jan 18, 2024
eb01f8b
spatial puck width/height with max-min instead of max
danilexn Jan 18, 2024
5baabdb
support non-mesh puck collection in main smk
danilexn Jan 18, 2024
3dc82ca
throw error when adata is empty
danilexn Jan 18, 2024
79ffb15
exclude empty pucks when default matches: 0
danilexn Jan 18, 2024
0a10d9c
add spatial tiny test data
danilexn Jan 18, 2024
0fd785c
consolidate pucks: fix reference to puck_ids
danilexn Jan 18, 2024
563aa72
fix: qc not working on puck_collection when multiple samples
danilexn Jan 24, 2024
dfa1fc5
Merge branch 'rajewsky-lab:master' into merging_issue
Apr 17, 2024
89abb7e
remove too large spatial test data
danilexn Apr 17, 2024
c297310
preprocess/dge avoid division by zero
danilexn Apr 17, 2024
d38119c
dge: fix vstack for missing mt in tiny test data
danilexn Apr 17, 2024
aaa74b1
update test reads and spatial tiles for 1 match in 2 tiles
danilexn Apr 17, 2024
f216360
fixed test reads so it runs
danilexn Apr 17, 2024
7cf1339
dge: warning when empty, set puck metrics to 1 when nan
danilexn Apr 17, 2024
847c49e
project_df: more verbosity for merge validation
danilexn Apr 17, 2024
bf082f0
main.smk: no exception when empty DGE, just warning
danilexn Apr 17, 2024
9e27e30
bump version 0.7.5 to 0.7.6
danilexn Apr 17, 2024
ac5709b
main.smk: generate qc reports when merging
danilexn Apr 17, 2024
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
Prev Previous commit
Next Next commit
support filtering of merged files in prealignment file generation
danilexn committed Jan 18, 2024
commit bca4239d51869c984ae17cc6b95c48e0fcb63d81
7 changes: 5 additions & 2 deletions spacemake/snakemake/scripts/snakemake_helper_functions.py
Original file line number Diff line number Diff line change
@@ -144,9 +144,12 @@ def get_output_files_qc(
return _out_files


def get_prealignment_files(pattern):
def get_prealignment_files(pattern, filter_merged=False):
df = project_df.df

if filter_merged:
df = df.loc[~df.is_merged]

prealignment_files = []

for index, _ in df.iterrows():
@@ -827,7 +830,7 @@ def get_all_barcode_readcounts(wildcards, prealigned=False):
"polyA_adapter_trimmed": polyA_adapter_trimmed_wildcard,
}

if prealigned:
if prealigned or is_merged:
return {"bc_readcounts": expand(barcode_readcounts, **extra_args)}
else:
return {"bc_readcounts": expand(barcode_readcounts_prealigned, **extra_args)}