From 7a5c14f55fe1ee789b582148f4945998ab0ae9f0 Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Sat, 16 Nov 2013 00:59:33 +0000 Subject: [PATCH 1/1] inprogress --- forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb b/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb index b2d5a87..3b37182 100644 --- a/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb +++ b/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb @@ -30,7 +30,7 @@ module Evoruby #DECORATOR_OPTIONS_DOMAINS = '-r=1' DECORATOR_OPTIONS_DOMAINS = '-p -t' IDS_MAPFILE_SUFFIX = '.nim' - DOMAINS_MAPFILE_SUFFIX = '.dff' + DOMAINS_MAPFILE_SUFFIX = '_hmmscan_10.dff' SLEEP_TIME = 0.1 REMOVE_NI = true TMP_FILE_1 = '___PD1___' @@ -253,15 +253,13 @@ module Evoruby matching_files << file end } - - if matching_files.length < 1 Util.fatal_error( PRG_NAME, 'no file matching [' + phylogeny_id + - '_] [' + suffix_pattern + '] present in current directory' ) + + suffix_pattern + '] present in current directory' ) end if matching_files.length > 1 Util.fatal_error( PRG_NAME, 'more than one file matching [' + phylogeny_id + - '_] [' + suffix_pattern + '] present in current directory' ) + + suffix_pattern + '] present in current directory' ) end matching_files[ 0 ] end -- 1.7.10.2