Skip to content

Commit

Permalink
Update coreograph to 2.4.0
Browse files Browse the repository at this point in the history
This version outputs ome-tiff pyramids already so the roadie/pyramidize
step is no longer necessary.
  • Loading branch information
jmuhlich committed Oct 16, 2024
1 parent e67733e commit 52c6957
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion config/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ modules:
dearray:
name: coreograph
container: labsyspharm/unetcoreograph
version: 2.2.9
version: 2.4.0
cmd: python /app/UNetCoreograph.py --outputPath .
input: --imagePath
staging:
Expand Down
14 changes: 4 additions & 10 deletions modules/dearray.nf
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import mcmicro.*

include {roadie} from "$projectDir/roadie"

process coreograph {
container "${params.contPfx}${module.container}:${module.version}"

// Output -- publish masks only, images need to be pyramidized
// Output
publishDir "${params.in}/dearray", mode: "${params.publish_dir_mode}",
pattern: '**mask.tif'
pattern: '{*.ome.tif,**mask.tif}'

// QC
publishDir "${Flow.QC(params.in, module.name)}",
Expand All @@ -24,7 +22,7 @@ process coreograph {
path s

output:
path "**{,[A-Z],[A-Z][A-Z]}{[0-9],[0-9][0-9]}.tif", emit: cores
path "*.ome.tif", emit: cores
path "**_mask.tif", emit: masks
path "TMA_MAP.tif"
path "centroidsY-X.txt"
Expand All @@ -45,11 +43,7 @@ workflow dearray {
main:
coreograph(mcp, mcp.modules['dearray'], tma)

// Pass the core images through palom to pyramidize them
inputs = coreograph.out.cores.flatten()
roadie('pyramidize', inputs, '', true, "${params.in}/dearray", "${params.publish_dir_mode}")

emit:
cores = roadie.out
cores = coreograph.out.cores.flatten()
masks = coreograph.out.masks.flatten()
}

0 comments on commit 52c6957

Please sign in to comment.