- Many fixes to the triple axis stuff
* update after a1-a6 drive * intrduction of targets - POLDI writing - Moved HKL calculation 4 TRICS to fourlib
This commit is contained in:
18
tasscan.c
18
tasscan.c
@@ -552,6 +552,8 @@ static int TASScanDrive(pScanData self, int iPoint)
|
||||
iTAS = 1;
|
||||
pTAS->tasPar[EI+iPtr]->fVal =
|
||||
pVar->fStart + iPoint * pVar->fStep;
|
||||
pTAS->tasPar[ETARGET+iPtr]->fVal =
|
||||
pVar->fStart + iPoint * pVar->fStep;
|
||||
tasMask[iPtr] = 1;
|
||||
}
|
||||
else
|
||||
@@ -575,14 +577,16 @@ static int TASScanDrive(pScanData self, int iPoint)
|
||||
{
|
||||
status = TASCalc(pTAS,self->pCon,tasMask,
|
||||
tasTargets, tasTargetMask);
|
||||
if(!status)
|
||||
return 0;
|
||||
TASStart(pTAS,self->pCon,
|
||||
if(status)
|
||||
{
|
||||
/*
|
||||
Errors both in calculation or in starting motors are
|
||||
ignored here on purpose. There is a slight chance that
|
||||
other points in the scan fit the bill.
|
||||
*/
|
||||
TASStart(pTAS,self->pCon,
|
||||
self->pSics,tasTargets,tasTargetMask);
|
||||
/*
|
||||
again ignore errors, the scan shall continue if an error was
|
||||
found
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user