Merge branch 'master' into django1.4

[htsworkflow.git] / htsworkflow / pipelines / genomemap.py

diff --git a/htsworkflow/pipelines/genomemap.py b/htsworkflow/pipelines/genomemap.py
index 0dc4919aaff4208c2254e77ba6d178caa6515f65..6dfcf68fc235775a8280dd1bc0719e4fd513c7e4 100644 (file)
--- a/htsworkflow/pipelines/genomemap.py
+++ b/htsworkflow/pipelines/genomemap.py
@@ -3,6 +3,7 @@
 from glob import glob
 import os
 import collections
+from htsworkflow.pipelines import ElementTree
 
 vldInfo = collections.namedtuple('vldInfo', 'name is_link')
 
@@ -76,9 +77,16 @@ def guess_genome(contig_sizes):
     # guess genome names
 
     genomes = {'chr1': {197195432: 'mm9',
-                        247249719: 'hg19',
+                        247249719: 'hg18',
+                        200994015: 'galGal3',
+                        230208: 'saccer1',
                         },
-               'chrI': {230218, 'sacCer3'},
+               'chrI': {230218: 'sacCer3',
+                        15072421: 'elegans190'},
+               '1': {60348388: 'danRe6'},
+               'chr2L': { 23011544: 'dm3',
+                          49364326: 'Anopheles_gambiae'},
+
                }
 
     for key in genomes: