Merge branch 'master' into mslevels

Author: caetera

README.md

@@ -71,6 +71,7 @@ optional subcommands are xic|query (use [subcommand] -h for more info]):
   -z, --noZlibCompression    Don't use zlib compression for the m/z ratios and
                                intensities. By default zlib compression is
                                enabled.
+  -a, --allDetectors         Extract additonal detector data: UV/PDA etc
   -l, --logging=VALUE        Optional logging level: 0 for silent, 1 for
                                verbose.
   -e, --ignoreInstrumentErrors

ThermoRawFileParserTest/WriterTests.cs

@@ -129,8 +129,8 @@ public void TestMzML_MS2()
             var selectedZ = int.Parse(precursor.cvParam.Where(cv => cv.accession == "MS:1000041").First().value);
             Assert.AreEqual(selectedZ , 2);
 
-            var selectedI = Double.Parse(precursor.cvParam.Where(cv => cv.accession == "MS:1000042").First().value);
-            Assert.IsTrue(selectedI - 10073 < 1);
+            //var selectedI = Double.Parse(precursor.cvParam.Where(cv => cv.accession == "MS:1000042").First().value);
+            //Assert.IsTrue(selectedI - 10073 < 1);
 
             Assert.AreEqual(95, testMzMl.run.chromatogramList.chromatogram[0].defaultArrayLength);
         }