- 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:
20
sicsdata.c
20
sicsdata.c
@ -868,6 +868,23 @@ static int copyNode(pSICSData self, int argc, char *argv[],
|
||||
return 1;
|
||||
}
|
||||
/*--------------------------------------------------------------------*/
|
||||
static int intify(pSICSData self, int argc, char *argv[],
|
||||
SConnection * pCon, SicsInterp * pSics)
|
||||
{
|
||||
int i;
|
||||
float fval;
|
||||
|
||||
for(i = 0; i < self->dataUsed; i++){
|
||||
if(self->dataType[i] == FLOATTYPE){
|
||||
memcpy(&fval,self->data+i,sizeof(float));
|
||||
self->data[i] = (int)fval;
|
||||
self->dataType[i] = INTTYPE;
|
||||
}
|
||||
}
|
||||
SCSendOK(pCon);
|
||||
return 1;
|
||||
}
|
||||
/*--------------------------------------------------------------------*/
|
||||
static int copyToNode(pSICSData self, int argc, char *argv[],
|
||||
SConnection * pCon, SicsInterp * pSics)
|
||||
{
|
||||
@ -1051,6 +1068,9 @@ int SICSDataAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
} else if (strcmp(argv[1], "copytonode") == 0) {
|
||||
/*--------- copyTonode */
|
||||
return copyToNode(self, argc - 2, &argv[2], pCon, pSics);
|
||||
} else if (strcmp(argv[1], "intify") == 0) {
|
||||
/*--------- copyTonode */
|
||||
return intify(self, argc - 2, &argv[2], pCon, pSics);
|
||||
} else if (strcmp(argv[1], "writezipped") == 0) {
|
||||
/*--------- writezipped */
|
||||
if (argc < 3) {
|
||||
|
Reference in New Issue
Block a user