detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity

bug did not give error when switching to hdf5

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-07-28 11:54:22 +02:00
parent 5713cd6092
commit 88b6fabb0d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/src/UDPBaseImplementation.cpp
View File

@ -250,10 +250,11 @@ void UDPBaseImplementation::setFileFormat(const fileFormat f){
switch(f){ switch(f){
#ifdef HDF5C #ifdef HDF5C
case HDF5: case HDF5:
fileFormatType = f; fileFormatType = HDF5;
break;
#endif #endif
default: default:
fileFormatType = f; fileFormatType = BINARY;
break; break;
} }

5
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -114,10 +114,11 @@ void UDPStandardImplementation::setFileFormat(const fileFormat f){
switch(f){ switch(f){
#ifdef HDF5C #ifdef HDF5C
case HDF5: case HDF5:
fileFormatType = f; fileFormatType = HDF5;
break;
#endif #endif
default: default:
fileFormatType = f; fileFormatType = BINARY;
break; break;
} }
//destroy file writer, set file format and create file writer //destroy file writer, set file format and create file writer

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -2179,7 +2179,7 @@ int slsReceiverTCPIPInterface::set_file_format() {
retval = receiverBase->getFileFormat(); retval = receiverBase->getFileFormat();
if(f >= 0 && retval != f){ if(f >= 0 && retval != f){
ret = FAIL; ret = FAIL;
sprintf(mess,"Could not set file format to %d, returned %d\n",f,retval); sprintf(mess,"Could not set file format to %s, returned %s\n",getFileFormatType(f).c_str(),getFileFormatType(retval).c_str());
FILE_LOG(logERROR) << "Warning: " << mess; FILE_LOG(logERROR) << "Warning: " << mess;
} }
} }