# HG changeset patch # User bgruening # Date 1384425795 18000 # Node ID b0d64a9930d6247a6235bdcc64acf40145057386 # Parent 06311d89da815e8452dd2c304e259e7e2228a379 Uploaded diff -r 06311d89da81 -r b0d64a9930d6 bamCompare.xml diff -r 06311d89da81 -r b0d64a9930d6 bamCorrelate.xml --- a/bamCorrelate.xml Wed Oct 30 09:44:05 2013 -0400 +++ b/bamCorrelate.xml Thu Nov 14 05:43:15 2013 -0500 @@ -10,22 +10,8 @@ #set files=[] #set labels=[] - #for $i in $inputs - #set $temp_input_handle = tempfile.NamedTemporaryFile( dir=$temp_dir ) - #set $temp_input_path = $temp_input_handle.name - #silent $temp_input_handle.close() - #silent os.system("ln -s %s %s.bam" % (str($i.bamfile), $temp_input_path)) - #silent os.system("ln -s %s %s.bam.bai" % (str($i.bamfile.metadata.bam_index), $temp_input_path)) - #silent $files.append('%s.bam' % $temp_input_path) - - ##set $files += [str($i.bamfile)] - #if str($i.label.value) != "": - #set $labels += ["\"%s\"" % ($i.label.value)] - #else - #set $labels += ["\"%s\"" % ($i.bamfile.name)] - #end if - #end for + @multiple_input_bams@ bamCorrelate @@ -84,49 +70,49 @@ - + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + diff -r 06311d89da81 -r b0d64a9930d6 bamCoverage.xml --- a/bamCoverage.xml Wed Oct 30 09:44:05 2013 -0400 +++ b/bamCoverage.xml Thu Nov 14 05:43:15 2013 -0500 @@ -7,77 +7,77 @@ bamCoverage - @THREADS@ + @THREADS@ - --bam '$bamInput' - --bamIndex ${bamInput.metadata.bam_index} - --outFileName '$outFileName' - --outFileFormat '$outFileFormat' + --bam '$bamInput' + --bamIndex ${bamInput.metadata.bam_index} + --outFileName '$outFileName' + --outFileFormat '$outFileFormat' - --fragmentLength $fragmentLength - --binSize $binSize + --fragmentLength $fragmentLength + --binSize $binSize - #if $scaling.type=='rpkm': - --normalizeUsingRPKM - #elif $scaling.type=='1x': - --normalizeTo1x $scaling.normalizeTo1x - #elif $scaling.type=='own': - --scaleFactor $scaling.scaleFactor - #end if + #if $scaling.type=='rpkm': + --normalizeUsingRPKM + #elif $scaling.type=='1x': + --normalizeTo1x $scaling.normalizeTo1x + #elif $scaling.type=='own': + --scaleFactor $scaling.scaleFactor + #end if - ##if str($ignoreForNormalization).strip() != '': - ## --ignoreForNormalization $ignoreForNormalization - ##end if + ##if str($ignoreForNormalization).strip() != '': + ## --ignoreForNormalization $ignoreForNormalization + ##end if - #if $advancedOpt.showAdvancedOpt == "yes": - #if $advancedOpt.smoothLength: - --smoothLength '$advancedOpt.smoothLength' - #end if + #if $advancedOpt.showAdvancedOpt == "yes": + #if $advancedOpt.smoothLength: + --smoothLength '$advancedOpt.smoothLength' + #end if - #if str($advancedOpt.region.value) != '': - --region '$advancedOpt.region' - #end if - $advancedOpt.doNotExtendPairedEnds - $advancedOpt.ignoreDuplicates + #if str($advancedOpt.region.value) != '': + --region '$advancedOpt.region' + #end if + $advancedOpt.doNotExtendPairedEnds + $advancedOpt.ignoreDuplicates - #if $advancedOpt.minMappingQuality: - --minMappingQuality '$advancedOpt.minMappingQuality' - #end if + #if $advancedOpt.minMappingQuality: + --minMappingQuality '$advancedOpt.minMappingQuality' + #end if - #end if - + #end if + - - + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + - - - - + + + + + + + + + + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + **What it does** diff -r 06311d89da81 -r b0d64a9930d6 bamFingerprint.xml --- a/bamFingerprint.xml Wed Oct 30 09:44:05 2013 -0400 +++ b/bamFingerprint.xml Thu Nov 14 05:43:15 2013 -0500 @@ -10,21 +10,8 @@ #set files=[] #set labels=[] - #for $i in $inputs - #set $temp_input_handle = tempfile.NamedTemporaryFile( dir=$temp_dir ) - #set $temp_input_path = $temp_input_handle.name - #silent $temp_input_handle.close() - #silent os.system("ln -s %s %s.bam" % (str($i.bamfile), $temp_input_path)) - #silent os.system("ln -s %s %s.bam.bai" % (str($i.bamfile.metadata.bam_index), $temp_input_path)) - #silent $files.append('%s.bam' % $temp_input_path) - ##set $files += [str($i.bamfile)] - #if str($i.label.value) != "": - #set $labels += ["\"%s\"" % ($i.label.value)] - #else - #set $labels += ["\"%s\"" % ($i.bamfile.name)] - #end if - #end for + @multiple_input_bams@ bamFingerprint diff -r 06311d89da81 -r b0d64a9930d6 bigwigCompare.xml diff -r 06311d89da81 -r b0d64a9930d6 computeGCBias.xml diff -r 06311d89da81 -r b0d64a9930d6 computeMatrix.xml diff -r 06311d89da81 -r b0d64a9930d6 correctGCBias.xml diff -r 06311d89da81 -r b0d64a9930d6 deepTools_macros.xml --- a/deepTools_macros.xml Wed Oct 30 09:44:05 2013 -0400 +++ b/deepTools_macros.xml Thu Nov 14 05:43:15 2013 -0500 @@ -68,7 +68,7 @@ - + @@ -78,6 +78,24 @@ + + #for $i in $input_files: + #set $temp_input_handle = tempfile.NamedTemporaryFile( dir=$temp_dir ) + #set $temp_input_path = $temp_input_handle.name + #silent $temp_input_handle.close() + #silent os.system("ln -s %s %s.bam" % (str($i.bamfile), $temp_input_path)) + #silent os.system("ln -s %s %s.bam.bai" % (str($i.bamfile.metadata.bam_index), $temp_input_path)) + #silent $files.append('%s.bam' % $temp_input_path) + + ##set $files += [str($i.bamfile)] + #if str($i.label.value) != "": + #set $labels += ["\"%s\"" % ($i.label.value)] + #else + #set $labels += ["\"%s\"" % ($i.bamfile.name)] + #end if + #end for + + diff -r 06311d89da81 -r b0d64a9930d6 heatmapper.xml diff -r 06311d89da81 -r b0d64a9930d6 profiler.xml diff -r 06311d89da81 -r b0d64a9930d6 readme.rst --- a/readme.rst Wed Oct 30 09:44:05 2013 -0400 +++ b/readme.rst Thu Nov 14 05:43:15 2013 -0500 @@ -29,7 +29,7 @@ Citation ======== -deeptools are currently under review. In the meantime please refere to https://github.com/fidelram/deepTools. +deeptools are currently under review. In the meantime please refere to ======= @@ -39,23 +39,25 @@ - v1.0: Initial public release -Licence (MIT) -============= - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +=============================== +Wrapper Licence (MIT/BSD style) +=============================== -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +Permission to use, copy, modify, and distribute this software and its +documentation with or without modifications and for any purpose and +without fee is hereby granted, provided that any copyright notices +appear in all copies and that both those copyright notices and this +permission notice appear in supporting documentation, and that the +names of the contributors or copyright holders not be used in +advertising or publicity pertaining to distribution of the software +without specific prior permission. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +THE CONTRIBUTORS AND COPYRIGHT HOLDERS OF THIS SOFTWARE DISCLAIM ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT +OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE +OR PERFORMANCE OF THIS SOFTWARE. + diff -r 06311d89da81 -r b0d64a9930d6 test-data/master.mat.gz diff -r 06311d89da81 -r b0d64a9930d6 test-data/master.png diff -r 06311d89da81 -r b0d64a9930d6 test-data/test.bw diff -r 06311d89da81 -r b0d64a9930d6 test-data/test2.bed diff -r 06311d89da81 -r b0d64a9930d6 tool-data/deepTools_seqs.loc.sample diff -r 06311d89da81 -r b0d64a9930d6 tool_data_table_conf.xml.sample diff -r 06311d89da81 -r b0d64a9930d6 tool_dependencies.xml --- a/tool_dependencies.xml Wed Oct 30 09:44:05 2013 -0400 +++ b/tool_dependencies.xml Thu Nov 14 05:43:15 2013 -0500 @@ -10,7 +10,7 @@ - +