- Introduced a state filed into first generation objects
- Fixed some issues with error returns not being properly handled in devexec - Fixed a bug in motorlist which caused limit checks to fail - Fixed an issue with the TDCHM not properly updating the counter values on finish - Readded getHipadabaPar in ChainCallback as this caused a problem in ei - Made tasdrive ignore sgu, sgl when out of plane not allowed SKIPPED: psi/eigermono.c psi/sinqhttp.c psi/tdchm.c
This commit is contained in:
20
hmdata.c
20
hmdata.c
@ -58,7 +58,9 @@ void clearHMData(pHMdata self)
|
||||
if (self->tofMode) {
|
||||
size *= getNoOfTimebins(self);
|
||||
}
|
||||
memset(self->localBuffer, 0, size * sizeof(HistInt));
|
||||
if(self->localBuffer != NULL){
|
||||
memset(self->localBuffer, 0, size * sizeof(HistInt));
|
||||
}
|
||||
self->nextUpdate = time(NULL) + self->updateIntervall;
|
||||
}
|
||||
|
||||
@ -146,18 +148,10 @@ int configureHMdata(pHMdata self, pStringDict pOpt, SConnection * pCon)
|
||||
self->localBuffer = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
note: remove update request in histmem.c
|
||||
*/
|
||||
if (self->updateIntervall > 0) {
|
||||
/*
|
||||
we do buffer
|
||||
*/
|
||||
status = resizeBuffer(self);
|
||||
if (!status) {
|
||||
SCWrite(pCon, "ERROR: failed to resize buffer", eError);
|
||||
return 0;
|
||||
}
|
||||
status = resizeBuffer(self);
|
||||
if (!status) {
|
||||
SCWrite(pCon, "ERROR: failed to resize buffer", eError);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user