linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix to AMOR s2t, wrong reading corrected

Browse Source 
- Some problems at TASP with polarisation resolved
This commit is contained in:
cvs
2002-08-23 11:35:56 +00:00
parent 85f7fc212e
commit dfc8c8e28c
19 changed files with 237 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
amor2t.c
View File

@@ -475,32 +475,21 @@
{
float fVal, fMOM, fResult;
int iRet;
pIDrivable pDriv = NULL;
pAmor2T self = (pAmor2T) pData;
assert(self);
/* get COM */
pDriv = self->aEngine[MOTCOM]->pDescriptor->GetInterface(
self->aEngine[MOTCOM],DRIVEID);
if(pDriv)
iRet = MotorGetSoftPosition(self->aEngine[MOTCOM], pCon, &fVal);
if(!iRet)
{
fVal = pDriv->GetValue(self->aEngine[MOTCOM],pCon);
if(fVal < -9000)
{
return fVal;
}
return -9999.99;
}
/* get MOM */
pDriv = self->aEngine[MOTCOM]->pDescriptor->GetInterface(
self->aEngine[MOTMOM],DRIVEID);
if(pDriv)
iRet = MotorGetSoftPosition(self->aEngine[MOTMOM], pCon, &fMOM);
if(!iRet)
{
fMOM = pDriv->GetValue(self->aEngine[MOTMOM],pCon);
if(fMOM < -9000)
{
return fMOM;
}
return -9999.99;
}
/* retrocalculate 2 theta */
@@ -512,21 +501,15 @@
{
float fVal, fMOM, fResult;
int iRet;
pIDrivable pDriv = NULL;
pAmor2T self = (pAmor2T) pData;
assert(self);
/* get AOM */
pDriv = self->aEngine[MOTAOM]->pDescriptor->GetInterface(
self->aEngine[MOTAOM],DRIVEID);
if(pDriv)
iRet = MotorGetSoftPosition(self->aEngine[MOTAOM], pCon, &fVal);
if(!iRet)
{
fVal = pDriv->GetValue(self->aEngine[MOTAOM],pCon);
if(fVal < -9000)
{
return fVal;
}
return -9999.99;
}
return 2. * fVal;