detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-28 09:10:01 +02:00
Code Issues Actions Packages Releases Activity

comments

Browse Source
This commit is contained in:
hinger_v 2025-02-03 18:01:13 +01:00
parent 633f83f9c7
commit 027534cc2f
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorCalibration/dataStructures/HDF5File.cpp
View File

@ -10,8 +10,10 @@ HDF5File::HDF5File () {
} }
HDF5File::~HDF5File () { HDF5File::~HDF5File () {
/*
if(current_image) if(current_image)
delete [] current_image; delete [] current_image;
*/
} }
void HDF5File::SetImageDataPath (std::string const& name) { data_datasetname = name; } void HDF5File::SetImageDataPath (std::string const& name) { data_datasetname = name; }
@ -24,12 +26,7 @@ void HDF5File::InitializeDimensions () {
file_dims.resize(rank); file_dims.resize(rank);
H5Sget_simple_extent_dims(dataspace, file_dims.data(), nullptr); H5Sget_simple_extent_dims(dataspace, file_dims.data(), nullptr);
std::cout << "Dataset dimensions: ("; std::cout << "Dataset dimensions: " << vectorToString(file_dims) << "\n";
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";
} }
@ -78,12 +75,7 @@ bool HDF5File::ReadChunkDimensions () {
chunk_dims.resize(rank_chunk); chunk_dims.resize(rank_chunk);
H5Pget_chunk (plist_id, rank_chunk, chunk_dims.data()); H5Pget_chunk (plist_id, rank_chunk, chunk_dims.data());
std::cout << "Chunk dimensions: ("; std::cout << "Chunk dimensions: " << vectorToString(chunk_dims) << "\n";
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";
H5Pclose (plist_id); H5Pclose (plist_id);
@ -129,12 +121,7 @@ bool HDF5File::OpenFrameIndexDataset() {
std::vector<hsize_t> fi_dims(fi_rank); std::vector<hsize_t> fi_dims(fi_rank);
H5Sget_simple_extent_dims (fi_dataspace, fi_dims.data(), nullptr); H5Sget_simple_extent_dims (fi_dataspace, fi_dims.data(), nullptr);
std::cout << "Frame index dataset dimensions: ("; std::cout << "Frame index dataset dimensions: " << vectorToString(fi_dims) << "\n";
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";
// validate size // validate size
if (fi_dims[0] != file_dims[0]) { if (fi_dims[0] != file_dims[0]) {

2
slsDetectorCalibration/dataStructures/HDF5File.h
View File

@ -146,7 +146,7 @@ private:
/** Current image /** Current image
** dynamic array ** dynamic array
** uint16_t pointer format is chosen to support use with slsDetectorCalibration cluster finder */ ** 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]; //uint16_t current_chunk[DEFAULT_CHUNK_Z_DIMS][DEFAULT_CHUNK_Y_DIMS][DEFAULT_CHUNK_X_DIMS];
/** Current frame offset /** Current frame offset

4
slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsDataQuadH5.h
View File

@ -369,6 +369,10 @@ class jungfrauLGADStrixelsDataQuadH5 : public slsDetectorData<uint16_t> {
* This is the most recent function. This is used in the cluster finder! * This is the most recent function. This is used in the cluster finder!
* The overloads are legacy! * The overloads are legacy!
* Note that caller has to allocate and deallocate memory for data! * 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<hsize_t>& h5offset, char* data ) { char* readNextFrame( HDF5File& hfile, int& framenumber, std::vector<hsize_t>& h5offset, char* data ) {