- Fixes to make SL6 work
- 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
242
nxdataset.c
242
nxdataset.c
@ -12,9 +12,8 @@
|
||||
#include "nxdataset.h"
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
static int getTypeSize(int typecode)
|
||||
{
|
||||
switch (typecode) {
|
||||
static int getTypeSize(int typecode){
|
||||
switch(typecode){
|
||||
case NX_FLOAT32:
|
||||
case NX_INT32:
|
||||
case NX_UINT32:
|
||||
@ -34,51 +33,50 @@ static int getTypeSize(int typecode)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
pNXDS createNXDataset(int rank, int typecode, int dim[])
|
||||
{
|
||||
pNXDS createNXDataset(int rank, int typecode, int64_t dim[]){
|
||||
pNXDS pNew = NULL;
|
||||
int i, length;
|
||||
int64_t length;
|
||||
int i;
|
||||
|
||||
pNew = (pNXDS) malloc(sizeof(NXDS));
|
||||
if (pNew == NULL) {
|
||||
pNew = (pNXDS)malloc(sizeof(NXDS));
|
||||
if(pNew == NULL){
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pNew->dim = (int *) malloc(rank * sizeof(int));
|
||||
for (i = 0, length = 1; i < rank; i++) {
|
||||
pNew->dim = (int64_t *)malloc(rank*sizeof(int64_t));
|
||||
for(i = 0, length = 1; i < rank; i++){
|
||||
length *= dim[i];
|
||||
}
|
||||
pNew->u.ptr = malloc(length * getTypeSize(typecode));
|
||||
/* add +1 in case of string NULL termination */
|
||||
pNew->u.ptr = malloc(length*getTypeSize(typecode)+1);
|
||||
|
||||
if (pNew->dim == NULL || pNew->u.ptr == NULL) {
|
||||
if(pNew->dim == NULL || pNew->u.ptr == NULL){
|
||||
free(pNew);
|
||||
return NULL;
|
||||
}
|
||||
pNew->rank = rank;
|
||||
pNew->type = typecode;
|
||||
pNew->format = NULL;
|
||||
for (i = 0; i < rank; i++) {
|
||||
for(i = 0; i < rank; i++){
|
||||
pNew->dim[i] = dim[i];
|
||||
}
|
||||
pNew->magic = MAGIC;
|
||||
memset(pNew->u.ptr, 0, length * getTypeSize(typecode));
|
||||
/* add +1 in case of string NULL termination - see above */
|
||||
memset(pNew->u.ptr,0,length*getTypeSize(typecode)+1);
|
||||
return pNew;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------*/
|
||||
pNXDS createTextNXDataset(char *name)
|
||||
{
|
||||
pNXDS createTextNXDataset(char *name){
|
||||
pNXDS pNew = NULL;
|
||||
|
||||
pNew = (pNXDS) malloc(sizeof(NXDS));
|
||||
if (pNew == NULL) {
|
||||
pNew = (pNXDS)malloc(sizeof(NXDS));
|
||||
if(pNew == NULL){
|
||||
return NULL;
|
||||
}
|
||||
pNew->dim = (int *) malloc(sizeof(int));
|
||||
pNew->dim = (int64_t *)malloc(sizeof(int64_t));
|
||||
pNew->u.cPtr = strdup(name);
|
||||
if (pNew->dim == NULL || pNew->u.ptr == NULL) {
|
||||
if(pNew->dim == NULL || pNew->u.ptr == NULL){
|
||||
free(pNew);
|
||||
return NULL;
|
||||
}
|
||||
@ -88,249 +86,225 @@ pNXDS createTextNXDataset(char *name)
|
||||
pNew->dim[0] = strlen(name);
|
||||
return pNew;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
void dropNXDataset(pNXDS dataset)
|
||||
{
|
||||
if (dataset == NULL) {
|
||||
void dropNXDataset(pNXDS dataset){
|
||||
if(dataset == NULL){
|
||||
return;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return;
|
||||
}
|
||||
if (dataset->dim != NULL) {
|
||||
if(dataset->dim != NULL){
|
||||
free(dataset->dim);
|
||||
}
|
||||
if (dataset->u.ptr != NULL) {
|
||||
if(dataset->u.ptr != NULL){
|
||||
free(dataset->u.ptr);
|
||||
}
|
||||
if (dataset->format != NULL) {
|
||||
if(dataset->format != NULL){
|
||||
free(dataset->format);
|
||||
}
|
||||
free(dataset);
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
int getNXDatasetRank(pNXDS dataset)
|
||||
{
|
||||
if (dataset == NULL) {
|
||||
int getNXDatasetRank(pNXDS dataset){
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
return dataset->rank;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
int getNXDatasetDim(pNXDS dataset, int which)
|
||||
{
|
||||
if (dataset == NULL) {
|
||||
int getNXDatasetDim(pNXDS dataset, int which){
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
if (which < 0 || which >= dataset->rank) {
|
||||
if(which < 0 || which >= dataset->rank){
|
||||
return 0;
|
||||
}
|
||||
return dataset->dim[which];
|
||||
}
|
||||
|
||||
/*------------------------------------------------------------------------*/
|
||||
int getNXDatasetType(pNXDS dataset)
|
||||
{
|
||||
if (dataset == NULL) {
|
||||
int getNXDatasetType(pNXDS dataset){
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
return dataset->type;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------*/
|
||||
int getNXDatasetLength(pNXDS dataset)
|
||||
{
|
||||
int getNXDatasetLength(pNXDS dataset){
|
||||
int length, i;
|
||||
|
||||
if (dataset == NULL) {
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
length = dataset->dim[0];
|
||||
for (i = 1; i < dataset->rank; i++) {
|
||||
for(i = 1; i < dataset->rank; i++){
|
||||
length *= dataset->dim[i];
|
||||
}
|
||||
return length;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------*/
|
||||
int getNXDatasetByteLength(pNXDS dataset)
|
||||
{
|
||||
return getNXDatasetLength(dataset) * getTypeSize(dataset->type);
|
||||
int getNXDatasetByteLength(pNXDS dataset){
|
||||
return getNXDatasetLength(dataset)*getTypeSize(dataset->type);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
This calculates an arbitray address in C storage order
|
||||
-----------------------------------------------------------------------*/
|
||||
static int calculateAddress(pNXDS dataset, int pos[])
|
||||
{
|
||||
int result, mult;
|
||||
static int64_t calculateAddress(pNXDS dataset, int64_t pos[]){
|
||||
int64_t result, mult;
|
||||
int i, j;
|
||||
|
||||
result = pos[dataset->rank - 1];
|
||||
for (i = 0; i < dataset->rank - 1; i++) {
|
||||
for(i = 0; i < dataset->rank -1; i++){
|
||||
mult = 1;
|
||||
for (j = dataset->rank - 1; j > i; j--) {
|
||||
for(j = dataset->rank -1; j > i; j--){
|
||||
mult *= dataset->dim[j];
|
||||
}
|
||||
if (pos[i] < dataset->dim[i] && pos[i] > 0) {
|
||||
result += mult * pos[i];
|
||||
if(pos[i] < dataset->dim[i] && pos[i] > 0){
|
||||
result += mult*pos[i];
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
double getNXDatasetValue(pNXDS dataset, int pos[])
|
||||
{
|
||||
int address;
|
||||
double value;
|
||||
|
||||
if (dataset == NULL) {
|
||||
double getNXDatasetValue(pNXDS dataset, int64_t pos[]){
|
||||
int64_t address;
|
||||
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
|
||||
address = calculateAddress(dataset, pos);
|
||||
address = calculateAddress(dataset,pos);
|
||||
return getNXDatasetValueAt(dataset, address);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
double getNXDatasetValueAt(pNXDS dataset, int address)
|
||||
{
|
||||
double getNXDatasetValueAt(pNXDS dataset, int64_t address){
|
||||
double value;
|
||||
|
||||
if (dataset == NULL) {
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (dataset->type) {
|
||||
switch(dataset->type){
|
||||
case NX_FLOAT64:
|
||||
value = dataset->u.dPtr[address];
|
||||
break;
|
||||
case NX_FLOAT32:
|
||||
value = (double) dataset->u.fPtr[address];
|
||||
value = (double)dataset->u.fPtr[address];
|
||||
break;
|
||||
case NX_INT32:
|
||||
case NX_UINT32:
|
||||
value = (double) dataset->u.iPtr[address];
|
||||
value = (double)dataset->u.iPtr[address];
|
||||
break;
|
||||
case NX_INT64:
|
||||
case NX_UINT64:
|
||||
value = (double) dataset->u.lPtr[address];
|
||||
value = (double)dataset->u.lPtr[address];
|
||||
break;
|
||||
case NX_INT16:
|
||||
case NX_UINT16:
|
||||
value = (double) dataset->u.sPtr[address];
|
||||
value = (double)dataset->u.sPtr[address];
|
||||
break;
|
||||
default:
|
||||
value = (double) dataset->u.cPtr[address];
|
||||
value = (double)dataset->u.cPtr[address];
|
||||
break;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
char *getNXDatasetText(pNXDS dataset)
|
||||
{
|
||||
char *getNXDatasetText(pNXDS dataset){
|
||||
char *resultBuffer = NULL;
|
||||
int length, status = 1;
|
||||
int status = 1;
|
||||
|
||||
if (dataset == NULL) {
|
||||
if(dataset == NULL){
|
||||
return strdup("NULL");
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return strdup("NULL");
|
||||
}
|
||||
if (dataset->rank > 1) {
|
||||
if(dataset->rank > 1){
|
||||
status = 0;
|
||||
}
|
||||
if (dataset->type == NX_FLOAT32 ||
|
||||
dataset->type == NX_FLOAT64 ||
|
||||
dataset->type == NX_INT32 ||
|
||||
dataset->type == NX_UINT32 ||
|
||||
dataset->type == NX_INT64 ||
|
||||
dataset->type == NX_UINT64 ||
|
||||
dataset->type == NX_INT16 || dataset->type == NX_UINT16) {
|
||||
}
|
||||
if(dataset->type == NX_FLOAT32 ||
|
||||
dataset->type == NX_FLOAT64 ||
|
||||
dataset->type == NX_INT32 ||
|
||||
dataset->type == NX_UINT32 ||
|
||||
dataset->type == NX_INT64 ||
|
||||
dataset->type == NX_UINT64 ||
|
||||
dataset->type == NX_INT16 ||
|
||||
dataset->type == NX_UINT16 ) {
|
||||
status = 0;
|
||||
}
|
||||
|
||||
if (status == 0) {
|
||||
if(status == 0){
|
||||
return strdup("NO type problem");
|
||||
} else {
|
||||
resultBuffer = (char *) malloc((dataset->dim[0] + 10) * sizeof(char));
|
||||
if (resultBuffer == NULL) {
|
||||
}else{
|
||||
resultBuffer = (char *)malloc((dataset->dim[0]+10)*sizeof(char));
|
||||
if(resultBuffer == NULL){
|
||||
return strdup("NO Memory");
|
||||
}
|
||||
memset(resultBuffer, 0, (dataset->dim[0] + 10) * sizeof(char));
|
||||
strncpy(resultBuffer, dataset->u.cPtr, dataset->dim[0]);
|
||||
memset(resultBuffer,0,(dataset->dim[0]+10)*sizeof(char));
|
||||
strncpy(resultBuffer,dataset->u.cPtr,dataset->dim[0]);
|
||||
}
|
||||
return resultBuffer;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
int putNXDatasetValue(pNXDS dataset, int pos[], double value)
|
||||
{
|
||||
int address;
|
||||
int putNXDatasetValue(pNXDS dataset, int64_t pos[], double value){
|
||||
int64_t address;
|
||||
|
||||
if (dataset == NULL) {
|
||||
if(dataset == NULL){
|
||||
return 0;
|
||||
}
|
||||
if (dataset->magic != MAGIC) {
|
||||
if(dataset->magic != MAGIC){
|
||||
return 0;
|
||||
}
|
||||
|
||||
address = calculateAddress(dataset, pos);
|
||||
return putNXDatasetValueAt(dataset, address, value);
|
||||
address = calculateAddress(dataset,pos);
|
||||
return putNXDatasetValueAt(dataset,address,value);
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------*/
|
||||
int putNXDatasetValueAt(pNXDS dataset, int address, double value)
|
||||
{
|
||||
int putNXDatasetValueAt(pNXDS dataset, int64_t address, double value){
|
||||
/*
|
||||
this code is dangerous, it casts without checking the data range.
|
||||
This may cause trouble in some cases
|
||||
*/
|
||||
switch (dataset->type) {
|
||||
this code is dangerous, it casts without checking the data range.
|
||||
This may cause trouble in some cases
|
||||
*/
|
||||
switch(dataset->type){
|
||||
case NX_FLOAT64:
|
||||
dataset->u.dPtr[address] = value;
|
||||
break;
|
||||
case NX_FLOAT32:
|
||||
dataset->u.fPtr[address] = (float) value;
|
||||
dataset->u.fPtr[address] = (float)value;
|
||||
break;
|
||||
case NX_INT32:
|
||||
case NX_UINT32:
|
||||
dataset->u.iPtr[address] = (int) value;
|
||||
dataset->u.iPtr[address] = (int)value;
|
||||
break;
|
||||
case NX_INT64:
|
||||
case NX_UINT64:
|
||||
dataset->u.lPtr[address] = (int64_t) value;
|
||||
dataset->u.lPtr[address] = (int64_t)value;
|
||||
break;
|
||||
case NX_INT16:
|
||||
case NX_UINT16:
|
||||
dataset->u.sPtr[address] = (short int) value;
|
||||
dataset->u.sPtr[address] = (short int)value;
|
||||
break;
|
||||
default:
|
||||
dataset->u.cPtr[address] = (char) value;
|
||||
dataset->u.cPtr[address] = (char)value;
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
@ -340,8 +314,8 @@ int putNXDatasetValueAt(pNXDS dataset, int address, double value)
|
||||
This is working recursively through the dimensions. When at the last:
|
||||
actual copying takes place.
|
||||
-----------------------------------------------------------------------*/
|
||||
static void copyCutData(pNXDS source, pNXDS target, int sourceDim[],
|
||||
int targetDim[], int start[], int end[], int dim)
|
||||
static void copyCutData(pNXDS source, pNXDS target, int64_t sourceDim[],
|
||||
int64_t targetDim[], int64_t start[], int64_t end[], int dim)
|
||||
{
|
||||
int i, length;
|
||||
double val;
|
||||
@ -366,11 +340,11 @@ static void copyCutData(pNXDS source, pNXDS target, int sourceDim[],
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------------------*/
|
||||
pNXDS cutNXDataset(pNXDS source, int start[], int end[])
|
||||
pNXDS cutNXDataset(pNXDS source, int64_t start[], int64_t end[])
|
||||
{
|
||||
pNXDS result = NULL;
|
||||
int newDim[NX_MAXRANK], i;
|
||||
int sourceDim[NX_MAXRANK], targetDim[NX_MAXRANK];
|
||||
int64_t newDim[NX_MAXRANK], i;
|
||||
int64_t sourceDim[NX_MAXRANK], targetDim[NX_MAXRANK];
|
||||
|
||||
for (i = 0; i < source->rank; i++) {
|
||||
if (start[i] < 0 || end[i] > source->dim[i]) {
|
||||
@ -399,8 +373,8 @@ pNXDS cutNXDataset(pNXDS source, int start[], int end[])
|
||||
This recurses through all dimensions, thereby skipping the summed one.
|
||||
At the end of the recursion the actual summing is performed.
|
||||
----------------------------------------------------------------------*/
|
||||
static void sumData(pNXDS source, pNXDS target, int sourceDim[],
|
||||
int targetDim[], int targetDimCount, int dimNo,
|
||||
static void sumData(pNXDS source, pNXDS target, int64_t sourceDim[],
|
||||
int64_t targetDim[], int targetDimCount, int dimNo,
|
||||
int start, int end, int currentDim)
|
||||
{
|
||||
int i, length;
|
||||
@ -454,7 +428,7 @@ static void sumData(pNXDS source, pNXDS target, int sourceDim[],
|
||||
/*-----------------------------------------------------------------------*/
|
||||
pNXDS sumNXDataset(pNXDS source, int dimNo, int start, int end)
|
||||
{
|
||||
int newDim[NX_MAXRANK], targetDim[NX_MAXRANK], sourceDim[NX_MAXRANK];
|
||||
int64_t newDim[NX_MAXRANK], targetDim[NX_MAXRANK], sourceDim[NX_MAXRANK];
|
||||
pNXDS result = NULL;
|
||||
int i, count;
|
||||
|
||||
@ -480,3 +454,5 @@ pNXDS sumNXDataset(pNXDS source, int dimNo, int start, int end)
|
||||
sumData(source, result, sourceDim, targetDim, 0, dimNo, start, end, 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user