diff --git a/slsDetectorCalibration/dataStructures/HDF5File.cpp b/slsDetectorCalibration/dataStructures/HDF5File.cpp index 90571221c..99c2093be 100644 --- a/slsDetectorCalibration/dataStructures/HDF5File.cpp +++ b/slsDetectorCalibration/dataStructures/HDF5File.cpp @@ -10,8 +10,10 @@ HDF5File::HDF5File () { } HDF5File::~HDF5File () { + /* if(current_image) delete [] current_image; + */ } void HDF5File::SetImageDataPath (std::string const& name) { data_datasetname = name; } @@ -24,12 +26,7 @@ void HDF5File::InitializeDimensions () { file_dims.resize(rank); H5Sget_simple_extent_dims(dataspace, file_dims.data(), nullptr); - std::cout << "Dataset dimensions: ("; - for (size_t i = 0; i < file_dims.size(); ++i) { - std::cout << file_dims[i]; - if (i < file_dims.size() - 1) std::cout << ", "; - } - std::cout << ")\n"; + std::cout << "Dataset dimensions: " << vectorToString(file_dims) << "\n"; } @@ -78,12 +75,7 @@ bool HDF5File::ReadChunkDimensions () { chunk_dims.resize(rank_chunk); H5Pget_chunk (plist_id, rank_chunk, chunk_dims.data()); - std::cout << "Chunk dimensions: ("; - for (size_t i = 0; i < chunk_dims.size(); ++i) { - std::cout << chunk_dims[i]; - if (i < chunk_dims.size() - 1) std::cout << ", "; - } - std::cout << ")\n"; + std::cout << "Chunk dimensions: " << vectorToString(chunk_dims) << "\n"; H5Pclose (plist_id); @@ -129,12 +121,7 @@ bool HDF5File::OpenFrameIndexDataset() { std::vector fi_dims(fi_rank); H5Sget_simple_extent_dims (fi_dataspace, fi_dims.data(), nullptr); - std::cout << "Frame index dataset dimensions: ("; - for (size_t i = 0; i < fi_dims.size(); ++i) { - std::cout << fi_dims[i]; - if (i < fi_dims.size() - 1) std::cout << ", "; - } - std::cout << ")\n"; + std::cout << "Frame index dataset dimensions: " << vectorToString(fi_dims) << "\n"; // validate size if (fi_dims[0] != file_dims[0]) { diff --git a/slsDetectorCalibration/dataStructures/HDF5File.h b/slsDetectorCalibration/dataStructures/HDF5File.h index 97141c587..0955c2a7f 100644 --- a/slsDetectorCalibration/dataStructures/HDF5File.h +++ b/slsDetectorCalibration/dataStructures/HDF5File.h @@ -146,7 +146,7 @@ private: /** Current image ** dynamic array ** uint16_t pointer format is chosen to support use with slsDetectorCalibration cluster finder */ - uint16_t* current_image{nullptr}; + //uint16_t* current_image{nullptr}; //uint16_t current_chunk[DEFAULT_CHUNK_Z_DIMS][DEFAULT_CHUNK_Y_DIMS][DEFAULT_CHUNK_X_DIMS]; /** Current frame offset diff --git a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataQuadH5.h b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataQuadH5.h index 5a1e55045..eec7dd94c 100644 --- a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataQuadH5.h +++ b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataQuadH5.h @@ -369,6 +369,10 @@ class jungfrauLGADStrixelsDataQuadH5 : public slsDetectorData { * This is the most recent function. This is used in the cluster finder! * The overloads are legacy! * Note that caller has to allocate and deallocate memory for data! + * \param hfile object of type HDF5File (reader class) + * \param framenumber frame number as read from the HDF5 file + * \param h5offset vector defining offset parameters for HDF5 hyperslab selection (dimensions Z and S), incremented automatially + * \param data pointer to image buffer (converted to hold uint16_t by definition of HDF5File) */ char* readNextFrame( HDF5File& hfile, int& framenumber, std::vector& h5offset, char* data ) {