Merge pull request #237 from aglowacki/master

Extra check for loading netcdf

Author: aglowacki

src/io/file/netcdf_io.cpp

@@ -240,6 +240,10 @@ size_t NetCDF_IO<T_real>::_load_spectra(E_load_type ltype,
         size_t inc_size = header_size + (spectra_size * MAX_NUM_SUPPORTED_DETECOTRS_PER_COL);
         for(size_t m1 = 0; m1 < cols_before_inc; m1++)
         {
+            if (col_idx >= spec_line->size())
+            {
+                return col_idx;
+            }
             size_t l = header_size +  (m1 * inc_size);
             if (ltype == E_load_type::LINE)
             {

src/workflow/xrf/spectra_file_source.cpp

@@ -114,11 +114,13 @@ bool Spectra_File_Source<T_real>::load_netcdf_line(std::string dirpath,
 template<typename T_real>
 data_struct::Stream_Block<T_real>* Spectra_File_Source<T_real>::_alloc_stream_block(int detector, size_t row, size_t col, size_t height, size_t width, size_t spectra_size)
 {
+    /*
 	if (_max_num_stream_blocks == -1 && _analysis_job != nullptr)
 	{
 		_max_num_stream_blocks = _analysis_job->mem_limit / (spectra_size * sizeof(T_real));
         logI << "Max stream blocks: " << _max_num_stream_blocks << "\n";
 	}
+    */
 	return new data_struct::Stream_Block<T_real>(detector, row, col, height, width);
 }