- Added polarisation support for TAS
This commit is contained in:
19
tasdrive.c
19
tasdrive.c
@@ -13,6 +13,10 @@
|
||||
This file implements the MAD dr command for driving.
|
||||
|
||||
Mark Koennecke, November 2000
|
||||
|
||||
Polarisation support added.
|
||||
|
||||
Mark Koennecke, April 2002
|
||||
---------------------------------------------------------------------------*/
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
@@ -224,7 +228,7 @@ int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
/*
|
||||
do output, first Q-E variables
|
||||
*/
|
||||
for(i = 0; i < 10; i++)
|
||||
for(i = 0; i < 12; i++)
|
||||
{
|
||||
if(tasMask[i])
|
||||
{
|
||||
@@ -256,8 +260,19 @@ int TASDrive(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
}
|
||||
}
|
||||
/*
|
||||
missing: output for helmholtz currents
|
||||
output for magnet currents
|
||||
*/
|
||||
for(i = 0; i < 8; i++)
|
||||
{
|
||||
if(tasTargetMask[9+i])
|
||||
{
|
||||
oldPos = readCurrent(tasMotorOrder[CURMOT+i], pCon);
|
||||
sprintf(pBueffel,"Driving %s from %f to %f",tasMotorOrder[CURMOT+i],
|
||||
oldPos, tasTargets[9+i]);
|
||||
SCWrite(pCon,pBueffel,eWarning);
|
||||
}
|
||||
}
|
||||
|
||||
status = TASStart(self,pCon,pSics,tasTargets,tasTargetMask);
|
||||
if(status == 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user