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

- Fixed documentation typos

Browse Source 
- In support of HMsec, allow the count command in countsec to run without a
  preset parameter. If this is missing the old, stored preset is used.
- Removed a check which causes initialisation of the HM from a batch file fail
  for POLDI
- fixed @nl@ encoding of \n problem with certain kinds of batch files generated by GTSE
- Fixed a bug with summing on hitsmemsec. nxdataset now uses 64 bit int for dimensions.
- Fixed motorsec to remove itself properly from a parent when linked. Please note
  that there is still the limitation that a second generation motor can only be linked
  once in a Hipadaba tree
- Extended subsampling a HM for second generation HM
- Added a hscriptnotify. This calls a script on the update of a node
- POLDI has been rebuilt, chnages to data file writing
- For testing, sinqhttopt now understands a special command, byteswapoff,
  which switches off byte swapping. Required when the HM ius run on an Intel box.
This commit is contained in:
koennecke
2013-09-16 09:27:51 +00:00
parent 5c3e3a4422
commit ec8a3a7bc4
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
polterwrite.c
View File

@ -183,8 +183,13 @@ static void writeDiaphragm2(NXhandle hfil, NXdict hdict,
static void writeCollimator(NXhandle hfil, NXdict hdict,
SConnection * pCon)
{
char pBueffel[50];
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "cov", "cov");
memset(pBueffel,0,sizeof(pBueffel));
Tcl_Eval(InterpGetTcl(pServ->pSics),"coll");
strncpy(pBueffel,Tcl_GetStringResult(InterpGetTcl(pServ->pSics)), 49);
NXDputalias(hfil, hdict, "collpos", pBueffel);
}
/*--------------------------------------------------------------------*/
@ -231,6 +236,15 @@ static void writeSample(NXhandle hfil, NXdict hdict, SConnection * pCon)
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "ssv0", "sv");
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "ssa", "sa");
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "ssa0", "sa");
pCom = FindCommand(pServ->pSics,"chi");
if(pCom != NULL){
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "schi", "chi");
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "schi0", "chi");
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "sphi", "phi");
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "sphi0", "phi");
}
}
/*--------------------------------------------------------------------*/