- Removed SCStart/EndBuffering as far as possible and fixed an issue with
the capture command in that it not put resluts into the Tcl interpreter. This broke scriptcontext scripts in complicated situations. - Resolved some issues with the TAS calculation and negative scattering sense. - Fixed a bug which did not reset the state to idle after checking reachability in confvirtualmot.c SKIPPED: psi/autowin.c psi/eigera2.c psi/jvlprot.c psi/makefile_linux psi/sinqhttpopt.c psi/tasscan.c
This commit is contained in:
24
scan.c
24
scan.c
@ -507,7 +507,8 @@ CountEntry CollectCounterData(pScanData self)
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int ScanLoop(pScanData self)
|
||||
{
|
||||
int i, iInt, iRet, iStatus;
|
||||
int i, iInt, iRet, iStatus, iHeaderWritten = 0;
|
||||
|
||||
|
||||
assert(self);
|
||||
assert(self->pCon);
|
||||
@ -548,6 +549,18 @@ static int ScanLoop(pScanData self)
|
||||
continue;
|
||||
}
|
||||
|
||||
if(iHeaderWritten == 0) {
|
||||
iRet = self->WriteHeader(self);
|
||||
iHeaderWritten++;
|
||||
if (!iRet) {
|
||||
SCWrite(self->pCon, "ERROR: cannot open data file, Scan aborted",
|
||||
eError);
|
||||
self->pCon = NULL;
|
||||
self->pSics = NULL;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/*-------------- count */
|
||||
iRet = self->ScanCount(self, i);
|
||||
/* finished, check for interrupts. Whatever happened, user
|
||||
@ -648,15 +661,6 @@ int DoScan(pScanData self, int iNP, int iMode, float fPreset,
|
||||
}
|
||||
|
||||
|
||||
iRet = self->WriteHeader(self);
|
||||
if (!iRet) {
|
||||
SCWrite(self->pCon, "ERROR: cannot open data file, Scan aborted",
|
||||
eError);
|
||||
self->pCon = NULL;
|
||||
self->pSics = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
self->iActive = 1;
|
||||
iRet = ScanLoop(self);
|
||||
ScriptScanFinish(self);
|
||||
|
Reference in New Issue
Block a user