- 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:
@@ -98,6 +98,18 @@ static void doCountCommand(pHdb self, SConnection *pCon, int command)
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
static void copyExponent(pHdb self, void *data)
|
||||
{
|
||||
pHdb source = NULL, target = NULL;
|
||||
|
||||
pCounter count = (pCounter)data;
|
||||
source = GetHipadabaNode(self,"exponent");
|
||||
target = GetHipadabaNode(count->pDes->parNode,"exponent");
|
||||
if(source != NULL && target != NULL){
|
||||
UpdateHipadabaPar(target,MakeHdbInt(source->value.v.intValue), NULL);
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------------*/
|
||||
static void startMultiCounting(pHdb self, SConnection *pCon)
|
||||
{
|
||||
pHdb mode = NULL, preset = NULL, master = NULL, slaves = NULL;
|
||||
@@ -138,6 +150,7 @@ static void startMultiCounting(pHdb self, SConnection *pCon)
|
||||
if(data != NULL){
|
||||
pCount = GetCountableInterface(data);
|
||||
if(pCount != NULL){
|
||||
copyExponent(self,data);
|
||||
pCount->SetCountParameters(data,preset->value.v.doubleValue,
|
||||
eMode);
|
||||
masterID = StartCountTask(data,pCon,name);
|
||||
@@ -163,6 +176,7 @@ static void startMultiCounting(pHdb self, SConnection *pCon)
|
||||
if(data != NULL){
|
||||
pCount = GetCountableInterface(data);
|
||||
if(pCount != NULL){
|
||||
copyExponent(self,data);
|
||||
pCount->SetCountParameters(data,preset->value.v.doubleValue,
|
||||
eMode);
|
||||
masterID = StartCountTask(data,pCon,master->value.v.text);
|
||||
|
||||
Reference in New Issue
Block a user