- Introduced a command history log for statistical and
syntax checking input purposes - Rectified an error message in fourmess.c - HMcontrol did not check for the HM to stop before returning. This caused weird data files at AMOR as the data had not yet been downloaded from the HM. - Fixed an issue about parameters in multicounter - Temporary fix in nxscript.c to always read the Hm from the HM and not a buffer. This is prior to rethinking caching strategies for old style HM's. - Synchronize now copies fixed motors correctly. This used to cause irritation with users. This now requires a script syncdrive to exist in the sync server which takes care of handling the fixed flag when this is desired. - Added initify to sicsdata in order to copy large value timebins over properly at AMOR SKIPPED: psi/amorstat.c psi/make_gen psi/makefile_linux psi/polterwrite.c psi/sinq.c psi/sinqhttp.c psi/sinqhttpprot.c psi/sps.c psi/tdchm.c
This commit is contained in:
@ -314,7 +314,11 @@ static int MultiCounterSet(struct __COUNTER *pCount, char *name,
|
||||
pDum = (pDummy)self->slaveData[i];
|
||||
if(strcmp(pDum->pDescriptor->name, "SingleCounter") == 0){
|
||||
pCter = (pCounter)self->slaveData[i];
|
||||
return pCter->pDriv->Set(pCter->pDriv, name, iCter, fVal);
|
||||
if(pCter->pDriv != NULL){
|
||||
return pCter->pDriv->Set(pCter->pDriv, name, iCter, fVal);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
@ -327,6 +331,8 @@ static int MultiCounterGet(struct __COUNTER *pCount, char *name,
|
||||
int i;
|
||||
pMultiCounter self = NULL;
|
||||
pCounter pCter;
|
||||
pHdb node;
|
||||
hdbValue v;
|
||||
|
||||
self = (pMultiCounter) pCount->pData;
|
||||
assert(self);
|
||||
@ -335,7 +341,11 @@ static int MultiCounterGet(struct __COUNTER *pCount, char *name,
|
||||
pDum = (pDummy)self->slaveData[i];
|
||||
if(strcmp(pDum->pDescriptor->name, "SingleCounter") == 0){
|
||||
pCter = (pCounter)self->slaveData[i];
|
||||
return pCter->pDriv->Get(pCter->pDriv, name, iCter, fVal);
|
||||
if(pCter->pDriv != NULL){
|
||||
return pCter->pDriv->Get(pCter->pDriv, name, iCter, fVal);
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user