- Poldi data file writing with automatic update

- many fixes to TAS
- Changed HM code for ILL PSD to account for Christoph's offset to
  positive.
This commit is contained in:
cvs
2002-04-25 09:39:51 +00:00
parent 0ce72deb58
commit 0daef05b2e
19 changed files with 604 additions and 220 deletions

View File

@@ -33,6 +33,7 @@
#include "udpquieck.h"
#include "nextrics.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 */
@@ -308,7 +309,7 @@ name of hkl object holding crystallographic information
CounterMode eMode;
HistInt lData[DET1X*DET1Y], i, lVal;
int32 iVal,lBeam;
float fVal, fTTheta;
float fVal, fTTheta, fTime = 0.;
pMotor pMot;
/* write motors */
@@ -368,6 +369,7 @@ name of hkl object holding crystallographic information
eMode = GetCounterMode(self->pCount);
fVal = GetCounterPreset(self->pCount);
lVal = GetMonitor(self->pCount,1,pCon);
fTime = GetCountTime(self->pCount,pCon);
lBeam = GetMonitor(self->pCount,4,pCon);
}
if(eMode == eTimer)
@@ -384,6 +386,7 @@ name of hkl object holding crystallographic information
NXDputalias(hfil,self->pDict,"framemonitor",&iVal);
iVal = (int32)lBeam;
NXDputalias(hfil,self->pDict,"sinqmonitor",&iVal);
NXDputalias(hfil,self->pDict,"cctime",&fTime);
/* write detector1 histogram */
if(self->pHistogram1 != NULL)