- Added log instrumentation to devexe

- Added a hill climbing option to optimise
- Added hrpt files
This commit is contained in:
koennecke
2006-07-13 07:24:53 +00:00
parent dbc6be71ec
commit 4b91d841d6
3 changed files with 6 additions and 2 deletions

BIN
libpsi.a

Binary file not shown.

View File

@ -450,7 +450,7 @@ pCon);
self->data->iDim[0], self->data->iDim[0],
xOff, xOff,
xFac, xFac,
self->data->iDim[1], self->data->iDim[1] + pInternal->extraDetector,
yOff, yOff,
yFac, yFac,
pInternal->iBinWidth, pInternal->iBinWidth,

View File

@ -40,7 +40,7 @@ static int TableDriveHalt(void *pData){
if(moti.pMot != NULL){ if(moti.pMot != NULL){
moti.pMot->pDrivInt->Halt(moti.pMot); moti.pMot->pDrivInt->Halt(moti.pMot);
} }
status == LLDnodePtr2Next(self->motorTable); status = LLDnodePtr2Next(self->motorTable);
} }
self->state = OUTOFSYNC; self->state = OUTOFSYNC;
return 1; return 1;
@ -383,6 +383,10 @@ static int TableDriveCheckStatus(void *pData, SConnection *pCon){
return status; return status;
} }
break; break;
case OUTOFSYNC:
SCWrite(pCon,"WARNING: tabledrive out of sync",eWarning);
return HWFault;
break;
default: default:
SCWrite(pCon, SCWrite(pCon,
"ERROR: programming error in tabledrive, invalid state", "ERROR: programming error in tabledrive, invalid state",