- Added triple axis scan command.

- Introduced simulation mode to simdriv and simcter, i.e they never fail and
  finish at once.
- Started defining MAD compatibility commands in Tcl
- Fixed a bug in FOCUS_src which caused it to leak sockets.
- Introduced setsockopt SO_REUSEADDR to all new sockets in sinqhm in order
  to loose the next sinqhm error.
This commit is contained in:
cvs
2000-12-05 09:05:03 +00:00
parent e83d3e6946
commit 876396bb7e
22 changed files with 2000 additions and 58 deletions

View File

@@ -23,6 +23,7 @@
#include "sicsvar.h"
#include "counter.h"
#include "motor.h"
#include "scan.h"
#include "tas.h"
#include "tasu.h"
@@ -86,10 +87,6 @@ isTASEnergy(char *val)
{
return iPtr-EMIN;
}
else
{
iPtr++;
}
}
return -1;
}
@@ -304,6 +301,17 @@ int TASCalc(pTASdata self, SConnection *pCon,
ism = (integer)self->tasPar[SM]->iVal;
isa = (integer)self->tasPar[SA]->iVal;
/*
initialize the helmholts currents. This needs work when
polarisation anlaysis is really supported.
*/
for(i = 0; i < 4; i++)
{
helmconv[i] = .0;
currents[i] = .0;
currents[i+4] = .0;
}
/*
initalise the motorMasks to 0.
*/
@@ -449,7 +457,7 @@ int TASStart(pTASdata self, SConnection *pCon, SicsInterp *pSics,
return 0;
}
}
if(motorMask[9])
if(motorMask[8])
{
status = StartMotor(pServ->pExecutor,pSics,pCon,
"ACH", motorTargets[8]);