- Many fixes to the four circle codes during taking the new code into

operation.
- Fixed some missing output
- Second generation histogram memory and velocity selector objects
- Fixed a problem in diffscan
This commit is contained in:
koennecke
2009-05-15 13:21:20 +00:00
parent 8c6d95bee6
commit 3f3f0810e5
34 changed files with 1014 additions and 117 deletions

View File

@@ -215,23 +215,7 @@ static int hklInRange(void *data, double fSet[4], int mask[4])
mask[0] = checkTheta(self, &dTheta);
fSet[0] = dTheta;
/* for omega check against the limits +- SCANBORDER in order to allow for
a omega scan.
*/
MotorGetPar(pOmega, "softlowerlim", &fLimit);
if ((float) fSet[1] < fLimit) {
mask[1] = 1;
} else {
mask[1] = 0;
MotorGetPar(pOmega, "softupperlim", &fLimit);
if ((float) fSet[1] > fLimit) {
mask[1] = 0;
} else {
mask[1] = 1;
}
}
/* check chi and phi */
mask[1] = MotorCheckBoundary(pOmega, fSet[1], &fHard, pError, 131);
mask[2] = MotorCheckBoundary(pChi, fSet[2], &fHard, pError, 131);
mask[3] = MotorCheckBoundary(pPhi, fSet[3], &fHard, pError, 131);
for (i = 0, test = 0; i < 4; i++) {