linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conman.c

Browse Source 
Reduce log noise by setting iout = eInternal for macros.

servlog.c
Fixed timestamp in logfiles to get hours.

hmm_configuration_common_1.tcl
Added ML's mods to wombat config: ie BAT and FAT TABLE attributes and elements for multi-period acquisition and histo-streaming.
Fixed "failed lsearch" bug. It's more robust to test for a non-successful lsearch instead of a failed lsearch.

nxscripts_common_1.tcl
SICS-297 Fixed Saving data series in a scratch file overwrites earlier entries.

instdict_specification.tcl
Added "scobj" kind and "sct_indexed_motor" sics object type for script context controllers and and objects.

hipadaba_configuration_common.tcl
Added sct_indexed_motor sics obj type to ::hdb::sobjadd and scobj kind to ::hdb::add_node

sct_positmotor_common.tcl
Update the index SICS variable when updating the current index value to make sure that the position is saved in the data file.
You must now provide the hdb node_name when creating the sct posit motor.
mk_sct_positmotor now sets the "param" and "long_name" attributes on the posit motor object

util/utility.tcl
Added ::utility::set_sct_indexed_motor_attributes to set SICS object attributes required for generating hdb info for an SCT_POSIT_MOTOR

nxscript.c
Merge the ansto mod to putslab (rev1.7) which adds support for saving unbuffered data from the histmem.

sicshipadaba.c
This incorporates the patch made to CommandSetCallback in rev1.10 so it can just be copied as is (ie no merge required).
WARNING: There are changes to ListHdbNode to handle record separators which may affect us.
Disabled sending hdb command start and stop messages because they break gumtree

sicshdbfactory.c
Disabled sending hdb command start and stop messages because they break gumtree

hipadaba_configuration_common.tcl R2.4DEV
The sct_posit_motor case of ::hdb::sobjadd is only needed to call add_node with kind=scobj.

nxscripts_common_1.tcl R2.4DEV
Added ::nexus::scobj::sdsinfo
_gen_nxdict now skips nodes with data_type == "none"

new util/script_context_util.tcl R2.4DEV
Adds ::scobj::hinitprops command to initialise the hdb properties for script context object nodes.

sct_positmotor_common.tcl R2.4DEV
Use ::scobj::hinitprops utility command to initialise hdb properties on script context object parameter nodes.

dynstring.c
DynStringReplace should memcopy '\0', otherwise it can get the wrong length for iTextLen.
Added DynStringReplaceWithLen to allow initialising a dynstring with char arrays which contain null chars and
other non-ascii chars.  Useful for read and write buffers in script context.

ascon.c
AsconRead return NULL for noResponse and AsconFailed otherwise the "result" node gets set with a spurious empty value.

scriptcontext.c
SctActionHandler only set  the "result" node if there really is a reply.

sicsobj.c
Update from M.K.

site_ansto.c
Added galil and ordela hvps protocol handlers for scriptcontext.

motor_dmc2280.c
Allow home parameter to be outside of limits (for KOWARI)

hardsup/makefile
Added ordela HVPS protocol handler

hardsup/sct_orhvpsprot.c
New ordela HVPS protocol handler.  Retries on NAKs and re-orders pot channels (ie toggles lower two bits).

hardsup/sct_velselprot.c
Start velocity selector protocol handler.

hardsup/sct_galilprot.c
Completed galil protocol handler.

hipadaba_configuration_common.tcl
Add new style SICS objects to hdb tree.

instdict_specification.tcl
Added scobj to kind list and sct_motor to sics object list. (and some housekeeping)

hmm_configuration_common_1.tcl
Added ratemaps to simulation.  Fixe BAT_TABLE and added PERIOD_INDICES as per Mark Lesha's mods for multi-period acquisition.
ratemaps now return float.

sct_postimotor_common.tcl
Now setting properties on the posit motor object so that it can be automatically added to the hdb tree.

hrpd/config/motors/motor_configuration.tcl
Fixed simulated msd motor so that it's handle properly in the hdb layer.

sans/config/hmm/detector_ordela.tcl
Updated the ordela calibration script to use the new sct_orhvpsprop.c script context controller.

quokka_configuration.tcl
Deleted lines which set the hdb properties for script context posit motors.  This is now handled automatically as for other SICS objects.

