@@ -15,6 +15,7 @@ params.fasta_header_id_transformer = "noop"
1515// output subfolder definition
1616params. genetrees_folder = params. output_folder + " /genetrees"
1717params. msa_folder = params. output_folder + " /msa"
18+ params. dist_folder = params. output_folder + " /distances"
1819params. hogmap_folder = params. output_folder + " /hogmap"
1920params. temp_output = params. output_folder + " /temp_output" // "/temp_omamer_rhogs"
2021
@@ -348,8 +349,9 @@ process hog_big{
348349 publishDir path: params. temp_output, enabled: params. debug_enabled, pattern: " pickle_hogs"
349350 publishDir path: params. msa_folder, enabled: params. write_msas, pattern: " *fa"
350351 publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " *nwk"
351- publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " *tsv"
352- publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " *tsv.gz"
352+ publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " HOG*tsv"
353+ publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " HOG*tsv.gz"
354+ publishDir path: params. dist_folder, pattern: " Dist_*tsv.gz"
353355
354356 input:
355357 each rhogsbig
@@ -359,15 +361,17 @@ process hog_big{
359361 path " pickle_hogs"
360362 path " *.fa" , optional: true // msa if write True
361363 path " *.nwk" , optional: true // gene trees if write True
362- path " *.tsv" , optional: true
363- path " *.tsv.gz" , optional: true
364+ path " HOG*.tsv" , optional: true
365+ path " HOG*.tsv.gz" , optional: true
366+ path " Dist_*tsv.gz"
364367 script:
365368 """
366369 fastoma-infer-subhogs --input-rhog-folder ${ rhogsbig} \
367370 --species-tree ${ species_tree} \
368371 --output-pickles pickle_hogs \
369372 --parallel \
370373 -vv \
374+ --write-pairwise-distances \
371375 --msa-filter-method ${ params.filter_method} \
372376 --gap-ratio-row ${ params.filter_gap_ratio_row} \
373377 --gap-ratio-col ${ params.filter_gap_ratio_col} \
@@ -382,8 +386,9 @@ process hog_rest{
382386 publishDir path: params. temp_output, enabled: params. debug_enabled, pattern: " pickle_hogs"
383387 publishDir path: params. msa_folder, enabled: params. write_msas, pattern: " *fa"
384388 publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " *nwk"
385- publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " *tsv"
386- publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " *tsv.gz"
389+ publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " HOG*tsv"
390+ publishDir path: params. genetrees_folder, enabled: params. write_genetrees, pattern: " HOG*tsv.gz"
391+ publishDir path: params. dist_folder, pattern: " Dist_*tsv.gz"
387392
388393 input:
389394 each rhogsrest
@@ -392,14 +397,16 @@ process hog_rest{
392397 path " pickle_hogs"
393398 path " *.fa" , optional: true // msa if write True
394399 path " *.nwk" , optional: true // gene trees if write True
395- path " *.tsv" , optional: true
396- path " *.tsv.gz" , optional: true
400+ path " HOG*.tsv" , optional: true
401+ path " HOG*.tsv.gz" , optional: true
402+ path " Dist_*tsv.gz"
397403 script:
398404 """
399405 fastoma-infer-subhogs --input-rhog-folder ${ rhogsrest} \
400406 --species-tree ${ species_tree} \
401407 --output-pickles pickle_hogs \
402408 -vv \
409+ --write-pairwise-distances \
403410 --msa-filter-method ${ params.filter_method} \
404411 --gap-ratio-row ${ params.filter_gap_ratio_row} \
405412 --gap-ratio-col ${ params.filter_gap_ratio_col} \
0 commit comments