- 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:
koennecke
2012-10-29 12:56:29 +00:00
parent d798373fdf
commit 4f560552c4
27 changed files with 599 additions and 129 deletions

View File

@ -266,11 +266,12 @@ static int TASUBHeader(pScanData self)
fprintf(self->fd, "DATE_: %s\n", pWork);
fprintf(self->fd, "TITLE: %s\n", GetVarText("title"));
fprintf(self->fd, "COMND: %s\n", GetVarText("lastscancommand"));
tasUpdate(self->pCon,pTAS->ub);
fprintf(self->fd,
"POSQE: QH=%8.4f, QK=%8.4f, QL=%8.4f, EN=%8.4f, UN=MEV\n",
pTAS->ub->current.qh,
pTAS->ub->current.qk,
pTAS->ub->current.qk, getTasPar(pTAS->ub->current, EN));
pTAS->ub->current.ql, getTasPar(pTAS->ub->current, EN));
/*
build the steps line
*/
@ -662,6 +663,11 @@ static int TASUBScanDrive(pScanData self, int iPoint)
/*
loop through all the scan variables
*/
if(iPoint == 0 && pTAS->iFast != 1) {
pTAS->ub->stopFixed = 0;
} else {
pTAS->ub->stopFixed = 1;
}
for (i = 0; i < self->iScanVar; i++) {
DynarGet(self->pScanVar, i, &pPtr);
pVar = (pVarEntry) pPtr;
@ -675,6 +681,7 @@ static int TASUBScanDrive(pScanData self, int iPoint)
}
}
/*
now wait for our motors to arrive, thereby ignoring any error
returns. DO NOT WAIT if fast scan!
@ -684,6 +691,7 @@ static int TASUBScanDrive(pScanData self, int iPoint)
} else {
status = Wait4Success(GetExecutor());
pTAS->ub->silent = 0;
pTAS->ub->stopFixed = 0;
}
return 1;
}
@ -789,6 +797,7 @@ static int TASUBCollect(pScanData self, int iPoint)
/* loop over all scan variables */
status = 1;
memset(&sCount,0,sizeof(CountEntry));
pTAS->ub->silent = 0;
for (i = 0; i < self->iScanVar; i++) {