- Fixes for FOCUS 2D
- Mapped fileeval to exe manager - Updates for TRICS file formats
This commit is contained in:
53
tasscan.c
53
tasscan.c
@ -151,6 +151,8 @@ static int TASHeader(pScanData self)
|
||||
pDummy pDum= NULL;
|
||||
pIDrivable pDrive = NULL;
|
||||
pEVControl pTem = NULL;
|
||||
pSicsVariable sVar = NULL;
|
||||
float f1, f2, f3, f4;
|
||||
|
||||
assert(self);
|
||||
assert(pTAS);
|
||||
@ -285,6 +287,57 @@ static int TASHeader(pScanData self)
|
||||
pTAS->tasPar[BX]->fVal,
|
||||
pTAS->tasPar[BY]->fVal,
|
||||
pTAS->tasPar[BZ]->fVal);
|
||||
|
||||
/*
|
||||
* write mupad stuff if available
|
||||
*/
|
||||
sVar = FindCommandData(pServ->pSics,"w1","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f1 = sVar->fVal;
|
||||
sVar = FindCommandData(pServ->pSics,"w2","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f2 = sVar->fVal;
|
||||
}
|
||||
sVar = FindCommandData(pServ->pSics,"w3","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f3 = sVar->fVal;
|
||||
}
|
||||
sVar = FindCommandData(pServ->pSics,"w4","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f4 = sVar->fVal;
|
||||
}
|
||||
fprintf(self->fd,"PARAM: W1=%8.4f, W2=%8.4f, W3=%8.4f, W4=%8.4f\n",
|
||||
f1, f2, f3, f4);
|
||||
|
||||
sVar = FindCommandData(pServ->pSics,"p1","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f1 = sVar->fVal;
|
||||
}
|
||||
sVar = FindCommandData(pServ->pSics,"p2","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f2 = sVar->fVal;
|
||||
}
|
||||
sVar = FindCommandData(pServ->pSics,"p3","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f3 = sVar->fVal;
|
||||
}
|
||||
sVar = FindCommandData(pServ->pSics,"p4","SicsVariable");
|
||||
if(sVar != NULL)
|
||||
{
|
||||
f4 = sVar->fVal;
|
||||
}
|
||||
fprintf(self->fd,"PARAM: P1=%8.4f, P2=%8.4f, P3=%8.4f, P4=%8.4f\n",
|
||||
f1, f2, f3, f4);
|
||||
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
write currents if in polarisation mode
|
||||
|
Reference in New Issue
Block a user