From ae8ee2f28ed63b083569fd0cb68e8fe8bda0cfba Mon Sep 17 00:00:00 2001
From: cvs <cvs>
Date: Fri, 9 Jan 2004 14:45:38 +0000
Subject: [PATCH] - Fixes to NXscript - Added Pause and Continue commands -
 Fixed simulation counter to deal properly with pause - Fixed nxdict HDF5
 problem

---
 makefile_alpha | 2 +-
 nextrics.c     | 6 +++---
 nxsans.c       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/makefile_alpha b/makefile_alpha
index c350831..9a0b7c1 100644
--- a/makefile_alpha
+++ b/makefile_alpha
@@ -7,7 +7,7 @@
 include ../alpha_def
 
 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
 
 include make_gen
diff --git a/nextrics.c b/nextrics.c
index bfa7db5..3ade6e7 100644
--- a/nextrics.c
+++ b/nextrics.c
@@ -308,7 +308,7 @@ name of hkl object holding crystallographic information
      char pBueffel[512];
      CounterMode eMode;
      HistInt lData[DET1X*DET1Y], i, lVal;
-     int32 iVal,lBeam;
+     int iVal,lBeam;
      float fVal, fTTheta, fTime = 0.;
      pMotor pMot;
 
@@ -382,9 +382,9 @@ name of hkl object holding crystallographic information
      }
      NXDputalias(hfil,self->pDict,"framemode",pBueffel);     
      NXDputalias(hfil,self->pDict,"framepreset",&fVal);
-     iVal = (int32)lVal;
+     iVal = (int)lVal;
      NXDputalias(hfil,self->pDict,"framemonitor",&iVal);
-     iVal = (int32)lBeam;
+     iVal = (int)lBeam;
      NXDputalias(hfil,self->pDict,"sinqmonitor",&iVal);
      NXDputalias(hfil,self->pDict,"cctime",&fTime);
      
diff --git a/nxsans.c b/nxsans.c
index 3cb67a4..3c0ffca 100644
--- a/nxsans.c
+++ b/nxsans.c
@@ -203,7 +203,7 @@ static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
      char pBueffel[512];
      float fVal;
      int iVal, iSet;
-     int32 iAxis[256];
+     int iAxis[256];
      int i, iRet;
      long lVal;
      HistInt *lData = NULL;
@@ -289,10 +289,10 @@ static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
      self = (pHistMem)pCom->pData;
      assert(self);
      lVal = GetHistMonitor(self,0,pCon);
-     iVal = (int32)lVal;
+     iVal = (int)lVal;
      NXDputalias(Nfil,pDict,"m1counts",&iVal);
      lVal = GetHistMonitor(self,4,pCon);
-     iVal = (int32)lVal;
+     iVal = (int)lVal;
      NXDputalias(Nfil,pDict,"pbcounts",&iVal);
 
      /* the collimator */
@@ -558,7 +558,7 @@ static int gummiFlag = 0; /* a flag indicating stroboscopic, or gummi mode */
      fVal = GetHistPreset(self);
      NXDputalias(Nfil,pDict,"ddp",&fVal);
      lVal = GetHistMonitor(self,1,pCon);
-     iVal = (int32)lVal;
+     iVal = (int)lVal;
      NXDputalias(Nfil,pDict,"ddmo",&iVal);
      fVal = GetHistCountTime(self,pCon);
      NXDputalias(Nfil,pDict,"ddtime",&fVal);