X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flowdata.cpp;h=1420f84b992a54ed6dfb6d3a28d8452a083691de;hb=e339f9008daa7d37c9a9034829565620a6abe783;hp=d1769bbed46e34c12a1a8ad4a1f69bebaeca071d;hpb=bbe1bea3cfef487d3c1657691480d4072fe0a07f;p=mothur.git

diff --git a/flowdata.cpp b/flowdata.cpp
index d1769bb..1420f84 100644
--- a/flowdata.cpp
+++ b/flowdata.cpp
@@ -42,14 +42,11 @@ FlowData::FlowData(int numFlows, float signal, float noise, int maxHomoP, string
 bool FlowData::getNext(ifstream& flowFile){
 	
 	try {
-		
-		string lengthString;
-		string flowString;
-		
-		flowFile >> seqName >> endFlow;		
-		for(int i=0;i<numFlows;i++)	{	flowFile >> flowData[i];	}
-		
-		updateEndFlow();
+		flowFile >> seqName >> endFlow;	
+		//cout << "in Flowdata " + seqName << endl;
+		for(int i=0;i<numFlows;i++)	{	flowFile >> flowData[i]; 	}
+		//cout << "in Flowdata read " << seqName + " done" << endl;
+		updateEndFlow(); 
 		translateFlow();
 		
 		m->gobble(flowFile);
@@ -138,7 +135,8 @@ void FlowData::capFlows(int mF){
 	try{
 		
 		maxFlows = mF;
-		if(endFlow > maxFlows){	endFlow = maxFlows;	}		
+		if(endFlow > maxFlows){	endFlow = maxFlows;	}	
+        translateFlow();
 		
 	}
 	catch(exception& e) {