- 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
This commit is contained in:
koennecke
2012-03-29 08:41:06 +00:00
parent b50f0bca13
commit fc94ead280
5 changed files with 20 additions and 6 deletions

View File

@ -24,7 +24,7 @@ static int checkPoint(pNXDS target, double x, double y)
}
/*--------------------------------------------------------------------------*/
static void addNXDatasetValue(pNXDS target, int iPos[], double value)
static void addNXDatasetValue(pNXDS target, int64_t iPos[], double value)
{
double val;
@ -35,7 +35,7 @@ static void addNXDatasetValue(pNXDS target, int iPos[], double value)
/*---------------------------------------------------------------------------*/
static void roundPoint(pNXDS target, double x, double y, double value)
{
int iDim[2];
int64_t iDim[2];
iDim[0] = (int) floor(x + .5);
iDim[1] = (int) floor(y + 0.5);
@ -63,7 +63,7 @@ static double dist(double x1, double y1, double x2, double y2)
static void distribute(pNXDS target, double x, double y, double value)
{
double lldist, lrdist, uldist, urdist, totalDist, ix, iy, frac;
int iPos[2];
int64_t iPos[2];
ix = floor(x);
iy = floor(y);