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

- Fixed a bug in conman.c which could cause a core dump when terminating

Browse Source 
a connection during an active run.
- Added an additional output mode for the connection in order to
  support the batch run editor.
- Made clientput send everything with eWarning mode in order to support
  the batch run editor.
- Added a better NetReadTillTerm
- Fixed a problem in synchronize.c
- Fixed an issue with reading empty line on normal connection sockets.
- Added a psi scan mode to mesure.c for TRICS
- Made motor print warnings when trying to reposition.
- Fixed abug in hkl.c which cause wrong signs.
This commit is contained in:
cvs
2004-07-21 12:03:08 +00:00
parent 017ac7500f
commit e3ee358dbc
11 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nextrics.c
View File

@@ -32,22 +32,23 @@
#include "hkl.h"
#include "udpquieck.h"
#include "nextrics.h"
#include "nxscript.h"
#define DET1X 256 /* x -length of detector 1 */
#define DET1Y 128 /* y-length of detector 1 */
#define DET1XS 2 /* pixel size in x of detector 1 */
#define DET1YS 2 /* pixel size in y of detector 1 */
#define DET1XS -.78 /* pixel size in x of detector 1 */
#define DET1YS 1.486 /* pixel size in y of detector 1 */
#define DET1DESC "EMBL PSD"
#define DET2X 256 /* x -length of detector 1 */
#define DET2Y 128 /* y-length of detector 1 */
#define DET2XS 2 /* pixel size in x of detector 1 */
#define DET2YS 2 /* pixel size in y of detector 1 */
#define DET2X 256 /* x -length of detector 1 */
#define DET2Y 128 /* y-length of detector 1 */
#define DET2XS -.78 /* pixel size in x of detector 1 */
#define DET2YS 1.486 /* pixel size in y of detector 1 */
#define DET2DESC "EMBL PSD"
#define DET3X 256 /* x -length of detector 1 */
#define DET3Y 128 /* y-length of detector 1 */
#define DET3XS 2 /* pixel size in x of detector 1 */
#define DET3YS 2 /* pixel size in y of detector 1 */
#define DET3XS -.78 /* pixel size in x of detector 1 */
#define DET3YS 1.486 /* pixel size in y of detector 1 */
#define DET3DESC "EMBL PSD"
#define DETAMAX 256 /* maximum length of pixelsize array */
@@ -1240,9 +1241,9 @@ name of hkl object holding crystallographic information
/* make a filename and open it */
if(self->pCurrentFile)
free(self->pCurrentFile);
iRet = IncrementDataNumber(self->pDanu,&iYear);
sprintf(pBueffel,"%s/trics%5.5d%4.4d.hdf",self->pFileRoot,iRet, iYear);
self->pCurrentFile = strdup(pBueffel);
pText = makeFilename(pServ->pSics,pCon);
self->pCurrentFile = strdup(pText);
if(self->iHDF5)
{
iRet = NXopen(self->pCurrentFile,NXACC_CREATE5,&hfil);