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

NeXus: replaced deprecated NXgetnextattr by NXgetnextattra.

Browse Source
This commit is contained in:
suter_a 2022-04-12 15:01:59 +02:00
parent 9a92ec2d8e
commit 5361727583
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2761,7 +2761,7 @@ int PNeXus::ReadFileIdf1()
char cstr[128]; char cstr[128];
int ival; int ival;
float fval; float fval;
int attlen, atttype; int attlen, atttype, rank, dims[32];
NXname data_value, nxAttrName; NXname data_value, nxAttrName;
// open file // open file
@ -2775,7 +2775,7 @@ int PNeXus::ReadFileIdf1()
// collect the NXroot attribute information // collect the NXroot attribute information
do { do {
status = NXgetnextattr(fFileHandle, nxAttrName, &attlen, &atttype); status = NXgetnextattra(fFileHandle, nxAttrName, &rank, dims, &atttype);
if (status == NX_OK) { if (status == NX_OK) {
if (!strcmp(nxAttrName, "HDF_version")) { if (!strcmp(nxAttrName, "HDF_version")) {
attlen = VGNAMELENMAX - 1; attlen = VGNAMELENMAX - 1;
@ -3153,7 +3153,7 @@ int PNeXus::ReadFileIdf1()
// get data // get data
// get information of the current nexus entity // get information of the current nexus entity
int rank, type, dims[32], size, noOfElements; int type, size, noOfElements;
if (!ErrorHandler(NXgetinfo(fFileHandle, &rank, dims, &type), PNEXUS_GET_META_INFO_ERROR, "couldn't get data info!")) return NX_ERROR; if (!ErrorHandler(NXgetinfo(fFileHandle, &rank, dims, &type), PNEXUS_GET_META_INFO_ERROR, "couldn't get data info!")) return NX_ERROR;
// calculate the needed size // calculate the needed size
@ -3354,7 +3354,7 @@ int PNeXus::ReadFileIdf2()
// collect the NXroot attribute information // collect the NXroot attribute information
do { do {
status = NXgetnextattr(fFileHandle, nxAttrName, &attlen, &atttype); status = NXgetnextattra(fFileHandle, nxAttrName, &rank, dims, &atttype);
if (status == NX_OK) { if (status == NX_OK) {
if (!strcmp(nxAttrName, "HDF_version")) { if (!strcmp(nxAttrName, "HDF_version")) {
attlen = VGNAMELENMAX - 1; attlen = VGNAMELENMAX - 1;
@ -5432,21 +5432,23 @@ bool PNeXus::SearchInGroup(std::string str, std::string tag, NXname &nxname, NXn
* - false otherwise * - false otherwise
* *
* \param str label of the attribute to be looked for * \param str label of the attribute to be looked for
* \param length of the attribute data it entry is found * \param length of the attribute data if entry is found
* \param dataType of the entry if entry is found * \param dataType of the entry if entry is found
*/ */
bool PNeXus::SearchAttrInData(std::string str, int &length, int &dataType) bool PNeXus::SearchAttrInData(std::string str, int &length, int &dataType)
{ {
bool found = false; bool found = false;
int status; int status, rank, dims[32];
char name[128]; char name[128];
memset(name, 0, sizeof(name)); memset(name, 0, sizeof(name));
NXinitattrdir(fFileHandle); NXinitattrdir(fFileHandle);
do { do {
status = NXgetnextattr(fFileHandle, name, &length, &dataType); status = NXgetnextattra(fFileHandle, name, &rank, dims, &dataType);
if (!str.compare(name)) { if (!str.compare(name)) {
if (rank == 1)
length = dims[0];
found = true; found = true;
break; break;
} }