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

- CONST Woes

Browse Source
This commit is contained in:
koennecke
2007-02-23 14:32:26 +00:00
parent 6c6da3f11f
commit 82fcf26008
5 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tasscan.c
View File

@ -570,27 +570,19 @@ static int TASScanPoint(pScanData self, int iPoint)
if(pVar)
{
if(isTASMotor(ScanVarName(pVar)) >= 0)
{
pMot = FindMotor(self->pSics,ScanVarName(pVar));
if(pMot)
{
status = MotorGetSoftPosition(pMot,self->pCon,&fVal);
if(!status)
{
fVal = -9999.77;
}
}
else
{
if(pVar->pInter != NULL)
{
fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
}
}
if(pVar->pInter != NULL)
{
fVal = pVar->pInter->GetValue(pVar->pObject,self->pCon);
}
else
{
fVal = -9999.99;
}
}
else if((iPtr = isTASVar(pVar->Name)) >= 0 )
{
fVal = pTAS->tasPar[iPtr]->fVal;
{
fVal = pTAS->tasPar[iPtr]->fVal;
}
}
sprintf(pWork,"%9.4f ", fVal);
@ -880,16 +872,12 @@ static int TASScanCount(pScanData self, int iPoint)
if(pVar)
{
if( (iPtr = isTASEnergy(pVar->Name)) >= 0)
{
fVal = pTAS->tasPar[EI+iPtr]->fVal;
{
fVal = pTAS->tasPar[EI+iPtr]->fVal;
}
else
{
pMot = FindMotor(self->pSics,pVar->Name);
if(pMot)
{
MotorGetSoftPosition(pMot,self->pCon,&fVal);
}
{
fVal = readDrivable(pVar->Name,self->pCon);
}
AppendScanVar(pVar,fVal);
}