From: <ppa...@us...> - 2010-12-20 15:58:03
|
Revision: 5255 http://sashimi.svn.sourceforge.net/sashimi/?rev=5255&view=rev Author: ppatrick Date: 2010-12-20 15:57:57 +0000 (Mon, 20 Dec 2010) Log Message: ----------- Fixed bug in parsing filterLine containing sa (supplemental activation) param. [MS2 scans with sa where being converted as msLevel=0] Modified Paths: -------------- trunk/trans_proteomic_pipeline/src/mzXML/converters/ReAdW/FilterLine.cpp Modified: trunk/trans_proteomic_pipeline/src/mzXML/converters/ReAdW/FilterLine.cpp =================================================================== --- trunk/trans_proteomic_pipeline/src/mzXML/converters/ReAdW/FilterLine.cpp 2010-12-17 17:06:33 UTC (rev 5254) +++ trunk/trans_proteomic_pipeline/src/mzXML/converters/ReAdW/FilterLine.cpp 2010-12-20 15:57:57 UTC (rev 5255) @@ -359,6 +359,7 @@ turboScanOn_(BOOL_UNDEF), dependentActive_(BOOL_UNDEF), widebandOn_(BOOL_UNDEF), +supplementalActivation_(BOOL_UNDEF) accurateMass_(ACCURATEMASS_UNDEF), scanType_(SCAN_UNDEF), msLevel_(0), @@ -423,6 +424,10 @@ cout << "wideband: " << widebandOn_ << endl; } + if (supplementalActivation_ != BOOL_UNDER) { + cout << "supplemental activation: " << supplementalActivation_ << endl; + } + if (accurateMass_) { cout << "accurate mass: " << accurateMass_ << endl; } @@ -629,11 +634,6 @@ advance = false; } - // unknown flag: SA - if (w == "SA") { - s >> w; - } - // wideband if (w == "!W") { widebandOn_ = BOOL_FALSE; @@ -651,7 +651,25 @@ advance = false; } + + // Supplemental Activation + if (w == "!SA") { + supplementalActivation_ = BOOL_FALSE; + advance = true; + } + else if (w == "SA") { + supplementalActivation_ = BOOL_TRUE; + advance = true; + } + if (advance) { + if (s.eof()) { + return 1; + } + s >> w; + advance = false; + } + accurateMass_ = parseAccuracteMass(w); if (accurateMass_) { // "accurate mass" field present This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |