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

slsReceiverSoftware: bugfix double acquire did not write parameter file cuz vector.push_back always never clearing when closing current file

Browse Source
This commit is contained in:
maliakal_d 2018-08-14 19:11:52 +02:00
parent f0ac49190a
commit b3ccd5e1a1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/include/HDF5FileStatic.h
View File

@ -240,7 +240,7 @@ public:
}i=14; }i=14;
} }
catch(Exception error){ catch(Exception error){
cprintf(RED,"Error in writing parameters (parameter index %d) to file in object %d\n", i, ind); cprintf(RED,"Error in writing parameters (index:%d) to file in object %d\n", i, ind);
error.printErrorStack(); error.printErrorStack();
return 1; return 1;
} }

15
slsReceiverSoftware/src/HDF5File.cpp
View File

@ -170,6 +170,13 @@ void HDF5File::CloseCurrentFile() {
pthread_mutex_lock(&Mutex); pthread_mutex_lock(&Mutex);
HDF5FileStatic::CloseDataFile(index, filefd); HDF5FileStatic::CloseDataFile(index, filefd);
pthread_mutex_unlock(&Mutex); pthread_mutex_unlock(&Mutex);
for (int i = 0; i < dataset_para.size(); ++i)
delete dataset_para[i];
dataset_para.clear();
if(dataspace_para) {delete dataspace_para;dataspace_para=0;}
if(dataset) {delete dataset;dataset=0;}
if(dataspace) {delete dataspace;dataspace=0;}
if(filefd) {delete filefd;filefd=0;}
} }
@ -182,6 +189,14 @@ void HDF5File::CloseAllFiles() {
HDF5FileStatic::CloseVirtualDataFile(virtualfd); HDF5FileStatic::CloseVirtualDataFile(virtualfd);
} }
pthread_mutex_unlock(&Mutex); pthread_mutex_unlock(&Mutex);
for (int i = 0; i < dataset_para.size(); ++i)
delete dataset_para[i];
dataset_para.clear();
if(dataspace_para) delete dataspace_para;
if(dataset) delete dataset;
if(dataspace) delete dataspace;
if(filefd) delete filefd;
} }