- 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
2012-03-29 08:41:05 +00:00
parent 14f257c2ab
commit 9eca96b064
56 changed files with 8881 additions and 6327 deletions

View File

@ -563,7 +563,7 @@ static pNXDS hmDataToNXDataset(pHMdata self)
static pNXDS subSampleCommand(pNXDS source, char *command,
char *error, int errLen)
{
int startDim[NX_MAXRANK], endDim[NX_MAXRANK];
int64_t startDim[NX_MAXRANK], endDim[NX_MAXRANK];
int dim = 0, start = 0, i;
char *pPtr = NULL, token[80];
@ -590,12 +590,12 @@ static pNXDS subSampleCommand(pNXDS source, char *command,
if (startDim[i] < 0 || startDim[i] >= source->dim[i]) {
snprintf(error, errLen,
"ERROR: invalid start value %d for dimension %d",
startDim[1], i);
(int)startDim[1], i);
return NULL;
}
if (endDim[i] < startDim[i] || endDim[i] >= source->dim[i]) {
snprintf(error, errLen,
"ERROR: invalid end value %d for dimension %d", endDim[1],
"ERROR: invalid end value %d for dimension %d", (int)endDim[1],
i);
return NULL;
}