[Sashimi-commit] SF.net SVN: sashimi:[5265] trunk/trans_proteomic_pipeline/src/mzXML/ converters/ReAdW/FilterLine.cpp

[<pcb...@us...>]

Revision: 5265
          http://sashimi.svn.sourceforge.net/sashimi/?rev=5265&view=rev
Author:   pcbrefugee
Date:     2010-12-23 21:43:22 +0000 (Thu, 23 Dec 2010)

Log Message:
-----------
revert to previous version - last committed code cannot be built.  Missing comma in initializer list, references to class members not declared in class header, kind of a mess.

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-23 18:43:24 UTC (rev 5264)
+++ trunk/trans_proteomic_pipeline/src/mzXML/converters/ReAdW/FilterLine.cpp	2010-12-23 21:43:22 UTC (rev 5265)
@@ -359,7 +359,6 @@
 turboScanOn_(BOOL_UNDEF),
 dependentActive_(BOOL_UNDEF),
 widebandOn_(BOOL_UNDEF),
-supplementalActivation_(BOOL_UNDEF)
 accurateMass_(ACCURATEMASS_UNDEF),
 scanType_(SCAN_UNDEF),
 msLevel_(0),
@@ -424,10 +423,6 @@
 		cout << "wideband: " << widebandOn_ << endl;
 	}
 
-	if (supplementalActivation_ != BOOL_UNDER) {
-		cout << "supplemental activation: " << supplementalActivation_ << endl;
-	}
-
 	if (accurateMass_) {
 		cout << "accurate mass: " << accurateMass_ << endl;
 	}
@@ -634,6 +629,11 @@
 		advance = false;
 	}
 
+	// unknown flag: SA
+	if (w == "SA") {
+		s >> w;
+	}
+
 	// wideband
 	if (w == "!W") {
 		widebandOn_ = BOOL_FALSE;
@@ -651,25 +651,7 @@
 		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.