Merge branch 'master' into devel

szpiech · Sep 12, 2014 · 82051e9 · 82051e9
2 parents 541e419 + b4b2ebc
commit 82051e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/selscan-main.cpp b/src/selscan-main.cpp
@@ -2219,7 +2219,7 @@ void calc_xpihh(void *order)
             {
                 //sprintf(digit, "%d", data1[hap][locus]);
                 haplotypeList1[hap] = data1[hap][locus];
-                derivedCount1 += data1[hap][locus];
+                derivedCount1 += ( data1[hap][locus] == '1' ) ? 1 : 0;
 
                 //Pooled
                 haplotypeListPooled[hap] = data1[hap][locus];
@@ -2229,7 +2229,7 @@ void calc_xpihh(void *order)
             {
                 //sprintf(digit, "%d", data2[hap - nhaps1][locus]);
                 haplotypeList2[hap - nhaps1] = data2[hap - nhaps1][locus];
-                derivedCount2 += data2[hap - nhaps1][locus];
+                derivedCount2 += ( data2[hap - nhaps1][locus] == '1' ) ? 1 : 0;
 
                 //Pooled
                 haplotypeListPooled[hap] = data2[hap - nhaps1][locus];