chore: Merge branch 'main' of https://github.com/CCBR/CHAMPAGNE

CCBR · Nov 16, 2023 · fe05d3b · fe05d3b
2 parents d68231d + 5763627
commit fe05d3b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
   - Per sample fingerprint plots instead of per replicate
   - Input normalized profile plots
   - Protein-coding-only versions of plots
+  - Ensure sample IDs are sorted (#150)
 
 ## CHAMPAGNE 0.2.1
 

diff --git a/modules/local/deeptools.nf b/modules/local/deeptools.nf
@@ -81,9 +81,10 @@ process BIGWIG_SUM {
         path("bigWigSum.npz"), emit: array
 
     script:
+    // sort files on basenames, otherwise uses full file path
     """
     multiBigwigSummary bins \\
-      -b ${bigwigs.join(' ')} \\
+      -b ${bigwigs.sort({ a, b -> a.baseName <=> b.baseName }).join(' ')} \\
       --smartLabels \\
       -o bigWigSum.npz
     """
@@ -257,7 +258,7 @@ process COMPUTE_MATRIX {
   """
   echo "$mattype" > file.txt
   computeMatrix ${cmd} \\
-    -S ${bigwigs.sort().join(' ')} \\
+    -S ${bigwigs.sort({ a, b -> a.baseName <=> b.baseName }).join(' ')} \\
     -R ${bed} \\
     -p ${task.cpus} \\
     -o ${meta.id}.${bed.baseName}.${mattype}.mat.gz \\

diff --git a/subworkflows/local/deeptools/main.nf b/subworkflows/local/deeptools/main.nf
@@ -23,8 +23,8 @@ workflow DEEPTOOLS {
             .set { bigwigs }
 
         bigwigs
-            .map{ meta, bigwig -> bigwig } // sort files on basenames, otherwise uses full file path
-            .toSortedList( { a, b -> a.baseName <=> b.baseName } ) | BIGWIG_SUM
+            .map{ meta, bigwig -> bigwig }
+            .collect() | BIGWIG_SUM
         bw_array = BIGWIG_SUM.out.array
         bw_array.combine(Channel.of('heatmap', 'scatterplot')) | PLOT_CORRELATION
         bw_array | PLOT_PCA
@@ -63,7 +63,7 @@ workflow DEEPTOOLS {
         ch_all_bigwigs = Channel.value([ id: 'inputnorm' ])
             .combine(bigwigs_norm)
             .mix(bigwigs_raw)
-            .groupTuple()
+            .groupTuple() // sort files on basenames, otherwise uses full file path
             .combine(beds)
             .combine(Channel.of('metagene','TSS'))
         COMPUTE_MATRIX(ch_all_bigwigs)