- 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

@ -145,6 +145,27 @@ static int HMCtrTransferData(void *pData, SConnection *pCon)
ReleaseHdbValue(&v);
return status;
}
/*-------------------------------------------------------------------------
* automatically update the last entry of the dim variable when
* setting time_binning
--------------------------------------------------------------------------*/
static hdbCallbackReturn HMTOFCallback(pHdb currentNode, void *data,
pHdbMessage message)
{
pHdbDataMessage update = NULL;
hdbValue dim;
pHdb dimNode = NULL;
if((update = GetHdbUpdateMessage(message)) != NULL){
dimNode = GetHipadabaNode(currentNode->mama,"dim");
assert(dimNode != NULL);
GetHipadabaPar(dimNode,&dim,NULL);
dim.v.intArray[dim.arrayLength-1] = update->v->arrayLength;
UpdateHipadabaPar(dimNode, dim, NULL);
}
return hdbContinue;
}
/*--------------------------------------------------------------------------
* Usage:
* MakeSecHM name rank (tof)
@ -164,7 +185,7 @@ int MakeSecHM(SConnection * pCon, SicsInterp * pSics, void *pData,
rank = atoi(argv[2]);
pRes = CreateSecCounter(pCon,"HistMem", argv[1], 2);
pRes = CreateSecCounter(pCon,"HistMemSec", argv[1], 2);
if(pRes == NULL){
return 0;
}
@ -217,6 +238,9 @@ int MakeSecHM(SConnection * pCon, SicsInterp * pSics, void *pData,
return 0;
}
AddHipadabaChild(node, child, NULL);
AppendHipadabaCallback(child,
MakeHipadabaCallback(HMTOFCallback, NULL, NULL));
child = AddSICSHdbPar(node,"genbin", usMugger, MakeSICSFunc(GenbinCmd));
AddSICSHdbPar(child, "start", usMugger, MakeHdbFloat(10.));
AddSICSHdbPar(child, "step", usMugger, MakeHdbFloat(10.));