- Reworked the connection object and the IO system

- Reworked the support for TRICS
- Added a second generation motor
This commit is contained in:
koennecke
2009-02-03 08:05:39 +00:00
parent f6d595665e
commit 361ee9ebea
119 changed files with 16455 additions and 3674 deletions

View File

@@ -356,28 +356,28 @@ end:
/* print known parameters */
iLen = ObParLength(self->pParams);
sprintf(pBueffel,"Parameter Listing for %s\n",self->name);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eValue);
for(i = 0; i < iLen; i++)
{
sprintf(pBueffel,"%s.%s = %f\n",self->name,
self->pParams[i].name,self->pParams[i].fVal);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eValue);
}
/* print motornames as well */
sprintf(pBueffel,"%s.ThetaMotor = %s\n",self->name,self->pTheta->name);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eValue);
sprintf(pBueffel,"%s.TwoThetaMotor = %s\n",self->name,self->pTwoTheta->name);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eValue);
if(self->pBend1)
{
sprintf(pBueffel,"%s.VerticalBenderMotor = %s\n",self->name,self->pBend1->name);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eValue);
}
if(self->pBend2)
{
sprintf(pBueffel,"%s.HorizontalBenderMotor = %s\n",self->name,self->pBend2->name);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eValue);
}
}
/*-----------------------------------------------------------------------------
@@ -790,7 +790,7 @@ end:
{
sprintf(pBueffel,"WARNING: monochromator %s out of sync by %f\n",
self->name,fVal);
SCWrite(pCon,pBueffel,eStatus);
SCWrite(pCon,pBueffel,eWarning);
}
/* calculate wavelength from angles */