Merge branch 'master' of https://github.com/dmayerich/stim

heziqi
2 parents 11f177d5 5f461a5d
Showing 9 changed files with 1 additions and 2 deletions Show diff stats
gl/error.h
gl/rtsSourceCode.h
gl/rts_glShaderObject.h
gl/rts_glShaderProgram.h
gl/rts_glShaderUniform.h
gl/rts_glUtilities.h
gl/texture.h
math/field.cuh
math/function.h
@@ -120,7 +120,6 @@ protected:
 		}
  
 		//retrieve the maximum value for this slice and store it in the maxVal array
-		std::cout<<X[n]<<std::endl;
 		HANDLE_ERROR(cudaMemcpy(&result, X[n] + index, sizeof(T), cudaMemcpyDeviceToHost));
 		return result;
 	}
@@ -85,7 +85,7 @@ public:
 		//i currently holds the ceiling
  
 		//if the wavelength is past the end of the list, return the last sample point
-		if(i == N) return Y[N];
+		if(i == N) return Y.back();
 		//if the wavelength is before the beginning of the list, return the front
 		else if(i == 0) return Y[0];
 		//otherwise interpolate