- Fixed a bug fix with Fixed motor in TAS code

- Made AMOR write HDF-5 data in chunks
- Added  driver for a PSI-DSP magnet controller as used at SLS
- Added code for directly accessing RS232 controllers connected to a
  terminal server, thereby bypassing the SerPortServer
- A rounding problem in the PSD histogram memory was resolved.
This commit is contained in:
cvs
2001-10-25 13:57:59 +00:00
parent 22688ac0fc
commit 3c916c9a7d
32 changed files with 2247 additions and 758 deletions

View File

@@ -137,17 +137,20 @@
pCom = FindCommand(pSics,pcCounter);
if(!pCom)
{
PrintHMError("EL737 counter for histogram memory not found",
PrintHMError("WARNING: no EL737 counter for HM found! ",
pCon);
return 0;
pInternal->pCounter = NULL;
}
pInternal->pCounter = (pCounter)pCom->pData;
if(!pInternal->pCounter->pDes->GetInterface(pInternal->pCounter,
COUNTID))
{
PrintHMError("EL737 counter for histogram memory is invalid",
pCon);
return 0;
else
{
pInternal->pCounter = (pCounter)pCom->pData;
if(!pInternal->pCounter->pDes->GetInterface(pInternal->pCounter,
COUNTID))
{
PrintHMError("EL737 counter for histogram memory is invalid",
pCon);
return 0;
}
}
}
/* ok! put in HM */
@@ -336,9 +339,12 @@
}
/* tell the counter box our current status */
SetCounterMode(pInternal->pCounter,self->eCount);
SetCounterPreset(pInternal->pCounter,self->fCountPreset);
if(pInternal->pCounter != NULL)
{
SetCounterMode(pInternal->pCounter,self->eCount);
SetCounterPreset(pInternal->pCounter,self->fCountPreset);
}
self->iReconfig = 0;
return 1;
}