- Fixed conflicts in ascon.c
- Supressed superfluous message from fmess - Expanded multicounter to deal with threshold commands nicely - Fixed an an issue with an uninitialized dummy connection in nserver - Many changes to simidex to make it work in a more reliable way. - Added hdbfactory path alias targetpath - Extended frame to deal with sinqhttp HM
This commit is contained in:
21
singlex.c
21
singlex.c
@@ -710,8 +710,11 @@ const double *SXGetUB()
|
||||
void SXSetUB(double ub[9])
|
||||
{
|
||||
pHdb node = NULL;
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
|
||||
if(singlex == NULL){
|
||||
return;
|
||||
}
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
node = GetHipadabaNode(singlex->objectNode, "ub");
|
||||
assert(node != NULL);
|
||||
SetHipadabaPar(node, MakeHdbFloatArray(9, ub), NULL);
|
||||
@@ -777,12 +780,15 @@ void SXSetCell(double cell[6])
|
||||
/*---------------------------------------------------------------------------*/
|
||||
double SXGetLambda()
|
||||
{
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
pSicsVariable lam = NULL;
|
||||
float val;
|
||||
hdbValue v;
|
||||
pHdb node = NULL;
|
||||
|
||||
if(singlex == NULL){
|
||||
return -99.9;
|
||||
}
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
if (priv->lambdaDriv != NULL) {
|
||||
return priv->lambdaDriv->GetValue(priv->lambdaVar, pServ->dummyCon);
|
||||
} else if (priv->lambdaVar != NULL) {
|
||||
@@ -792,7 +798,7 @@ double SXGetLambda()
|
||||
}
|
||||
node = GetHipadabaNode(singlex->objectNode, "lambda");
|
||||
assert(node != NULL);
|
||||
GetHipadabaPar(node, &v, NULL);
|
||||
GetHipadabaPar(node, &v, pServ->dummyCon);
|
||||
return v.v.doubleValue;
|
||||
}
|
||||
|
||||
@@ -820,16 +826,20 @@ T_SgInfo *SXGetSpaceGroup()
|
||||
/*---------------------------------------------------------------------------*/
|
||||
pSingleDiff SXGetDiffractometer()
|
||||
{
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
const double *cell, *ub;
|
||||
double lambda;
|
||||
int i;
|
||||
|
||||
|
||||
/* Not initialized.
|
||||
* Trouble is motors need to be configured first, the we can set a diffractometer.
|
||||
* If this is ever triggered, the most likely cause is that no mode was selected in the
|
||||
* initialisation file.
|
||||
*/
|
||||
if(singlex == NULL){
|
||||
return NULL;
|
||||
}
|
||||
pSingleX priv = (pSingleX) singlex->pPrivate;
|
||||
if (priv->diffractometer->calculateSettings == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -851,6 +861,9 @@ void SXSetMode(SingleXModes m)
|
||||
{
|
||||
pHdb node = NULL;
|
||||
|
||||
if(singlex == NULL){
|
||||
return;
|
||||
}
|
||||
node = GetHipadabaNode(singlex->objectNode, "mode");
|
||||
assert(node != NULL);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user