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

- Fixes to NXscript

Browse Source 
- Added Pause and Continue commands
- Fixed simulation counter to deal properly with pause
- Fixed nxdict HDF5 problem
This commit is contained in:
cvs
2004-01-09 14:45:38 +00:00
parent dd5f8ae5ad
commit ae8ee2f28e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefile_alpha
View File

@ -7,7 +7,7 @@
include ../alpha_def include ../alpha_def
CC = cc CC = cc
CFLAGS = -std1 -g $(DFORTIFY) -I$(SRC).. -I$(HDFROOT)/include -DHDF4 -DHDF5 \ CFLAGS = -std1 -g $(DFORTIFY) -I$(SRC).. -I$(HDFROOT)/include -DHDF5 \
-I$(SRC)hardsup -I$(SRC)hardsup
include make_gen include make_gen

6
nextrics.c
View File

@ -308,7 +308,7 @@ name of hkl object holding crystallographic information
char pBueffel[512]; char pBueffel[512];
CounterMode eMode; CounterMode eMode;
HistInt lData[DET1X*DET1Y], i, lVal; HistInt lData[DET1X*DET1Y], i, lVal;
int32 iVal,lBeam; int iVal,lBeam;
float fVal, fTTheta, fTime = 0.; float fVal, fTTheta, fTime = 0.;
pMotor pMot; pMotor pMot;
@ -382,9 +382,9 @@ name of hkl object holding crystallographic information
} }
NXDputalias(hfil,self->pDict,"framemode",pBueffel); NXDputalias(hfil,self->pDict,"framemode",pBueffel);
NXDputalias(hfil,self->pDict,"framepreset",&fVal); NXDputalias(hfil,self->pDict,"framepreset",&fVal);
iVal = (int32)lVal; iVal = (int)lVal;
NXDputalias(hfil,self->pDict,"framemonitor",&iVal); NXDputalias(hfil,self->pDict,"framemonitor",&iVal);
iVal = (int32)lBeam; iVal = (int)lBeam;
NXDputalias(hfil,self->pDict,"sinqmonitor",&iVal); NXDputalias(hfil,self->pDict,"sinqmonitor",&iVal);
NXDputalias(hfil,self->pDict,"cctime",&fTime); NXDputalias(hfil,self->pDict,"cctime",&fTime);

8
nxsans.c
View File

@ -203,7 +203,7 @@ static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
char pBueffel[512]; char pBueffel[512];
float fVal; float fVal;
int iVal, iSet; int iVal, iSet;
int32 iAxis[256]; int iAxis[256];
int i, iRet; int i, iRet;
long lVal; long lVal;
HistInt *lData = NULL; HistInt *lData = NULL;
@ -289,10 +289,10 @@ static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
self = (pHistMem)pCom->pData; self = (pHistMem)pCom->pData;
assert(self); assert(self);
lVal = GetHistMonitor(self,0,pCon); lVal = GetHistMonitor(self,0,pCon);
iVal = (int32)lVal; iVal = (int)lVal;
NXDputalias(Nfil,pDict,"m1counts",&iVal); NXDputalias(Nfil,pDict,"m1counts",&iVal);
lVal = GetHistMonitor(self,4,pCon); lVal = GetHistMonitor(self,4,pCon);
iVal = (int32)lVal; iVal = (int)lVal;
NXDputalias(Nfil,pDict,"pbcounts",&iVal); NXDputalias(Nfil,pDict,"pbcounts",&iVal);
/* the collimator */ /* the collimator */
@ -558,7 +558,7 @@ static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
fVal = GetHistPreset(self); fVal = GetHistPreset(self);
NXDputalias(Nfil,pDict,"ddp",&fVal); NXDputalias(Nfil,pDict,"ddp",&fVal);
lVal = GetHistMonitor(self,1,pCon); lVal = GetHistMonitor(self,1,pCon);
iVal = (int32)lVal; iVal = (int)lVal;
NXDputalias(Nfil,pDict,"ddmo",&iVal); NXDputalias(Nfil,pDict,"ddmo",&iVal);
fVal = GetHistCountTime(self,pCon); fVal = GetHistCountTime(self,pCon);
NXDputalias(Nfil,pDict,"ddtime",&fVal); NXDputalias(Nfil,pDict,"ddtime",&fVal);