- 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:
16
tdchm.c
16
tdchm.c
@@ -258,7 +258,7 @@ static int TDCHalt(pHistDriver self){
|
||||
/*=====================================================================*/
|
||||
static int TDCCountStatus(pHistDriver self, SConnection *pCon){
|
||||
pTdc tdc = NULL;
|
||||
int status;
|
||||
int tdcstatus, status;
|
||||
float fControl;
|
||||
|
||||
assert(self);
|
||||
@@ -273,9 +273,17 @@ static int TDCCountStatus(pHistDriver self, SConnection *pCon){
|
||||
or to do some sort of progress report. So it has to have an associated
|
||||
counter in order to stop it at the end.
|
||||
*/
|
||||
if(status != HWBusy){
|
||||
status = disableTdc(tdc);
|
||||
if(status != 1){
|
||||
|
||||
/*
|
||||
This is no proper fix. The proper fix would be to keep the state
|
||||
in the private data structure as well and disbale to TDC
|
||||
on HWNoBeam and enable the TDC again if the
|
||||
beam comes on. However, this is done in hardware at SANS-II. So we
|
||||
leave it for now.
|
||||
*/
|
||||
if(status == HWIdle || status == HWFault){
|
||||
tdcstatus = disableTdc(tdc);
|
||||
if(tdcstatus != 1){
|
||||
tdc->errorCode = COMMERROR;
|
||||
return HWFault;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user