@@ -162,7 +162,8 @@ process PROC_DIST_NE {
162162 publishDir " ${ resdir} /${ genome_set_id} _${ label} /ne_input/" , pattern: " *.sh" , mode: ' symlink'
163163 publishDir " ${ resdir} /${ genome_set_id} _${ label} /ne_input/" , pattern: " *.map" , mode: ' symlink'
164164 publishDir " ${ resdir} /${ genome_set_id} _${ label} /ne_input/" , pattern: " *.ibd.gz" , mode: ' symlink'
165- publishDir " ${ resdir} /${ genome_set_id} _${ label} /ibddist_ibd/" , pattern: " *_ibddist_ibd.pq" , mode: ' symlink'
165+ publishDir " ${ resdir} /${ genome_set_id} _${ label} /ibddist_ibd/" , pattern: " *.ibddist.ibdobj.gz" , mode: ' symlink'
166+ publishDir " ${ resdir} /${ genome_set_id} _${ label} /ibdne_ibd/" , pattern: " *.ibdne.ibdobj.gz" , mode: ' symlink'
166167
167168 input:
168169 tuple val(label), path(ibd_lst), val(genome_set_id)
@@ -171,7 +172,8 @@ process PROC_DIST_NE {
171172 path(" *_orig.map" ), path(" *_orig.ibd.gz" ), emit: ne_input_orig
172173 tuple val(label), path(" ibdne.jar" ), path(" *_rmpeaks.sh" ), \
173174 path(" *_rmpeaks.map" ), path(" *_rmpeaks.ibd.gz" ), emit: ne_input_rmpeaks
174- tuple val(label), path(" *_ibddist_ibd.pq" ), emit: ibddist_ibd_pq
175+ tuple val(label), path(" *.ibddist.ibdobj.gz" ), emit: ibddist_ibd_obj
176+ tuple val(label), path(" *.ibdne.ibdobj.gz" ), emit: ibdne_ibd_obj
175177 script:
176178 def args_local = [
177179 ibd_files : " ${ ibd_lst} " , // path is a blank separate list
@@ -185,7 +187,9 @@ process PROC_DIST_NE {
185187 touch ibdne.jar
186188 touch ${ genome_set_id} {_orig.sh,_orig.map,_orig.ibd.gz}
187189 touch ${ genome_set_id} {_rmpeaks.sh,_rmpeaks.map,_rmpeaks.ibd.gz}
188- touch ${ genome_set_id} _ibddist_ibd.pq
190+ touch ${ genome_set_id} .ibddist.ibdobj.gz
191+ touch ${ genome_set_id} _orig.ibdne.ibdobj.gz
192+ touch ${ genome_set_id} _rmpeaks.ibdne.ibdobj.gz
189193 """
190194}
191195
@@ -197,8 +201,8 @@ process PROC_INFOMAP {
197201 input:
198202 tuple val(label), path(ibd_lst), val(genome_set_id)
199203 output:
200- tuple val(label), path(" *_ifm_orig_ibd.pq " ), emit: ifm_orig_ibd_pq
201- tuple val(label), path(" *_ifm_rmpeaks_ibd.pq " ), emit: ifm_rmpeaks_ibd_pq
204+ tuple val(label), path(" *_orig.ifm.ibdobj.gz " ), emit: ifm_orig_ibd_obj
205+ tuple val(label), path(" *_rmpeaks.ifm.ibdobj.gz " ), emit: ifm_rmpeaks_ibd_obj
202206 script:
203207 def args_local = [
204208 ibd_files : " ${ ibd_lst} " , // path is a blank separate list
@@ -209,7 +213,7 @@ process PROC_INFOMAP {
209213 """
210214 stub:
211215 """
212- touch ${ genome_set_id} {_ifm_orig_ibd.pq,_ifm_rmpeaks_ibd.pq }
216+ touch ${ genome_set_id} {_orig.ifm.ibdobj.gz,_rmpeaks.ifm.ibdobj.gz }
213217 """
214218}
215219
@@ -238,13 +242,13 @@ process RUN_INFOMAP {
238242 tag " ${ args.genome_set_id} _${ are_peaks_removed} "
239243 publishDir " ${ resdir} /${ args.genome_set_id} _${ label} /ifm_output/" , mode: ' symlink'
240244 input:
241- tuple val(label), path(ibd_pq ), val(are_peaks_removed), val(args)
245+ tuple val(label), path(ibd_obj ), val(are_peaks_removed), val(args)
242246 output:
243247 tuple val(label), val(are_peaks_removed), path(" *_member.pq" )
244248 script:
245249 def cut_mode = are_peaks_removed? ' rmpeaks' : ' orig'
246250 def args_local = [
247- ibd_pq : ibd_pq ,
251+ ibd_obj : ibd_obj ,
248252 npop : args. npop,
249253 nsam : args. nsam,
250254 genome_set_id : args. genome_set_id,
@@ -308,7 +312,7 @@ workflow WF_SP {
308312
309313 // Process IBD for ibd distribution and ne analyses
310314 PROC_DIST_NE (ch_ibd_per_genome)
311- // PROC_DIST_NE.out.ibddist_ibd_pq .view{label, ibdpq -> [label, ibdpq.getName()]}
315+ // PROC_DIST_NE.out.ibddist_ibd_obj .view{label, ibdpq -> [label, ibdpq.getName()]}
312316
313317
314318 // RUN IBDNe actually
@@ -370,13 +374,13 @@ workflow WF_MP {
370374 // Process IBD for ibd distribution and ne analyses
371375 PROC_INFOMAP (ch_ibd_per_genome)
372376
373- // PROC_INFOMAP.out.ifm_orig_ibd_pq .view{label, ibdpq -> [label, ibdpq.getName()]}
377+ // PROC_INFOMAP.out.ifm_orig_ibd_ob .view{label, ibdpq -> [label, ibdpq.getName()]}
374378
375379
376380 // RUN INFOMAP
377381 RUN_INFOMAP (
378- PROC_INFOMAP . out. ifm_orig_ibd_pq . map{it -> it + false }. combine(ch_mp_params, by :0 ). concat(
379- PROC_INFOMAP . out. ifm_rmpeaks_ibd_pq . map{it -> it + true }. combine(ch_mp_params, by :0 )
382+ PROC_INFOMAP . out. ifm_orig_ibd_obj . map{it -> it + false }. combine(ch_mp_params, by :0 ). concat(
383+ PROC_INFOMAP . out. ifm_rmpeaks_ibd_obj . map{it -> it + true }. combine(ch_mp_params, by :0 )
380384 )
381385 )
382386
0 commit comments