- Introduced a command history log for statistical and

syntax checking input purposes
- Rectified an error message in fourmess.c
- HMcontrol did not check for the HM to stop before returning. This
  caused weird data files at AMOR as the data had not yet been downloaded
  from the HM.
- Fixed an issue about parameters in multicounter
- Temporary fix in nxscript.c to always read the Hm from the HM and not
  a buffer. This is prior to rethinking caching strategies for old style
  HM's.
- Synchronize now copies fixed motors correctly. This used to cause
  irritation with users. This now requires a script syncdrive to exist
  in the sync server which takes care of handling the fixed flag when
  this is desired.
- Added initify to sicsdata in order to copy large value timebins over
  properly at AMOR


SKIPPED:
	psi/amorstat.c
	psi/make_gen
	psi/makefile_linux
	psi/polterwrite.c
	psi/sinq.c
	psi/sinqhttp.c
	psi/sinqhttpprot.c
	psi/sps.c
	psi/tdchm.c
This commit is contained in:
koennecke
2010-06-01 10:01:00 +00:00
parent eaf96b1893
commit 1ae7c0c2e2
19 changed files with 239 additions and 40 deletions

View File

@ -258,6 +258,7 @@ static int CheckCountStatus(void *pData, SConnection * pCon)
notification on finish
*/
if (eCt == HWIdle) {
self->isUpToDate = 0;
InvokeCallBack(self->pCall, COUNTEND, NULL);
ReleaseCountLock(self->pCountInt);
}
@ -770,7 +771,7 @@ int CountAction(SConnection * pCon, SicsInterp * pSics, void *pData,
int argc, char *argv[])
{
pCounter self = NULL;
int iRet, iRet2;
int iRet, iRet2, i;
FuPaResult PaRes;
char pBueffel[256], pError[80];
char **argx;
@ -929,9 +930,13 @@ int CountAction(SConnection * pCon, SicsInterp * pSics, void *pData,
case 11: /* status */
self->pCountInt->TransferData(self, pCon);
if (GetCounterMode(self) == ePreset) {
lVal = GetCounterPreset(self);
for(i = 0; i < self->iExponent; i++){
lVal *= 10;
}
sprintf(pBueffel, "%s.CountStatus = %d %d Beam: %ld E6",
argv[0],
(int) nintf(GetCounterPreset(self)),
(int) nintf(lVal),
(int) nintf(GetControlValue(self)),
GetMonitor(self, 4, pCon) / 100000);
} else {