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

- Major changes folling the rework of the connection object

Browse Source 
- Added support for galil controllers
This commit is contained in:
koennecke
2009-02-03 08:07:30 +00:00
parent 9374bea841
commit 6c7bb14fad
29 changed files with 364 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tasscan.c
View File

@ -163,7 +163,7 @@ static int TASHeader(pScanData self)
self->fd = fopen(self->pFile,"w");
if(!self->fd)
{
SCWrite(self->pCon,"ERROR: cannot write data file",eError);
SCWrite(self->pCon,"ERROR: cannot write data file",eLogError);
return 0;
}
@ -184,7 +184,7 @@ static int TASHeader(pScanData self)
}
else
{
SCWrite(self->pCon,"WARNING: failed to decode file number",eWarning);
SCWrite(self->pCon,"WARNING: failed to decode file number",eLog);
}
/* the bizarre R, A, V header */
@ -493,7 +493,7 @@ static int TASHeader(pScanData self)
/*
write header to screen as well
*/
SCWrite(self->pCon,pHeader,eWarning);
SCWrite(self->pCon,pHeader,eLog);
/*
close the file, we will reopen later with append for the data
@ -530,7 +530,7 @@ static int TASScanPoint(pScanData self, int iPoint)
self->fd = fopen(self->pFile,"a");
if(!self->fd)
{
SCWrite(self->pCon,"ERROR: cannot append to data file",eError);
SCWrite(self->pCon,"ERROR: cannot append to data file",eLogError);
return 0;
}
@ -598,7 +598,7 @@ static int TASScanPoint(pScanData self, int iPoint)
if(fVal < -990.){
sprintf(pError,"WARNING: problem reading %s",
tasMotorOrder[pTAS->addOutput[i]]);
SCWrite(self->pCon, pError,eWarning);
SCWrite(self->pCon, pError,eLog);
}
}
else
@ -613,7 +613,7 @@ static int TASScanPoint(pScanData self, int iPoint)
write both to file and onto screen
*/
fprintf(self->fd,"%s\n",pBueffel);
SCWrite(self->pCon,pBueffel,eWarning);
SCWrite(self->pCon,pBueffel,eLog);
/*
close the file
@ -759,7 +759,7 @@ static int RunPolScan(pScanData self, int iPoint)
fd = fopen(pTAS->tasPar[POLFIL]->text,"r");
if(!fd){
SCWrite(self->pCon,"ERROR: failed to open polarisation analysis file",
eError);
eLogError);
return 0;
}
pTAS->iPOL = 0;
@ -815,12 +815,12 @@ static int TASScanCount(pScanData self, int iPoint)
iRet = Wait4Success(GetExecutor());
if(iRet == DEVINT)
{
SCWrite(self->pCon,"Counting aborted due to Interrupt",eStatus);
SCWrite(self->pCon,"Counting aborted due to Interrupt",eLog);
status = 0;
}
else if(iRet == DEVERROR)
{
SCWrite(self->pCon,"Counting finished with Problems",eStatus);
SCWrite(self->pCon,"Counting finished with Problems",eLog);
status = 0;
}
else