12ed3c2212ad565ac6ad2a713cf10ca455d5db27 angie Fri Oct 28 10:52:59 2022 -0700 Add options -db and -protobuf for more flexible testing diff --git src/hg/hgPhyloPlace/phyloPlaceMain.c src/hg/hgPhyloPlace/phyloPlaceMain.c index 57e12f8..7dc9755 100644 --- src/hg/hgPhyloPlace/phyloPlaceMain.c +++ src/hg/hgPhyloPlace/phyloPlaceMain.c @@ -1,45 +1,52 @@ /* phyloPlace: place SARS-CoV-2 sequences in phylogenetic tree using add_missing_samples program. */ -/* Copyright (C) 2020 The Regents of the University of California */ +/* Copyright (C) 2020-2022 The Regents of the University of California */ #include "common.h" #include "linefile.h" #include "options.h" #include "phyloPlace.h" void usage() /* Explain usage and exit. */ { errAbort( "phyloPlace - Place SARS-CoV-2 sequences in phylogenetic tree using add_missing_samples program\n" "usage:\n" " phyloPlace file.[fa|vcf]\n" "options:\n" + " -db=D db (default: wuhCor1)\n" + " -protobuf=F Protobuf (from first column of protobufs.tab, with hgPhyloPlaceData/db\n" + " prepended; default: value from first line)\n" " -subtreeSize=N Value to pass to usher option --print-subtrees-size\n" ); } /* Command line validation table. */ static struct optionSpec options[] = { + { "db", OPTION_STRING }, + { "protobuf", OPTION_STRING }, { "subtreeSize", OPTION_INT }, {NULL, 0}, }; int main(int argc, char *argv[]) /* Process command line. */ { optionInit(&argc, argv, options); if (argc != 2) usage(); char *userSeqOrVcf = argv[1]; struct lineFile *lf = lineFileOpen(userSeqOrVcf, TRUE); +char *db = optionVal("db", "wuhCor1"); +char *protobuf = optionVal("protobuf", NULL); int subtreeSize = optionInt("subtreeSize", 50); boolean success = FALSE; -char *ctFile = phyloPlaceSamples(lf, "wuhCor1", NULL, TRUE, subtreeSize, 9, &success); +char *ctFile = phyloPlaceSamples(lf, db, protobuf, TRUE, subtreeSize, 9, &success); if (ctFile) printf("ctFile = %s\n", ctFile); else printf("no ctFile.\n"); return (success == TRUE); }