- Improvements to the chooper driver for the SANS2 chopper

- Fixes to the new counter and motor drivers
- Updated Linux makefiles to linux_def


SKIPPED:
	psi/dornier2.c
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/makefile_linux
	psi/psi.c
	psi/hardsup/makefile_linux
	psi/tecs/makefile_linux
This commit is contained in:
cvs
2003-07-14 11:56:54 +00:00
parent f7abbe6aa5
commit 3ddb19d8a9
12 changed files with 42 additions and 29 deletions

View File

@ -102,17 +102,21 @@
GetScanVarName(self->pScan,0,self->pName,131);
/* correct fAxis for softzero points and sign
when the scan variable is a motor */
pMot = FindMotor(pServ->pSics,self->pName);
if(pMot)
when the scan variable is a motor
*/
if(!isScanVarSoft(self->pScan))
{
i = MotorGetPar(pMot,"softzero",&fZero);
i = MotorGetPar(pMot,"sign",&fSign);
assert(i);
for(i = 0; i < self->iNP; i++)
pMot = FindMotor(pServ->pSics,self->pName);
if(pMot)
{
self->fAxis[i] -= fZero;
self->fAxis[i] *= fSign;
i = MotorGetPar(pMot,"softzero",&fZero);
i = MotorGetPar(pMot,"sign",&fSign);
assert(i);
for(i = 0; i < self->iNP; i++)
{
self->fAxis[i] -= fZero;
self->fAxis[i] *= fSign;
}
}
}