- Fixed bug with ECB not stopping when no beam
- Fixed synchronisation issues - Fixed hsitogram memory writing from nxscript - Started module for writing SICS interfaces in Tcl - Fixed a bug in scan, which allowed to corrupt files - Fixed memory problems in napi5
This commit is contained in:
39
histmem.c
39
histmem.c
@ -679,6 +679,12 @@
|
||||
assert(self);
|
||||
return self->pDriv->GetMonitor(self->pDriv,i,pCon);
|
||||
}
|
||||
/*-----------------------------------------------------------------------*/
|
||||
void HistDirty(pHistMem self)
|
||||
{
|
||||
assert(self);
|
||||
updateHMData(self->pDriv->data);
|
||||
}
|
||||
/*-------------------------------------------------------------------------*/
|
||||
const float *GetHistTimeBin(pHistMem self, int *iLength)
|
||||
{
|
||||
@ -711,15 +717,6 @@
|
||||
return StartDevice(GetExecutor(),"HistogramMemory", self->pDes, self,
|
||||
pCon, self->pDriv->fCountPreset);
|
||||
}
|
||||
/*-------------------------------------------------------------------------*/
|
||||
int HistDoEnd(pHistMem self, SConnection *pCon)
|
||||
{
|
||||
assert(self);
|
||||
assert(self->pCall);
|
||||
|
||||
/* send a COUNTEND event */
|
||||
InvokeCallBack(self->pCall,COUNTEND,NULL);
|
||||
}
|
||||
/*-----------------------------------------------------------------------*/
|
||||
int HistBlockCount(pHistMem self, SConnection *pCon)
|
||||
{
|
||||
@ -1180,30 +1177,6 @@ static int checkHMEnd(pHistMem self, char *text){
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
/* COUNTEND signal*/
|
||||
else if(strcmp(argv[1],"countend") == 0)
|
||||
{
|
||||
if(SCMatchRights(pCon,self->iAccess))
|
||||
{
|
||||
if(IsCounting(pServ->pExecutor))
|
||||
{
|
||||
SCWrite(pCon,"WARNING: HM is counting!",eWarning);
|
||||
return 1;
|
||||
}
|
||||
iRet = HistDoEnd(self,pCon);
|
||||
if(iRet == 1)
|
||||
{
|
||||
SCSendOK(pCon);
|
||||
}
|
||||
return iRet;
|
||||
}
|
||||
else
|
||||
{
|
||||
SCWrite(pCon,
|
||||
"ERROR: you are not privileged for attempted operation",eError);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
/* forced count, for the case several hm need to be started */
|
||||
else if(strcmp(argv[1],"countf") == 0)
|
||||
|
Reference in New Issue
Block a user