Skip to content

Commit

Permalink
updated max likelihood genotyper / placer module names
Browse files Browse the repository at this point in the history
  • Loading branch information
joshsinger committed Jan 8, 2020
1 parent 4c44986 commit 14e5669
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions modules/phdrReportingController.js
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ function genotypeFasta(fastaMap, resultMap, placerResultContainer) {

// run the placer and generate a placer result document
var placerResultDocument;
glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
placerResultDocument = glue.command({
"place": {
"fasta-document": {
Expand All @@ -1455,7 +1455,7 @@ function genotypeFasta(fastaMap, resultMap, placerResultContainer) {

// list the query summaries within the placer result document
var placementSummaries;
glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
placementSummaries = glue.tableToObjects(glue.command({
"list": {
"query-from-document": {
Expand All @@ -1472,7 +1472,7 @@ function genotypeFasta(fastaMap, resultMap, placerResultContainer) {
var placements;

// list the placements for that query.
glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
placements = glue.tableToObjects(glue.command({
"list": {
"placement-from-document": {
Expand All @@ -1491,7 +1491,7 @@ function genotypeFasta(fastaMap, resultMap, placerResultContainer) {


var genotypingResults;
glue.inMode("module/maxLikelihoodGenotyper", function() {
glue.inMode("module/hcvMaxLikelihoodGenotyper", function() {
genotypingResults = glue.command({
"genotype": {
"placer-result-document": {
Expand Down
2 changes: 1 addition & 1 deletion modules/phdrSamReporter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<samReporter>
<alignerModuleName>hcvCompoundAligner</alignerModuleName>
<readLogInterval>30000</readLogInterval>
<maxLikelihoodPlacerModuleName>maxLikelihoodPlacer</maxLikelihoodPlacerModuleName>
<maxLikelihoodPlacerModuleName>hcvMaxLikelihoodPlacer</maxLikelihoodPlacerModuleName>
<samReaderValidationStringency>SILENT</samReaderValidationStringency>
<consensusAmbiguityMinReads>2</consensusAmbiguityMinReads>
<consensusAmbiguityMinProportion>0.10</consensusAmbiguityMinProportion>
Expand Down
4 changes: 2 additions & 2 deletions modules/phdrSvgPhyloVisualisation.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function visualisePhyloAsSvg(document) {
var placerResult = document.inputDocument.placerResult;

// generate a tree for the placement, as a command document.
glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
glueTree = glue.command({
"export": {
"placement-from-document": {
Expand All @@ -77,7 +77,7 @@ function visualisePhyloAsSvg(document) {

var neighbourObjs;

glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
neighbourObjs = glue.tableToObjects(glue.command({
"list": {
"neighbour-from-document": {
Expand Down
4 changes: 2 additions & 2 deletions testTreeVisualisation.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var minNeighboursToShow = 15;


// generate a tree for the placement, as a command document.
glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
glueTree = glue.command({
"export": {
"placement-from-document": {
Expand All @@ -59,7 +59,7 @@ glue.inMode("module/maxLikelihoodPlacer", function() {

var neighbourObjs;

glue.inMode("module/maxLikelihoodPlacer", function() {
glue.inMode("module/hcvMaxLikelihoodPlacer", function() {
neighbourObjs = glue.tableToObjects(glue.command({
"list": {
"neighbour-from-document": {
Expand Down

0 comments on commit 14e5669

Please sign in to comment.