diff --git a/data/vtlib/markdup_biobambam.json b/data/vtlib/markdup_biobambam.json index d1f9d25e6..f5a69f54d 100644 --- a/data/vtlib/markdup_biobambam.json +++ b/data/vtlib/markdup_biobambam.json @@ -15,6 +15,24 @@ "use_STDOUT": true, "cmd": [ {"subst":"bsc_executable", "required":"yes", "ifnull":"bamsormadup"}, {"subst":"bsmd_threads"}, "SO=coordinate", "level=0", "verbose=0", "fixmate=1", "adddupmarksupport=1", {"subst":"bs_tmpfile_flag"} ] }, + { + "id":"calmd", + "type":"EXEC", + "use_STDIN": true, + "use_STDOUT": true, + "cmd": [ + {"subst":"samtools_executable", "required":true, "ifnull":"samtools"}, "calmd", + "--threads", {"subst":"calmd_threads","required":true,"ifnull":4}, + {"select":"calmd_identical_bases_to_equal", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-e","off":[]}}, + {"select":"calmd_uncompressed", "required":true, "select_range":[1], "default":"on", "cases":{"on":"-u","off":"-b"}}, + {"select":"calmd_quality_mod", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-A","off":[]}}, + {"select":"calmd_quiet_mode", "required":true, "select_range":[1], "default":"on", "cases":{"on":"-Q","off":[]}}, + {"select":"calmd_BQ_tag_compute", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-r","off":[]}}, + {"select":"calmd_extended_BAQ", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-E","off":[]}}, + {"subst":"calmd_extra_flags", "required":false}, + "-", {"subst":"reference_genome_fasta","required":true} + ] + }, { "id":"bammarkduplicates", "comment":"default tool bamstreamingmarkduplicates must be from Biobambam >= 0.0.174", @@ -33,7 +51,7 @@ } ], "edges":[ - - { "id":"coordsort_tomarkdup", "from":"bamsort_coord", "to":"bammarkduplicates" } + { "id":"coordsort_to_calmd", "from":"bamsort_coord", "to":"calmd" }, + { "id":"calmd_to_markdup", "from":"calmd", "to":"bammarkduplicates" } ] } diff --git a/data/vtlib/markdup_duplexseq.json b/data/vtlib/markdup_duplexseq.json index f3caca006..f516be1b6 100644 --- a/data/vtlib/markdup_duplexseq.json +++ b/data/vtlib/markdup_duplexseq.json @@ -15,6 +15,24 @@ "use_STDOUT": true, "cmd": [ {"subst":"bsc_executable", "required":"yes", "ifnull":"bamsormadup"}, {"subst":"bsmd_threads"}, "SO=coordinate", "verbose=0", "fixmate=1", "rcsupport=1", {"subst":"bs_tmpfile_flag"} ] }, + { + "id":"calmd", + "type":"EXEC", + "use_STDIN": true, + "use_STDOUT": true, + "cmd": [ + {"subst":"samtools_executable", "required":true, "ifnull":"samtools"}, "calmd", + "--threads", {"subst":"calmd_threads","required":true,"ifnull":4}, + {"select":"calmd_identical_bases_to_equal", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-e","off":[]}}, + {"select":"calmd_uncompressed", "required":true, "select_range":[1], "default":"on", "cases":{"on":"-u","off":"-b"}}, + {"select":"calmd_quality_mod", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-A","off":[]}}, + {"select":"calmd_quiet_mode", "required":true, "select_range":[1], "default":"on", "cases":{"on":"-Q","off":[]}}, + {"select":"calmd_BQ_tag_compute", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-r","off":[]}}, + {"select":"calmd_extended_BAQ", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-E","off":[]}}, + {"subst":"calmd_extra_flags", "required":false}, + "-", {"subst":"reference_genome_fasta","required":true} + ] + }, { "id":"bammarkduplicates", "comment":"default tool bammarkduplicatesopt from Biobambam >= 2.0.65", @@ -26,6 +44,7 @@ } ], "edges":[ - { "id":"coordsort_todisk", "from":"bamsort_coord", "to":"bammarkduplicates" } + { "id":"coordsort_to_calmd", "from":"bamsort_coord", "to":"calmd" }, + { "id":"calmd_to_markdup", "from":"calmd", "to":"bammarkduplicates" } ] } diff --git a/data/vtlib/markdup_samtools.json b/data/vtlib/markdup_samtools.json index 8d1496611..adacac3b2 100644 --- a/data/vtlib/markdup_samtools.json +++ b/data/vtlib/markdup_samtools.json @@ -35,6 +35,24 @@ "-" ] }, + { + "id":"calmd", + "type":"EXEC", + "use_STDIN": true, + "use_STDOUT": true, + "cmd": [ + {"subst":"samtools_executable", "required":true, "ifnull":"samtools"}, "calmd", + "--threads", {"subst":"calmd_threads","required":true,"ifnull":4}, + {"select":"calmd_identical_bases_to_equal", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-e","off":[]}}, + {"select":"calmd_uncompressed", "required":true, "select_range":[1], "default":"on", "cases":{"on":"-u","off":"-b"}}, + {"select":"calmd_quality_mod", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-A","off":[]}}, + {"select":"calmd_quiet_mode", "required":true, "select_range":[1], "default":"on", "cases":{"on":"-Q","off":[]}}, + {"select":"calmd_BQ_tag_compute", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-r","off":[]}}, + {"select":"calmd_extended_BAQ", "required":true, "select_range":[1], "default":"off", "cases":{"on":"-E","off":[]}}, + {"subst":"calmd_extra_flags", "required":false}, + "-", {"subst":"reference_genome_fasta","required":true} + ] + }, { "id":"markdup", "type":"EXEC", @@ -57,8 +75,8 @@ } ], "edges":[ - { "id":"fixmate_to_coordsort", "from":"fixmate", "to":"coord_sort" }, - { "id":"coordsort_tomarkdup", "from":"coord_sort", "to":"markdup" } + { "id":"coordsort_to_calmd", "from":"coord_sort", "to":"calmd" }, + { "id":"calmd_to_markdup", "from":"calmd", "to":"markdup" } ] }