- Removed old code
- Extended tasker to support task groups - Added task functions for motors and counters - Modifed devexec to use the new task functions - Modified TAS to treat the monochromator separatly - Coded a EIGER monochromator module to reflect even more new requirements - Added EPICS counters and motors - Modified multicounter to be better performing SKIPPED: psi/eigermono.c psi/make_gen psi/makefile_linux psi/psi.c psi/sinqhttp.c
This commit is contained in:
27
histmem.c
27
histmem.c
@ -208,8 +208,8 @@ static int HistStartCount(void *pData, SConnection * pCon)
|
||||
iRet = self->pDriv->Start(self->pDriv, pCon);
|
||||
if (iRet == OKOK) {
|
||||
/* send a COUNTSTART event */
|
||||
clearHMData(self->pDriv->data);
|
||||
InvokeCallBack(self->pCall, COUNTSTART, pCon);
|
||||
updateHMData(self->pDriv->data);
|
||||
return iRet;
|
||||
} else {
|
||||
iRet = self->pDriv->GetError(self->pDriv, &iErr, pError, 79);
|
||||
@ -350,9 +350,9 @@ static int HistCountStatus(void *pData, SConnection * pCon)
|
||||
return HWBusy;
|
||||
}
|
||||
}
|
||||
if (eCt == HWBusy){
|
||||
updateHMData(self->pDriv->data);
|
||||
}
|
||||
/* if (eCt == HWBusy){ */
|
||||
/* updateHMData(self->pDriv->data); */
|
||||
/* } */
|
||||
|
||||
if (eCt == HWIdle) {
|
||||
/* force an update of local histogram data with next
|
||||
@ -879,7 +879,7 @@ int GetHistogram(pHistMem self, SConnection * pCon,
|
||||
eWarning);
|
||||
iEnd = (iDataLen / sizeof(HistInt)) - 1;
|
||||
}
|
||||
return getHMDataHistogram(self, pCon, i, iStart, iEnd, lData);
|
||||
return getHMDataHistogram(self, pCon, i, iStart, iEnd-iStart, lData);
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
@ -1335,6 +1335,22 @@ int HistAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} else if (strcmp(argv[1], "clearhm") == 0) {
|
||||
/*
|
||||
clear the local copy of the HM. Assumes that the HM
|
||||
clears itself on start. Which it does.
|
||||
*/
|
||||
if (SCMatchRights(pCon, usUser)) {
|
||||
if(self->pDriv->data != NULL){
|
||||
clearHMData(self->pDriv->data);
|
||||
SCSendOK(pCon);
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} else if (strcmp(argv[1], "list") == 0) {
|
||||
HMListOption(self, pCon);
|
||||
return 1;
|
||||
@ -1798,4 +1814,5 @@ int HistAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
SCWrite(pCon, pBueffel, eError);
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user