utility.tcl
setpos now replaces the motor setpos subcommand.
Added functions to set script context object attributes and sct_posit motor attributes.
Created hparPath and hsibPath convenience commands for new-style SICS objects.

script_context_util.tcl
NEW! Adds hinitprops function to initialise the hdb properties for a script context object

r2758 | ffr | 2008-12-12 17:53:53 +1100 (Fri, 12 Dec 2008) | 113 lines
This commit is contained in:
Ferdi Franceschini
2008-12-12 17:53:53 +11:00
committed by Douglas Clowes
parent 121aac2946
commit e36e9f1146
32 changed files with 1133 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
nxscript.c
View File

@@ -30,6 +30,7 @@
#include "nxdict.h"
#include "nxscript.h"
#include "sicsdata.h"
#include "sicshipadaba.h"
extern char *trim(char *str);
@@ -399,6 +400,92 @@ static void putAttribute(SConnection *pCon, SicsInterp *pSics,
NXopenpath(self->fileHandle,"/");
}
/*----------------------------------------------------------------------*/
static void putHdb(SConnection *pCon, SicsInterp *pSics, pNXScript self,
int argc, char *argv[]){
pHdb node = NULL;
char alias[512];
hdbValue v;
float fVal, *floatAr = NULL;
int i;
int start[5],size[5];
if(argc < 3){
SCWrite(pCon,"ERROR: putHdb needs at least node name",
eError);
return;
}
node = FindHdbNode(NULL,argv[2], pCon);
if(node == NULL){
SCPrintf(pCon,eError,"ERROR: node %s not found", argv[2]);
return;
}
memset(alias,0,512*sizeof(char));
if(!GetHdbProperty(node,"nxalias", alias, 512)){
if(argc < 4) {
SCPrintf(pCon,eError,"ERROR: neither nxalias property nor alias on command line found for %s",
argv[2]);
return;
} else {
strncpy(alias, argv[3],512);
}
}
GetHipadabaPar(node,&v,pCon);
if (strcmp(argv[3],"point")==0) {
NXDopenalias(self->fileHandle, self->dictHandle,alias);
start[0]=atoi(argv[4]); size[0]=1;
switch(v.dataType){
case HIPINT:
NXputslab(self->fileHandle,&v.v.intValue,start,size);
break;
case HIPFLOAT:
fVal = v.v.doubleValue;
NXputslab(self->fileHandle,&fVal,start,size);
break;
}
ReleaseHdbValue(&v);
NXopenpath(self->fileHandle,"/");
return;
}
switch(v.dataType){
case HIPNONE:
return;
break;
case HIPINT:
NXDputalias(self->fileHandle, self->dictHandle, alias,
&v.v.intValue);
break;
case HIPFLOAT:
fVal = v.v.doubleValue;
NXDputalias(self->fileHandle, self->dictHandle, alias,
&fVal);
break;
case HIPTEXT:
NXDputalias(self->fileHandle, self->dictHandle, alias,
v.v.text);
break;
case HIPINTAR:
case HIPINTVARAR:
NXDputalias(self->fileHandle, self->dictHandle, alias,
v.v.intArray);
break;
case HIPFLOATAR:
case HIPFLOATVARAR:
floatAr = malloc(v.arrayLength*sizeof(float));
if(floatAr == NULL){
SCPrintf(pCon,eError,"ERROR: out of memory writing %s", node->name);
return;
}
for(i = 0; i < v.arrayLength; i++){
floatAr[i] = v.v.floatArray[i];
}
NXDputalias(self->fileHandle, self->dictHandle, alias,
floatAr);
free(floatAr);
break;
}
ReleaseHdbValue(&v);
}
/*----------------------------------------------------------------------*/
static void updateHMDim(NXScript *self, pHistMem mem){
int iDim[MAXDIM];
int i, rank, timeLength, status;
@@ -1117,6 +1204,10 @@ static int handlePut(SConnection *pCon, SicsInterp *pSics, pNXScript self,
/* ================*/
putCounter(pCon,pSics,self, argc,argv);
return 1;
} else if(strcmp(argv[1],"puthdb") == 0){
/* ================*/
putHdb(pCon,pSics,self, argc,argv);
return 1;
}else if(strcmp(argv[1],"puthm") == 0){
/*=================*/
putHistogramMemory(pCon,pSics,self,argc, argv);