Skip to content

Commit 49746b3

Browse files
author
Arthur Glowacki
committed
Commented out stream_saver since it is not fully implemented
1 parent dbf4265 commit 49746b3

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/io/file/hdf5_io.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,12 +1201,12 @@ bool HDF5_IO::generate_stream_dataset(std::string dataset_directory,
12011201

12021202

12031203
//-----------------------------------------------------------------------------
1204-
1204+
/*
12051205
bool HDF5_IO::close_dataset(size_t d_hash)
12061206
{
12071207
return false;
12081208
}
1209-
1209+
*/
12101210
//-----------------------------------------------------------------------------
12111211

12121212
void HDF5_IO::update_theta(std::string dataset_file, std::string theta_pv_str)
@@ -2094,7 +2094,7 @@ void HDF5_IO::add_v9_layout(std::string dataset_file)
20942094
std::string max_name = "/MAPS/Spectra/Integrated_Spectra/"+ STR_MAX_CHANNELS_INT_SPEC;
20952095
std::string max10_name = "/MAPS/Spectra/Integrated_Spectra/"+ STR_MAX10_INT_SPEC;
20962096
std::string v9_max_name = "/MAPS/max_chan_spec";
2097-
hid_t fit_int_id = -1, max_id = -1, max_10_id = -1, nnls_id = -1, back_id = -1, max_space = -1, max_type, v9_max_id = -1, v9_space = -1;
2097+
hid_t fit_int_id = -1, max_id = -1, max_10_id = -1, nnls_id = -1, back_id = -1, max_space = -1, max_type = -1, v9_max_id = -1, v9_space = -1;
20982098

20992099
max_id = H5Dopen(file_id, max_name.c_str(), H5P_DEFAULT);
21002100
if(max_id > -1)
@@ -2261,7 +2261,7 @@ void HDF5_IO::add_v9_layout(std::string dataset_file)
22612261

22622262
hid_t chan_space = H5Dget_space(chan_names);
22632263
_global_close_map.push({chan_space, H5O_DATASPACE });
2264-
int num_chan;
2264+
int num_chan = 0;
22652265
if(chan_names > -1)
22662266
{
22672267
hsize_t chan_size = 1;
@@ -2277,7 +2277,7 @@ void HDF5_IO::add_v9_layout(std::string dataset_file)
22772277
hsize_t unit_dims[2];
22782278
hsize_t offset_dims[2] = { 0,0 };
22792279
unit_dims[0] = 4;
2280-
unit_dims[1] =num_chan;
2280+
unit_dims[1] = num_chan;
22812281
hid_t ch_unit_id, units_space;
22822282

22832283
if (false == _open_h5_dataset("/MAPS/channel_units", filetype, file_id, 2, &unit_dims[0], &unit_dims[0], ch_unit_id, units_space))

src/io/file/hdf5_io.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,9 +1861,9 @@ class DLL_EXPORT HDF5_IO
18611861
bool _load_spectra_line_xspress3(hid_t file_id, size_t detector_num, data_struct::Spectra_Line<T_real>* spec_row)
18621862
{
18631863
std::stack<std::pair<hid_t, H5_OBJECTS> > close_map;
1864-
hid_t dset_id, dataspace_id, maps_grp_id, scaler_grp_id, scaler2_grp_id, memoryspace_id, memoryspace_meta_id = -1;
1865-
hid_t dset_lt_id, dset_rt_id, dset_outcnt_id = -1;
1866-
hid_t dataspace_lt_id, dataspace_rt_id, dataspace_outcnt_id = -1;
1864+
hid_t dset_id = -1, dataspace_id = -1, maps_grp_id = -1, scaler_grp_id = -1, scaler2_grp_id = -1, memoryspace_id = -1, memoryspace_meta_id = -1;
1865+
hid_t dset_lt_id = -1, dset_rt_id = -1, dset_outcnt_id = -1;
1866+
hid_t dataspace_lt_id = -1, dataspace_rt_id = -1, dataspace_outcnt_id = -1;
18671867

18681868
herr_t error = -1;
18691869
std::string detector_path;
@@ -3639,7 +3639,7 @@ class DLL_EXPORT HDF5_IO
36393639

36403640
// read scaler names and search for elt1, ert1, incnt1, outcnt1
36413641
hsize_t dims_out[1];
3642-
unsigned int status_n = H5Sget_simple_extent_dims(dataspace_scaler_names, &dims_out[0], nullptr);
3642+
H5Sget_simple_extent_dims(dataspace_scaler_names, &dims_out[0], nullptr);
36433643
char tmp_name[256] = { 0 };
36443644
memoryspace_1 = H5Screate_simple(1, count, nullptr);
36453645
for (hsize_t idx = 0; idx < dims_out[0]; idx++)
@@ -4277,7 +4277,7 @@ class DLL_EXPORT HDF5_IO
42774277
logE << "Error getting rank for /MAPS/Scalers/Values\n";
42784278
}
42794279
hsize_t* dims_out = new hsize_t[rank];
4280-
unsigned int status_n = H5Sget_simple_extent_dims(counts_dspace_id, &dims_out[0], nullptr);
4280+
H5Sget_simple_extent_dims(counts_dspace_id, &dims_out[0], nullptr);
42814281

42824282
filetype = H5Tcopy(H5T_C_S1);
42834283
H5Tset_size(filetype, 256);
@@ -5419,7 +5419,7 @@ class DLL_EXPORT HDF5_IO
54195419
}
54205420

54215421
//-----------------------------------------------------------------------------
5422-
5422+
/*
54235423
template<typename T_real>
54245424
bool save_stream_row(size_t d_hash, size_t detector_num, size_t row, std::vector< data_struct::Spectra<T_real>* > *spectra_row)
54255425
{
@@ -5433,11 +5433,11 @@ class DLL_EXPORT HDF5_IO
54335433
{
54345434
return false;
54355435
}
5436-
5436+
54375437
//-----------------------------------------------------------------------------
54385438
54395439
bool close_dataset(size_t d_hash);
5440-
5440+
*/
54415441
bool start_save_seq(const std::string filename, bool force_new_file=false, bool open_file_only=false);
54425442

54435443
bool start_save_seq(bool force_new_file=false){ return start_save_seq(_cur_filename, force_new_file, false);}

0 commit comments

Comments
 (0)