- Modified collective drive operations to run motors in individual tasks
- Added a processnode methos to scriptcontext. processnode waits for the scriptchain of a node to finish. - Fixed a bug in sicsget - Made histmemsec dim and rank manager privilege. To allow chnage at runtime. Is required for SANS - Fixed some issues with multicountersec, mostly relating to passing things through in a sensible way. - Updated motorsec.c to work with a client based driver SKIPPED: psi/polterwrite.c psi/tabledrive.c psi/tabledrive.h
This commit is contained in:
@ -254,8 +254,9 @@ static int SumCmd(pSICSOBJ ccmd, SConnection * pCon,
|
||||
lSum = sumWindow(dataNode->value.v.intArray, xstart,xend,dimNode->value.v.intArray[0],
|
||||
ystart, yend, dimNode->value.v.intArray[1]);
|
||||
SCPrintf(pCon,eValue,"%s.sum = %ld", ccmd->objectNode->name, lSum);
|
||||
break;
|
||||
default:
|
||||
SCPrintf(pCon,eError, "ERROR: summing not supported for %s dimensional data",
|
||||
SCPrintf(pCon, eError, "ERROR: summing not supported for %d dimensional data",
|
||||
dimNode->value.arrayLength);
|
||||
return 0;
|
||||
}
|
||||
@ -344,13 +345,13 @@ int MakeSecHM(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
DeleteHipadabaNode(child,pCon);
|
||||
}
|
||||
|
||||
child = MakeSICSHdbPar("rank", usInternal, MakeHdbInt(rank));
|
||||
child = MakeSICSHdbPar("rank", usMugger, MakeHdbInt(rank));
|
||||
if (child == NULL) {
|
||||
return 0;
|
||||
}
|
||||
AddHipadabaChild(node, child, NULL);
|
||||
|
||||
child = MakeSICSHdbPar("dim", usMugger, makeHdbValue(HIPINTAR,rank));
|
||||
child = MakeSICSHdbPar("dim", usMugger, makeHdbValue(HIPINTVARAR,rank));
|
||||
if (child == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user