Skip to content

organism = [org_name, org_label, org_yaml] #104

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

Merged
merged 3 commits into from
Dec 10, 2024
Merged

organism = [org_name, org_label, org_yaml] #104

merged 3 commits into from
Dec 10, 2024

Conversation

adRn-s
Copy link
Contributor

@adRn-s adRn-s commented Nov 20, 2024

Basically, we pass the list of 3 strings to any pipeline function (e.g. ATAC()), and use org_name for logs or emails, org_label for directories, and org_yaml for commands.

Extra maps (BRB.ET.getOffSpeciesRate() and 10X_snakepipe) are not changed (yet). I hope we don't need more strings for these. In any case, I would leave those changes for a latter release.

@adRn-s adRn-s force-pushed the org3strings branch 2 times, most recently from c083d2f to 2a1fa99 Compare November 20, 2024 15:46
@thomasmanke
Copy link
Contributor

Looks good and much simpler - thank you.
But I still struggle which the organism logic inside GetResults(). It seems here there is still an assumption that "organism" is a single value, rather than a list of 3. Could you double check, please?

I also still need to see how dissectBCL would cope with the new organism list from Parkour

@@ -689,14 +657,14 @@ def GetResults(config, project, libraries):
reruncount += 1
outputDir, rv, sambaUpdate = globals()[pipeline](config, group, project, organism, libraryType, tuples)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we are passing over the organism variable, which is the list of 3 strings. This is because the pipeline-calling functions (e.g. scRNAseq()) won't work with just one.

@adRn-s adRn-s merged commit 1f69288 into main Dec 10, 2024
4 checks passed
@adRn-s adRn-s deleted the org3strings branch December 10, 2024 08:46
if tuples[0][2].startswith("Smart-Seq2"):
# SMART-seq isn't a dUTP-based method!
CMD.extend(['--libraryType', '0'])
elif tuples[0][2].startswith("NEBNext Low Input RNA Library"):
# Unstranded
CMD.extend(['--libraryType', '0'])
CMD.extend(['--libraryType', '0', r"--trimmerOptions '-a AGATCGGAAGAGC -A AGATCGGAAGAGC'"])
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is only to highlight that I sneaked in a change that should probably have had its own PR.

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.

2 participants