| Previous changeset 1:8890e2d4c068 (2021-09-28) Next changeset 3:36677f429310 (2022-08-15) |
|
Commit message:
"planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tool_collections/samtools/samtools_merge commit 1354b1358df89a922c3243f7e27ce789094b8644" |
|
modified:
macros.xml samtools_merge.xml |
| b |
| diff -r 8890e2d4c068 -r b40e2d865d52 macros.xml --- a/macros.xml Tue Sep 28 16:14:52 2021 +0000 +++ b/macros.xml Sun Dec 19 15:57:10 2021 +0000 |
| [ |
| @@ -50,23 +50,56 @@ #end for ]]></token> <token name="@PREPARE_FASTA_IDX@"><![CDATA[ - ##checks for reference data ($addref_cond.addref_select=="history" or =="cached") - ##and sets the -t/-T parameters accordingly: - ##- in case of history a symbolic link is used because samtools (view) will generate - ## the index which might not be possible in the directory containing the fasta file - ##- in case of cached the absolute path is used which allows to read the cram file - ## without specifying the reference + ## Make the user-selected reference genome, if any, accessible through + ## a shell variable $reffa, index the reference if necessary, and make + ## the fai-index file available through a shell variable $reffai. + + ## For a cached genome simply sets the shell variables to point to the + ## genome file and its precalculated index. + ## For a genome from the user's history, if that genome is a plain + ## fasta file, the code creates a symlink in the pwd, creates the fai + ## index file next to it, then sets the shell variables to point to the + ## symlink and its index. + ## For a fasta.gz dataset from the user's history, it tries the same, + ## but this will only succeed if the file got compressed with bgzip. + ## For a regular gzipped file samtools faidx will fail, in which case + ## the code falls back to decompressing to plain fasta before + ## reattempting the indexing. + ## Indexing of a bgzipped file produces a regular fai index file *and* + ## a compressed gzi file. The former is identical to the fai index of + ## the uncompressed fasta. + + ## If the user has not selected a reference (it's an optional parameter + ## in some samtools wrappers), a cheetah boolean use_ref is set to + ## False to encode that fact. + + #set use_ref=True #if $addref_cond.addref_select == "history": - ln -s '${addref_cond.ref}' reference.fa && - samtools faidx reference.fa && - #set reffa="reference.fa" - #set reffai="reference.fa.fai" + #if $addref_cond.ref.is_of_type('fasta'): + reffa="reference.fa" && + ln -s '${addref_cond.ref}' \$reffa && + samtools faidx \$reffa && + #else: + reffa="reference.fa.gz" && + ln -s '${addref_cond.ref}' \$reffa && + { + samtools faidx \$reffa || + { + echo "Failed to index compressed reference. Trying decompressed ..." 1>&2 && + gzip -dc \$reffa > reference.fa && + reffa="reference.fa" && + samtools faidx \$reffa; + } + } && + #end if + reffai=\$reffa.fai && #elif $addref_cond.addref_select == "cached": - #set reffa=str($addref_cond.ref.fields.path) - #set reffai=str($addref_cond.ref.fields.path)+".fai" + ## in case of cached the absolute path is used which allows to read + ## a cram file without specifying the reference + reffa='${addref_cond.ref.fields.path}' && + reffai=\$reffa.fai && #else - #set reffa=None - #set reffai=None + #set use_ref=False #end if ]]></token> |
| b |
| diff -r 8890e2d4c068 -r b40e2d865d52 samtools_merge.xml --- a/samtools_merge.xml Tue Sep 28 16:14:52 2021 +0000 +++ b/samtools_merge.xml Sun Dec 19 15:57:10 2021 +0000 |
| b |
| @@ -122,7 +122,6 @@ <!-- Merge 6 - Merging with bedfile --> <test> <param name="bamfiles" value="test_input_1_a.bam,test_input_1_b.bam,test_input_1_c.bam" /> - <param name="bed" value="yes" /> <param name="bed_file" value="test_input_1_a.bed" /> <output name="output" file="6.merge.expected.bam" ftype="bam" lines_diff="16" /> </test> |