X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimeraslayer.cpp;h=77a8695a579d64b250cf98aa3852cf4975e7f90f;hb=d8ed98e71c2da5b39b8a778e2c694a4ddff677eb;hp=61ad0e0ce7626512e3d9e1cd4e70288acaee1049;hpb=2b96bd74f70764a8b51436883afdc871fe826762;p=mothur.git diff --git a/chimeraslayer.cpp b/chimeraslayer.cpp index 61ad0e0..77a8695 100644 --- a/chimeraslayer.cpp +++ b/chimeraslayer.cpp @@ -780,7 +780,10 @@ Sequence* ChimeraSlayer::print(MPI_File& out, MPI_File& outAcc) { //*************************************************************************************************************** int ChimeraSlayer::getChimeras(Sequence* query) { try { - if (trimChimera) { trimQuery = new Sequence(query->getName(), query->getAligned()); printResults.trimQuery = *trimQuery; } + if (trimChimera) { + trimQuery = new Sequence(query->getName(), query->getAligned()); + printResults.trimQuery = *trimQuery; + } chimeraFlags = "no"; printResults.flag = "no"; @@ -794,7 +797,7 @@ int ChimeraSlayer::getChimeras(Sequence* query) { //you must create a template vector thisTemplate; if (templateFileName != "self") { thisTemplate = templateSeqs; } - else { thisTemplate = getTemplate(query); } //fills thistemplate and creates the databases + else { thisTemplate = getTemplate(query); } //fills this template and creates the databases if (m->control_pressed) { return 0; } @@ -812,10 +815,11 @@ int ChimeraSlayer::getChimeras(Sequence* query) { if (m->control_pressed) { return 0; } string chimeraFlag = maligner.getResults(query, decalc); + if (m->control_pressed) { return 0; } + vector Results = maligner.getOutput(); - //found in testing realigning only made things worse if (realign) { ChimeraReAligner realigner(thisTemplate, match, misMatch); realigner.reAlign(query, Results);