LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2020-04-13 17:33:16 +02:00
commit a701a7a336
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/external/nexus/PNeXus.cpp vendored
View File

@ -2045,7 +2045,14 @@ int PNeXus::ReadFile(const char *fileName)
// close file // close file
NXclose(&fFileHandle); NXclose(&fFileHandle);
std::stringstream ss;
switch (fIdfVersion) { switch (fIdfVersion) {
case 0:
fErrorCode = PNEXUS_IDF_NOT_IMPLEMENTED;
ss << ">> **ERROR** update of the HDF4/HDF5 libs without recompilation of the NeXus lib?";
fErrorMsg = ss.str();
status = NX_ERROR;
break;
case 1: case 1:
status = ReadFileIdf1(); status = ReadFileIdf1();
if (status != NX_OK) { if (status != NX_OK) {
@ -2062,7 +2069,6 @@ int PNeXus::ReadFile(const char *fileName)
break; break;
default: default:
fErrorCode = PNEXUS_IDF_NOT_IMPLEMENTED; fErrorCode = PNEXUS_IDF_NOT_IMPLEMENTED;
std::stringstream ss;
ss << ">> **ERROR** idf_version=" << fIdfVersion << " not yet implemented."; ss << ">> **ERROR** idf_version=" << fIdfVersion << " not yet implemented.";
fErrorMsg = ss.str(); fErrorMsg = ss.str();
status = NX_ERROR; status = NX_ERROR;