- Added bridge functions to histmemsec to make it look more like histmem
- Modifed many modules using histmem to work also with histmemsec - Extended tasker with task names and task groups - There is a new taskobj which allows to list tasks and to interact with them. - Task now supports running Tcl functions as tasks - There is a new experimental sctcomtask module which allows to define communication tasks against a scriptcontext. This is a new feature which should facilitate writing sequential scripts using asynchronous communication. - A fix to make spss7 work when there are no switches - ORION support for single X. TRICS measures crystals hanging down, ORION standing up SKIPPED: psi/ease.c psi/faverage.c psi/jvlprot.c psi/make_gen psi/pardef.c psi/polterwrite.c psi/psi.c psi/sinq.c psi/spss7.c
This commit is contained in:
24
singlex.c
24
singlex.c
@@ -227,6 +227,7 @@ static int findModeIndex(char *mode)
|
||||
"nb",
|
||||
"tas",
|
||||
"binb",
|
||||
"bio",
|
||||
NULL
|
||||
};
|
||||
int count = 0;
|
||||
@@ -254,6 +255,7 @@ static hdbCallbackReturn SetModeCB(pHdb node, void *userData,
|
||||
pTest = trim(set->v->v.text);
|
||||
pCon = set->callData;
|
||||
modeIdx = findModeIndex(pTest);
|
||||
|
||||
switch (modeIdx) {
|
||||
case Bisecting:
|
||||
if (priv->chi == NULL || priv->om == NULL || priv->phi == NULL
|
||||
@@ -269,6 +271,22 @@ static hdbCallbackReturn SetModeCB(pHdb node, void *userData,
|
||||
initializeSingleBisecting(priv->diffractometer);
|
||||
return hdbContinue;
|
||||
break;
|
||||
case BiO:
|
||||
if (priv->chi == NULL || priv->om == NULL || priv->phi == NULL
|
||||
|| priv->stt == NULL) {
|
||||
if (pCon != NULL) {
|
||||
SCWrite(pCon,
|
||||
"ERROR: required motor for bisecting not configured",
|
||||
eError);
|
||||
}
|
||||
return hdbAbort;
|
||||
}
|
||||
priv->mode = Bisecting;
|
||||
initializeSingleBisectingOrion(priv->diffractometer);
|
||||
free(set->v->v.text);
|
||||
set->v->v.text = strdup("bi");
|
||||
return hdbContinue;
|
||||
break;
|
||||
case NB:
|
||||
if (priv->nu == NULL || priv->om == NULL || priv->stt == NULL) {
|
||||
if (pCon != NULL) {
|
||||
@@ -874,7 +892,11 @@ pSICSOBJ SXGetReflectionList()
|
||||
SingleXModes SXGetMode()
|
||||
{
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
return priv->mode;
|
||||
if(priv->mode == BiO){
|
||||
return Bisecting;
|
||||
} else {
|
||||
return priv->mode;
|
||||
}
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
Reference in New Issue
Block a user