- Fixed some serious bugs in amor2t having to do with recent extensions
- fixed velocity selector code to properly display data at list - got hkl to give proper answers when a psi value was specified and limited psi to 360 max. - fixed a minor spelling error in fitcenter messages - fixed badly working soft zeros with negative sign
This commit is contained in:
11
motor.c
11
motor.c
@ -733,7 +733,7 @@ extern void KillPiPiezo(void *pData);
|
||||
iRet = self->pDriver->GetPosition(self->pDriver,&fVal);
|
||||
if(iRet == OKOK) /* all went well, the exception */
|
||||
{
|
||||
*fHard = fVal;
|
||||
*fHard = fVal;
|
||||
return 1;
|
||||
}
|
||||
else /* a problem, the usual case: try fix the problem */
|
||||
@ -791,7 +791,14 @@ extern void KillPiPiezo(void *pData);
|
||||
}
|
||||
|
||||
/* apply zeropoint */
|
||||
fValue -= ObVal(self->ParArray,SZERO);
|
||||
if(ObVal(self->ParArray,SIGN) < 0.)
|
||||
{
|
||||
fValue += ObVal(self->ParArray,SZERO);
|
||||
}
|
||||
else
|
||||
{
|
||||
fValue -= ObVal(self->ParArray,SZERO);
|
||||
}
|
||||
*fVal = fValue;
|
||||
|
||||
/* apply sign */
|
||||
|
Reference in New Issue
Block a user