- 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:
cvs
2003-05-23 15:06:47 +00:00
parent 3231e3e630
commit f3853c20f0
28 changed files with 422 additions and 98 deletions

16
tdchm.c
View File

@@ -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;
}