code simplifications

David Mayerich
1 parent 31394e2a
Showing 1 changed file with 64 additions and 58 deletions Show diff stats
envi/bsq.h
 #include "../envi/envi.h"
 #include "../envi/binary.h"
+#include <cstring>
+#include <utility>
  
 namespace rts{
  
@@ -13,6 +15,10 @@ protected:
  
 public:
  
+	using binary<T>::open;
+	using binary<T>::file;
+	using binary<T>::getSlice;
+
 	//open a file, given the file and its header's names
 	bool open(std::string filename, std::string headername){
  
@@ -21,7 +27,7 @@ public:
 			return false;
 		}
  
-		binary::open(filename, vec<unsigned int>(header.samples, header.lines, header.bands), header.header_offset);
+		open(filename, vec<unsigned int>(header.samples, header.lines, header.bands), header.header_offset);
 		return true;
  
 	}
@@ -61,96 +67,96 @@ public:
 	//baseline correction and save it into file
 	bool baseline(std::string outname, std::vector<unsigned> bands )
 	{
-		unsigned N = bands.size();							 //to get points number;
+		unsigned N = bands.size();			//get the number of baseline points
+
+		std::ofstream target(outname.c_str(), std::ios::binary);	//open the target binary file
  
-		ofstream bitext(outname.c_str(), std::ios::binary);                  //target binary file
+		//simplify image resolution
+		unsigned int B = header.bands;		//calculate the number of bands
+		unsigned int XY = header.samples * header.lines;	//calculate the number of pixels in a band
+		unsigned int S = XY * sizeof(T);		//calculate the number of bytes in a band
  
-		unsigned i, j, k;
-		unsigned lownum, highnum;
+		unsigned ai, bi;	//stores the two baseline points surrounding the current band
 		unsigned control=0;
  
-		T * low;
-		T * high;
-		T * current;
-		T * temp;
+		T * a;					//pointers to the high and low band images
+		T * b;
+		T * c;				//pointer to the current image
  
-		low=(T *)malloc(header.lines * header.samples * sizeof(T));     //memory allocation
-		high=(T *)malloc(header.lines * header.samples * sizeof(T)); 
-		current=(T *)malloc(header.lines * header.samples * sizeof(T)); 
+		a = (T*)malloc( S );     //memory allocation
+		b = (T*)malloc( S ); 
+		c = (T*)malloc( S ); 
  
-		if (low == NULL || high == NULL || current == NULL){
-			cout<<"memory allocation failure";	
-			return false;
-			}
+		if (a == NULL || b == NULL || c == NULL){
+			std::cout<<"ERROR: error allocating memory";
+			exit(1);
+		}
  
-		//perform baseline correction
  
 		//initialize lownum, highnum, low, high		
-		lownum=0;
+		ai=0;
+
+		//if no baseline point is specified at band 0,
+			//set the baseline point at band 0 to 0
 		if(bands[0] != 0){
-			highnum = bands[control];			
-			memset(low, 0.0, sizeof(T) * header.lines * header.samples);
+			bi = bands[control];			
+			memset(a, (char)0, S);
 		}
+		//else get the low band
 		else{
 			control += 1;
-			getBand(low, lownum);
-			highnum = bands[control];
+			getBand(a, ai);
+			bi = bands[control];
 		}
-		getBand(high, highnum);
+		//get the high band
+		getBand(b, bi);
  
 		//correct every band 
-		for(k = 0; k < header.bands; k++)		
-		{		
-			cout<<k<<endl;			//progress bar, delete it afterwards
-			if( k == highnum && k != header.bands-1) {
+		for(unsigned ci = 0; ci < B; ci++){
+
+			//update baseline points, if necessary
+			if( ci == bi && ci != B - 1) {
 				//if the high band is now on the last BL point?
 				if (control != N-1) {
  
-					control += 1;
+					control++;		//increment the index
  
-					temp=low;
-					low = high;
-					high=temp;
+					std::swap<T*>(a, b);	//swap the baseline band pointers
  
-					lownum=highnum;
-					highnum = bands[control];
-					getBand(high, highnum);
+					ai = bi;
+					bi = bands[control];
+					getBand(b, bi);
  
 				}
 				//if the last BL point on the last band of the file?
-				else if ( bands[control] != header.bands-1) {
+				else if ( bands[control] != B - 1) {
  
-					temp = low;
-					low = high;
-					high = temp;
+					std::swap<T*>(a, b);	//swap the baseline band pointers
  
-					memset(high, 0.0, sizeof(T) * header.lines * header.samples);
+					memset(b, (char)0, S);	//clear the high band
  
-					lownum = highnum;
-					highnum = header.bands-1;
+					ai = bi;
+					bi = B - 1;
 				}
 			}
-			getBand(current, k);
-
-		for(j=0; j<header.lines; j++)
-			{
-				for(i=0; i<header.samples; i++)
-				{
-					//straight line correction
-					current[j * header.samples + i] = current[j * header.samples + i] - (
-						( high[j * header.samples + i] - low[j * header.samples + i] ) * (T)(k - lownum) / (T)(highnum - lownum)
-						) - low[j * header.samples + i];
-				}				
+
+			//get the current band
+			getBand(c, ci);
+
+			//perform the baseline correction
+			for(unsigned i=0; i < XY; i++){
+				double r = (double) (ci - ai) / (double) (bi - ai);
+				c[i] = c[i] - (b[i] - a[i]) * r - a[i];
 			}
  
-		bitext.write(reinterpret_cast<const char*>(current), sizeof(T) * header.lines * header.samples);   //write the corrected data into destination
+			target.write(reinterpret_cast<const char*>(c), S);   //write the corrected data into destination
  
 		}	
  
-		free(low);
-		free(high);
-		free(current);
-		bitext.close();
+		free(a);
+		free(b);
+		free(c);
+		target.close();
 		return true;
 	}
  
@@ -158,4 +164,4 @@ public:
 	};
 }
  
-			
 \ No newline at end of file
+