# HG changeset patch # User Wolfgang Maier # Date 1433433124 -7200 # Node ID ffee8534a5c482ddfc9e42841c0cd9cab1b00cb4 # Parent ba685c655e18b4bfe641c0c473cfdbcd025af8c6 upgrade to mimodd version 0.1.6 diff -r ba685c655e18 -r ffee8534a5c4 cloudmap.xml --- a/cloudmap.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/cloudmap.xml Thu Jun 04 17:52:04 2015 +0200 @@ -6,13 +6,17 @@ mimodd version -q - mimodd cloudmap "$ifile" ${run.mode} + mimodd cloudmap "$ifile" ${run.mode} "$sample" - #if $str($run.mode) != "SVD": - "${run.refsample}" + #if $str($run.related_parent_sample): + -r "${run.related_parent_sample}" + #end if + #if $str($run.unrelated_parent_sample): + -u "${run.unrelated_parent_sample}" #end if - "$sample" -o "$ofile" + $run.infer_missing + -o "$ofile" #if $seqdict: -s "$dictfile" @@ -22,20 +26,23 @@ - - - + + + - + + + - + + + - + - @@ -50,22 +57,26 @@ **What it does** -The purpose of this tool is to provide compatibility of the MiModD analysis workflow with the external `CloudMap`_ *EMS Variant Density Mapping*, *Variant Discovery Mapping* and *Hawaiian Variant Mapping* tools. - -These tools complement MiModD by providing easily interpreted visualizations of mapping-by-sequencing analysis workflows. +The purpose of this tool is to provide compatibility of the MiModD analysis workflow with the external `CloudMap`_ *EMS Variant Density Mapping*, *Variant Discovery Mapping* and *Hawaiian Variant Mapping* tools. These tools complement MiModD by providing easily interpreted visualizations of mapping-by-sequencing analysis workflows. The tool converts a VCF file as generated by the *Extract Variant Sites* or *VCF Filter* tools to the format expected by the *CloudMap* series of tools. Optionally, it also extracts the chromosome names and sizes and reports them in the *CloudMap* *species configuration file* format. -Such a file is required as input to the current versions of the *CloudMap* *Hawaiian* and *Variant Density* mapping tools, if you are working with a species other than the natively supported ones (i.e., other than *C. elegans* or *A. thaliana*). +Such a file is required as input to the current versions of the *CloudMap* *Hawaiian* and *Variant Density* mapping tools, if you are working with a species other than the natively supported ones (i.e., other than *C. elegans*, *A. thaliana* or *Brachypodium distachyon*). To use the output datasets of the tool with *CloudMap*, you only have to upload them to any public Galaxy server that hosts *CloudMap* like, e.g., the main Galaxy server at https://usegalaxy.org . +**Notes:** + +1) Simple Variant Density (SVD) Mapping mode generates output for use with the CloudMap EMS Variant Density Mapping tool. The aim of SVD analysis is to identify clusters of variants that appear linked to a mutant phenotype selected for during several rounds of outcrossing or backcrossing to a non-mutagenized strain. The "mapping sample" is the out-/backcrossed strain and only its variants are taken into account for the analysis. + .. class:: warningmark EMS Variant Density Mapping is currently limited to *C. elegans* and other species with six chromosomes on the *CloudMap* side. -More information on combining MiModD and CloudMap in mapping-by-sequencing analyses can be found in the `corresponding section of the MiModD User Guide`_. +2) Variant Allele Frequency (VAF) Mapping mode generates output for use with the CloudMap Variant Discovery or Hawaiian Variant Mapping tools. The aim of VAF analysis is to identify clusters of variants with (near) homozygous inheritance in a F2 population obtained from a cross between a mutant strain of interest and an unrelated mapping strain. Here, the "mapping sample" is the pooled F2 population. To analyze inheritance patterns this mode **requires either** a list of variants that could have been inherited through the mapping strain, i.e. the "unrelated parent strain", or through the mutant parent, i.e. through the "related parent strain". If variants are available for both parents, they can be analyzed together for higher mapping accuracy. + +3) More information on combining MiModD and CloudMap in mapping-by-sequencing analyses can be found in the `corresponding section of the MiModD User Guide`_. .. _CloudMap: https://usegalaxy.org/u/gm2123/p/cloudmap .. _corresponding section of the MiModD User Guide: http://mimodd.readthedocs.org/en/latest/cloudmap.html diff -r ba685c655e18 -r ffee8534a5c4 convert.xml --- a/convert.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/convert.xml Thu Jun 04 17:52:04 2015 +0200 @@ -6,6 +6,12 @@ mimodd version -q + #if $str($mode.split_on_rgs) or $str($mode.oformat)=="fastq" or $str($mode.oformat)=="gz": + echo "Your input data is now getting processed by MiModD. The output will be split into several files based on the read groups found in the input.\nThis history item will remain in the busy state until the job is finished.\nAfter the job is showing as finished, Galaxy will start adding the results files to your history one by one.\n\nThis may take a while to complete! \n\nYou should refresh your history to see if new files have arrived.\n\nThis message is for your information only and can be deleted from the history once the job has finished." > $output_split_on_read_groups; + + mkdir converted_data; + #end if + mimodd convert #for $i in $mode.input_list @@ -17,30 +23,37 @@ #if $str($mode.header) != "None": --header "$(mode.header)" #end if - --ofile "$outputname" + + #if $str($outputname) == "None": + --ofile converted_data/read_group + #else + --ofile "$outputname" + #end if --iformat $(mode.iformat) --oformat $(mode.oformat) + ${mode.split_on_rgs} - + - - + + - - - - + + + + + @@ -48,20 +61,22 @@ - - + + + - - - - + + + + + @@ -69,37 +84,56 @@ - - - - + + + + + + + + - - - + + + + + + + - - - + + + + - - - + + + + + (not mode['split_on_rgs'] and mode['oformat'] not in ("fastq", "gz")) + + + + + + (mode['split_on_rgs'] or mode['oformat'] in ("fastq", "gz")) + + @@ -114,7 +148,7 @@ **Notes:** -1) In its standard configuration Galaxy will decompress any .gz files during their upload, so the option to align gzipped fastq input is useful only with customized Galaxy instances or by using linked files as explained in our `recipe for using gzipped fastq files in Galaxy`_ from the `MiModD user guide`_. +1) In its standard configuration Galaxy will decompress any .gz files during their upload, so the option to convert gzipped fastq input is useful only with customized Galaxy instances or by using linked files as explained in our `recipe for using gzipped fastq files in Galaxy`_ from the `MiModD user guide`_. 2) The tool can convert fastq files representing data from paired-end sequencing runs to appropriate SAM/BAM format provided that the mate information is split over two fastq files in corresponding order. diff -r ba685c655e18 -r ffee8534a5c4 deletion_predictor.xml --- a/deletion_predictor.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/deletion_predictor.xml Thu Jun 04 17:52:04 2015 +0200 @@ -19,8 +19,8 @@ - - + + diff -r ba685c655e18 -r ffee8534a5c4 snap_caller.xml --- a/snap_caller.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/snap_caller.xml Thu Jun 04 17:52:04 2015 +0200 @@ -31,13 +31,17 @@ #if $str($set.filter_output) != "off": --filter-output $set.filter_output #end if - #if $str($set.sort) != "off": ---sort $set.sort + #if $str($set.sort) == "off": +--no-sort + #end if + #if $str($set.mmatch_notation) != "general": +-X #end if - #if $str($set.mmatch_notation) == "general": --M - #end if ---max-mate-overlap '$set.max_mate_overlap' + #if $set.discard_overlapping_mates: +--discard-overlapping-mates + ## remove ',' (and possibly adjacent whitespace) and replace with ' ' + '#echo ("' '".join($set.discard_overlapping_mates.replace(" ", "").split(',')))#' + #end if --verbose " #end for @@ -144,7 +148,7 @@ - + ## change settings @@ -154,10 +158,9 @@ ## paired-end specific options - - - - + + + @@ -225,11 +228,14 @@ Optionally, a SAM header file can also be used to replace existing read-group information in a headered SAM/BAM input file. This can be used to resolve read-group ID conflicts between multiple input files at tool runtime. -4) Currently, you cannot configure aligner-specific options separately for specific input files from within this Galaxy tool. If you need this advanced level of control, you should use the command line tool ``mimodd snap-batch``. +5) The options available under *further parameter settings* can have **big** effects on the alignment quality. You are strongly encouraged to consult the `tool documentation`_ for detailed explanations of the available options. + +6) Currently, you cannot configure aligner-specific options separately for specific input files from within this Galaxy tool. If you need this advanced level of control, you should use the command line tool ``mimodd snap-batch``. .. _Fastq Manipulation category: https://toolshed.g2.bx.psu.edu/repository/browse_repositories_in_category?id=310ff67d4caf6531 .. _recipe for using gzipped fastq files in Galaxy: http://mimodd.readthedocs.org/en/latest/recipes.html#use-gzipped-fastq-files-in-galaxy .. _MiModD user guide: http://mimodd.readthedocs.org/en/latest +.. _tool documentation: http://mimodd.readthedocs.org/en/latest/tool_doc.html#snap diff -r ba685c655e18 -r ffee8534a5c4 snp_caller_caller.xml --- a/snp_caller_caller.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/snp_caller_caller.xml Thu Jun 04 17:52:04 2015 +0200 @@ -25,7 +25,7 @@ - + diff -r ba685c655e18 -r ffee8534a5c4 tool_dependencies.xml --- a/tool_dependencies.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/tool_dependencies.xml Thu Jun 04 17:52:04 2015 +0200 @@ -7,10 +7,10 @@ - + - http://sourceforge.net/projects/mimodd/files/MiModD-0.1.5.2.tar.gz + http://sourceforge.net/projects/mimodd/files/MiModD-0.1.6.tar.gz diff -r ba685c655e18 -r ffee8534a5c4 toolshed_macros.xml --- a/toolshed_macros.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/toolshed_macros.xml Thu Jun 04 17:52:04 2015 +0200 @@ -1,7 +1,7 @@ - mimodd + mimodd diff -r ba685c655e18 -r ffee8534a5c4 vcf_filter.xml --- a/vcf_filter.xml Wed Feb 11 09:26:43 2015 -0500 +++ b/vcf_filter.xml Thu Jun 04 17:52:04 2015 +0200 @@ -41,7 +41,7 @@ #end if #if $vfilter: --vfilter - ## remove ',' (and possibly adjacent whitespace) and replace with ' ' + ## remove ',' and replace with ' ' "#echo ('" "'.join($vfilter.split(',')))#" #end if $vartype