linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixes to make SL6 work

Browse Source 
- New NeXus libraries
- Added new raw binary transfer mode for mass data
- Added a check script option to configurable virtual motor


SKIPPED:
	psi/dumprot.c
	psi/make_gen
	psi/psi.c
	psi/rebin.c
	psi/sanslirebin.c
This commit is contained in:
koennecke
2012-03-29 08:41:05 +00:00
parent 14f257c2ab
commit 9eca96b064
56 changed files with 8881 additions and 6327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nxinterhelper.c
View File

@ -314,6 +314,7 @@ void *nx_getslab(void *handle, void *startdim, void *sizedim)
pNXDS resultdata;
pNXDS start, size;
int status, rank, type, dim[NX_MAXRANK];
int64_t cdim[NX_MAXRANK], i;
NXhandle hfil;
hfil = (NXhandle) handle;
@ -328,7 +329,10 @@ void *nx_getslab(void *handle, void *startdim, void *sizedim)
return NULL;
}
resultdata = createNXDataset(rank, type, size->u.iPtr);
for(i = 0; i < rank; i++){
cdim[i] = size->u.iPtr[i];
}
resultdata = createNXDataset(rank, type, cdim);
if (resultdata == NULL) {
return NULL;
}
@ -346,7 +350,8 @@ void *nx_getslab(void *handle, void *startdim, void *sizedim)
void *nx_getds(void *handle, char *name)
{
pNXDS result = NULL;
int rank, type, dim[NX_MAXRANK], status;
int rank, type,status;
int64_t dim[NX_MAXRANK];
NXhandle hfil;
hfil = (NXhandle) handle;
@ -355,7 +360,7 @@ void *nx_getds(void *handle, char *name)
return NULL;
}
status = NXgetinfo(hfil, &rank, dim, &type);
status = NXgetinfo64(hfil, &rank, dim, &type);
if (status != NX_OK) {
return NULL;
}
@ -388,7 +393,7 @@ int nx_putds(void *handle, char *name, void *dataset)
status = NXopendata(hfil, name);
if (status != NX_OK) {
status = NXmakedata(hfil, name, data->type, data->rank, data->dim);
status = NXmakedata64(hfil, name, data->type, data->rank, data->dim);
if (status != NX_OK) {
return 0;
}
@ -408,12 +413,13 @@ int nx_putds(void *handle, char *name, void *dataset)
void *nx_getdata(void *handle)
{
pNXDS result = NULL;
int rank, type, dim[NX_MAXRANK], status;
int rank, type, status;
int64_t dim[NX_MAXRANK];
NXhandle hfil;
hfil = (NXhandle) handle;
status = NXgetinfo(hfil, &rank, dim, &type);
status = NXgetinfo64(hfil, &rank, dim, &type);
if (status != NX_OK) {
return NULL;
}
@ -459,7 +465,8 @@ int nx_putdata(void *handle, void *dataset)
void *nx_getinfo(void *handle)
{
NXhandle hfil;
int status, type, rank, dim[NX_MAXRANK], rdim[1], i;
int status, type, rank, dim[NX_MAXRANK], i;
int64_t rdim[1];
pNXDS data = NULL;
hfil = (NXhandle) handle;
@ -550,7 +557,8 @@ int nx_putattr(void *handle, char *name, void *ds)
void *nx_getattr(void *handle, char *name, int type, int length)
{
NXhandle hfil;
int status, tp, ll, dim[1];
int status, tp, ll;
int64_t dim[1];
pNXDS data = NULL;