src/lib/bbiRead.c 1.17

Index: src/lib/bbiRead.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/bbiRead.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -B -U 4 -r1.16 -r1.17
--- src/lib/bbiRead.c	14 Nov 2009 00:11:32 -0000	1.16
+++ src/lib/bbiRead.c	20 Nov 2009 17:11:16 -0000	1.17
@@ -7,8 +7,9 @@
 #include "obscure.h"
 #include "localmem.h"
 #include "zlibFace.h"
 #include "bPlusTree.h"
+#include "hmmstats.h"
 #include "cirTree.h"
 #include "udc.h"
 #include "bbiFile.h"
 
@@ -223,8 +224,10 @@
 else if (sameWord(string, "min") || sameWord(string, "minimum"))
     return bbiSumMin;
 else if (sameWord(string, "coverage") || sameWord(string, "dataCoverage"))
     return bbiSumCoverage;
+else if (sameWord(string, "std"))
+    return bbiSumStandardDeviation;
 else
     {
     errAbort("Unknown bbiSummaryType %s", string);
     return bbiSumMean;	/* Keep compiler quiet. */
@@ -243,8 +246,10 @@
     case bbiSumMin:
         return "min";
     case bbiSumCoverage:
         return "coverage";
+    case bbiSumStandardDeviation:
+        return "std";
     default:
 	errAbort("Unknown bbiSummaryType %d", (int)type);
 	return NULL;
     }
@@ -599,8 +604,11 @@
 		    break;
 		case bbiSumCoverage:
 		    val = covFactor*el->validCount;
 		    break;
+		case bbiSumStandardDeviation:
+		    val = calcStdFromSums(el->sumData, el->sumSquares, el->validCount);
+		    break;
 		default:
 		    internalErr();
 		    val = 0.0;
 		    break;