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

Change outut structure #21

Merged
merged 3 commits into from
Sep 15, 2023
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ The samplesheet specified in the `input` parameter should be a CSV file with the
- `convert`: [boolean] Should the image be converted to a OME-TIFF
- `he`: [boolean] Is the image a H&E image
- `minerva`: [boolean] Should a Minerva story be generated
- `miniatuee`: [boolean] Should a Miniature thumbnail be generated
- `miniature`: [boolean] Should a Miniature thumbnail be generated
- `id`: *optional* [string] A custom identifier to replace image simpleName in output directory structure

2 changes: 1 addition & 1 deletion data/test_samplesheet.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
image,convert,he,minerva,miniature,id
datas/exemplar-001_small.tif,true,false,true,true,cycif
data/exemplar-001_small.tif,true,false,true,true,cycif
data/CMU-1-Small-Region.svs,true,true,true,true,h_and_e
4 changes: 2 additions & 2 deletions modules/autominerva_story.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ process autominerva_story {
tuple val(meta), file(image)
output:
tuple val(meta), file(image), file('story.json')
publishDir "$params.outdir/$workflow.runName",
publishDir "$params.outdir",
pattern: 'story.json',
saveAs: {filename -> "${meta.id}/$workflow.runName/story.json"}
saveAs: {filename -> "${meta.id}/story.json"}
stub:
"""
touch story.json
Expand Down
4 changes: 2 additions & 2 deletions modules/make_miniature.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ process make_miniature {
tuple val(meta), file(image)
output:
tuple val(meta), file('miniature.jpg')
publishDir "$params.outdir/$workflow.runName",
saveAs: {filename -> "${meta.id}/$workflow.runName/thumbnail.jpg"}
publishDir "$params.outdir",
saveAs: {filename -> "${meta.id}/thumbnail.jpg"}
stub:
"""
mkdir data
Expand Down
4 changes: 2 additions & 2 deletions modules/render_pyramid.nf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ process render_pyramid {
tuple val(meta), file(image), file (story)
output:
tuple val(meta), path('minerva')
publishDir "$params.outdir/$workflow.runName",
saveAs: {filename -> "${meta.id}/$workflow.runName/minerva"}
publishDir "$params.outdir",
saveAs: {filename -> "${meta.id}/minerva"}
stub:
"""
mkdir minerva
Expand Down