- Many fixes to the triple axis stuff

* update after a1-a6 drive
  * intrduction of targets
- POLDI writing
- Moved HKL calculation 4 TRICS to fourlib
This commit is contained in:
cvs
2002-01-25 14:48:50 +00:00
parent 8c043c8cd1
commit 1e60f3be82
39 changed files with 3513 additions and 1160 deletions

View File

@@ -150,6 +150,15 @@ extern char *tasVariableOrder[] = {
"local",
"swunit",
"scaninfo",
"tei",
"tki",
"tef",
"tkf",
"tqh",
"tqk",
"tql",
"ten",
"tqm",
NULL};
/*---------------------------------------------------------------------
There is a special feauture in MAD where the count mode is determined
@@ -183,6 +192,25 @@ static int TimerCallback(int iEvent, void *pEvent, void *pUser)
SetCounterPreset(self->pScan->pCounterData,self->tasPar[TI]->fVal);
return 1;
}
/*-----------------------------------------------------------------------
This is an interpreter wrapper function which allows to call for the
recalculation of the energy variables from scripts.
--------------------------------------------------------------------------*/
extern int TASUpdate(pTASdata self,SConnection *pCon); /* tasutil.c */
static int RecalcAction(SConnection *pCon, SicsInterp *pSics, void *pData,
int argc, char *argv[])
{
pTASdata self = NULL;
assert(pCon);
assert(pSics);
self = (pTASdata)pData;
assert(self);
return TASUpdate(self,pCon);
}
/*-----------------------------------------------------------------------
A function for killing the TAS data structure is needed
-------------------------------------------------------------------------*/
@@ -293,10 +321,17 @@ int TASFactory(SConnection *pCon, SicsInterp *pSics, void *pData,
TASKill(pNew);
return 0;
}
iError = AddCommand(pSics,"sf",TASScan,NULL,pNew);
iError = AddCommand(pSics,"fs",TASScan,NULL,pNew);
if(!iError)
{
SCWrite(pCon,"ERROR: duplicate set command not created",eError);
SCWrite(pCon,"ERROR: duplicate sf command not created",eError);
TASKill(pNew);
return 0;
}
iError = AddCommand(pSics,"updateqe",RecalcAction,NULL,pNew);
if(!iError)
{
SCWrite(pCon,"ERROR: duplicate updateqe command not created",eError);
TASKill(pNew);
return 0;
}