Merge pull request #105 from Illumina/fix-format-in-doc

Fix q-metrics format description in the documentation
Illumina · Jan 30, 2017 · fc89690 · fc89690
2 parents afbeaf8 + 52fc470
commit fc89690
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/src/interop/model/metrics/q_collapsed_metric.cpp b/src/interop/model/metrics/q_collapsed_metric.cpp
@@ -335,10 +335,10 @@ namespace illumina{ namespace interop{ namespace io {
          *
          *     If byte 2 is true, then the following information is also in the header:
          *
-         *          byte 3:                         number of bins (uint8)
-         *          byte 4-binCount:                array of low ends for each bin (uint8)
-         *          byte 4+binCount-4+binCount*2:   array of high ends for each bin (uint8)
-         *          byte 4+2*binCount-4+binCount*3: array of values for each bin (uint8)
+         *          byte 3:                         number of bins, binCount (uint8)
+         *          byte 4+binCount*0-4+binCount*1: array of low ends for each bin (uint8)
+         *          byte 4+binCount*1-4+binCount*2: array of high ends for each bin (uint8)
+         *          byte 4+binCount*2-4+binCount*3: array of values for each bin (uint8)
          *
          *  @b n-Records
          *
@@ -549,10 +549,10 @@ namespace illumina{ namespace interop{ namespace io {
          *
          *     If byte 2 is true, then the following information is also in the header:
          *
-         *          byte 3:                         number of bins (uint8)
-         *          byte 4-binCount:                array of low ends for each bin (uint8)
-         *          byte 4+binCount-4+binCount*2:   array of high ends for each bin (uint8)
-         *          byte 4+2*binCount-4+binCount*3: array of values for each bin (uint8)
+         *          byte 3:                         number of bins, binCount (uint8)
+         *          byte 4+binCount*0-4+binCount*1: array of low ends for each bin (uint8)
+         *          byte 4+binCount*1-4+binCount*2: array of high ends for each bin (uint8)
+         *          byte 4+binCount*2-4+binCount*3: array of values for each bin (uint8)
          *
          *  @b n-Records
          *

diff --git a/src/interop/model/metrics/q_metric.cpp b/src/interop/model/metrics/q_metric.cpp
@@ -158,10 +158,10 @@ namespace illumina { namespace interop { namespace io
          *
          *     If byte 2 is true, then the following information is also in the header:
          *
-         *          byte 3:                         number of bins (uint8)
-         *          byte 4-binCount:                array of low ends for each bin (uint8)
-         *          byte 4+binCount-4+binCount*2:   array of high ends for each bin (uint8)
-         *          byte 4+2*binCount-4+binCount*3: array of values for each  (uint8)
+         *          byte 3:                         number of bins, binCount (uint8)
+         *          byte 4+binCount*0-4+binCount*1: array of low ends for each bin (uint8)
+         *          byte 4+binCount*1-4+binCount*2: array of high ends for each bin (uint8)
+         *          byte 4+binCount*2-4+binCount*3: array of values for each  (uint8)
          *
          *  @b n-Records
          *
@@ -429,10 +429,10 @@ namespace illumina { namespace interop { namespace io
          *
          *     If byte 2 is true, then the following information is also in the header:
          *
-         *          byte 3:                         number of bins (uint8)
-         *          byte 4-binCount:                array of low ends for each bin (uint8)
-         *          byte 4+binCount-4+binCount*2:   array of high ends for each bin (uint8)
-         *          byte 4+2*binCount-4+binCount*3: array of values for each bin (uint8)
+         *          byte 3:                         number of bins, binCount (uint8)
+         *          byte 4+binCount*0-4+binCount*1: array of low ends for each bin (uint8)
+         *          byte 4+binCount*1-4+binCount*2: array of high ends for each bin (uint8)
+         *          byte 4+binCount*2-4+binCount*3: array of values for each bin (uint8)
          *
          *  @b n-Records
          *
@@ -697,8 +697,8 @@ namespace illumina { namespace interop { namespace io
          *
          *     If byte 2 is true, then the following information is also in the header:
          *
-         *          byte 3:                         number of bins (uint8)
-         *          byte 4-binCount*3:              array of low, high, value for each bin (uint8)
+         *          byte 3:              number of bins (uint8)
+         *          byte 4-4+binCount*3: array of (low, high, value) for each bin (uint8)
          *
          *  @b n-Records
          *

diff --git a/tools/build_test.sh b/tools/build_test.sh
@@ -25,10 +25,17 @@ build_param=""
 if [ ! -z $1 ] ; then
     build_type=$1
 fi
+
 if [ ! -z $2 ] ; then
     build_param="-DGTEST_ROOT=$2 -DGMOCK_ROOT=$2 -DNUNIT_ROOT=$2/NUnit-2.6.4"
 fi
 
+
+if [ -e /opt/rh/devtoolset-2/root/usr/bin/g++ ] ; then
+    export CXX=/usr/bin/g++
+    export CC=/usr/bin/gcc
+fi
+
 echo "##teamcity[blockOpened name='Configure $build_type']"
 mkdir build_${build_type}
 cd build_${build_type}