cleaned up the code

David Mayerich
1 parent 6708cc25
Showing 4 changed files with 23 additions and 24 deletions Show diff stats
envi/bil.h
envi/bip.h
envi/bsq.h
envi/envi.h
@@ -54,7 +54,7 @@ public:
 		return true;
 	}
-	bool getBand( T * p, double wavelength){
+	bool band( T * p, double wavelength){
 		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
 		unsigned int S = XY * sizeof(T);		//calculate the number of bytes of a band
@@ -147,7 +147,7 @@ public:
 	}
 	//save one pixel of the BIP file into the memory, and return the pointer
-	bool getSpectrum(T * p, unsigned x, unsigned y){
+	bool spectrum(T * p, unsigned x, unsigned y){
 		if ( x >= R[0] || y >= R[1]){							//make sure the sample and line number is right
 			std::cout<<"ERROR: sample or line out of range"<<std::endl;
@@ -292,7 +292,7 @@ public:
 	}
 	// normalize the BIL file
-	bool normalize(std::string outname, double band)
+	bool normalize(std::string outname, double w)
 	{
 		unsigned int B = R[2];		//calculate the number of bands
 		unsigned int Y = R[1];
@@ -311,7 +311,7 @@ public:
 		b = (T*)malloc( S );     //memory allocation
 		c = (T*)malloc( L ); 
-		getBand(b, band);             //get the certain band into memory
+		band(b, w);             //get the certain band into memory
 		for(unsigned j = 0; j < Y; j++)
 		{
@@ -58,7 +58,7 @@ public:
 		return true;
 	}
-	bool getBand( T * p, double wavelength){
+	bool band( T * p, double wavelength){
 		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
@@ -242,7 +242,7 @@ public:
 	}
 	//save one pixel of the BIP file into the memory, and return the pointer
-	bool getSpectrum(T * p, unsigned x, unsigned y){
+	bool spectrum(T * p, unsigned x, unsigned y){
 		if ( x >= R[0] || y >= R[1]){							//make sure the sample and line number is right
 			std::cout<<"ERROR: sample or line out of range"<<std::endl;
@@ -381,7 +381,7 @@ public:
 	}
 	// normalize the BIP file
-	bool normalize(std::string outname, double band)
+	bool normalize(std::string outname, double w)
 	{
 		unsigned int B = R[2];		//calculate the number of bands
 		unsigned int Y = R[1];
@@ -400,7 +400,7 @@ public:
 		b = (T*)malloc( S );     //memory allocation
 		c = (T*)malloc( L ); 
-		getBand(b, band);             //get the certain band into memory
+		band(b, w);             //get the certain band into memory
 		for(unsigned j = 0; j < Y; j++)
 		{
@@ -433,7 +433,7 @@ public:
 		bil(temp);
 		rts::bil<T> n;
-		if(n.bil::open(temp, R[0], R[1], R[2], offset, w)==false){        //open infile
+		if(n.open(temp, R[0], R[1], R[2], offset, w)==false){        //open infile
 			std::cout<<"ERROR: unable to open input file"<<std::endl;
 			exit(1);
 		}
@@ -28,14 +28,9 @@ public:
 	using binary<T>::getSlice;
 	using binary<T>::R;
-	//open a file, given the file and its header's names
+	//open a file, given the file name and dimensions
 	bool open(std::string filename, unsigned int X, unsigned int Y, unsigned int B, unsigned int header_offset, std::vector<double> wavelengths){
-		/*if (header.load(headername)==false){
-			std::cout<<"ERROR: unable to load header file: "<<headername<<std::endl;
-			return false;
-		}*/
-
 		//copy the wavelengths to the BSQ file structure
 		w = wavelengths;
 		//copy the wavelengths to the structure
@@ -47,7 +42,7 @@ public:
 	}
-	//save one band of the file into the memory, and return the pointer
+	//retrieve one band (specified by the band index)
 	bool band_index( T * p, unsigned int page){
 		if (page >= R[2]){										//make sure the bank number is right
@@ -59,7 +54,8 @@ public:
 		return true;
 	}
-	bool getBand( T * p, double wavelength){
+	//retrieve one band (specified by the wavelength)
+	bool band( T * p, double wavelength){
 		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
@@ -104,7 +100,7 @@ public:
 	}
 	//save one pixel of the file into the memory, and return the pointer
-	bool getSpectrum(T * p, unsigned x, unsigned y){
+	bool spectrum(T * p, unsigned x, unsigned y){
 		unsigned int i;
@@ -168,11 +164,11 @@ public:
 		//else get the low band
 		else{
 			control += 1;
-			getBand(a, ai);
+			band(a, ai);
 			bi = wls[control];
 		}
 		//get the high band
-		getBand(b, bi);
+		band(b, bi);
 		//correct every band 
 		for(unsigned cii = 0; cii < B; cii++){
@@ -188,7 +184,7 @@ public:
 					ai = bi;
 					bi = wls[control];
-					getBand(b, bi);
+					band(b, bi);
 				}
 				//if the last BL point on the last band of the file?
@@ -227,7 +223,7 @@ public:
 	}
 	// normalize the BSQ file
-	bool normalize(std::string outname, double band)
+	bool normalize(std::string outname, double w)
 	{
 		unsigned int B = R[2];		//calculate the number of bands
 		unsigned int XY = R[0] * R[1];	//calculate the number of pixels in a band
@@ -242,7 +238,7 @@ public:
 		b = (T*)malloc( S );     //memory allocation
 		c = (T*)malloc( S ); 
-		getBand(b, band);             //get the certain band into memory
+		band(b, w);             //get the certain band into memory
 		for(unsigned j = 0; j < B; j++)
 		{
@@ -271,7 +267,7 @@ public:
 		bil(temp);
 		rts::bil<T> n;
-		if(n.bil::open(temp, R[0], R[1], R[2], offset, w)==false){        //open infile
+		if(n.open(temp, R[0], R[1], R[2], offset, w)==false){        //open infile
 			std::cout<<"ERROR: unable to open input file"<<std::endl;
 			exit(1);
 		}
@@ -127,6 +127,7 @@ public:
 			std::cout<<"ERROR: unidentified file type"<<std::endl;
 			exit(1);
 		}
+		return false;
 	}
 	//perform baseline correction
@@ -268,6 +269,7 @@ public:
 			std::cout<<"ERROR: unidentified interleave type"<<std::endl;
 			exit(1);
 		}
+		return false;
 	}
@@ -304,6 +306,7 @@ public:
 				exit(1);
 			}
 		}
+		return false;
 	}
 	bool save_header(std::string filename){