- Fixed missalignment in TAS scan messages

- Fixed a counting/driving race in devexec
- Fixed some problems with sanscheck


SKIPPED:
	psi/tasscan.c
	psi/utils/check/amorcheck
	psi/utils/check/dmccheck
	psi/utils/check/focuscheck
	psi/utils/check/hrptcheck
	psi/utils/check/sanscheck
	psi/utils/check/sicssyntaxlib.tcl
	psi/utils/check/topsicheck
	psi/utils/check/tricscheck
This commit is contained in:
cvs
2003-11-25 10:29:21 +00:00
parent 04bb17e56c
commit 90b5e37552
6 changed files with 220 additions and 124 deletions

48
hkl.c
View File

@ -603,12 +603,23 @@ static int calculateBisecting(MATRIX z1, pHKL self, SConnection *pCon,
}
/*
giving up!
giving up! But calculate one more time in order to show Jurg where
he should be.
*/
for(i = 0; i < 4; i++)
{
fSet[i] = .0;
z1mToBisecting(self->fLambda,z1,&stt,&om,&chi,&phi);
if(iRetry == 1){
rotatePsi(om,chi,phi,psi,&ompsi,&chipsi,&phipsi);
fSet[0] = (float)stt;
fSet[1] = (float)ompsi;
fSet[2] = (float)chipsi;
fSet[3]= (float)phipsi;
} else {
fSet[0] = (float)stt;
fSet[1] = (float)om;
fSet[2] = (float)chi;
fSet[3]= (float)phi;
}
return 0;
}
/*----------------------------------------------------------------------*/
@ -1203,6 +1214,7 @@ ente:
char pBueffel[512];
float fUB[9], fPsi, fVal;
float fHKL[3], fSet[4];
double dVal;
pHKL self = NULL;
CommandList *pCom = NULL;
pDummy pDum = NULL;
@ -1269,6 +1281,34 @@ ente:
return 1;
}
}
else if(strcmp(argv[1],"fromangles") == 0)
{
if(argc < 6)
{
SCWrite(pCon,
"ERROR: need stt, om, chi,phi to calculate HKL from angles",
eError);
return 0;
}
for(i = 0; i < 4; i++)
{
iRet = Tcl_GetDouble(InterpGetTcl(pSics),argv[i+2],&dVal);
if(iRet != TCL_OK)
{
snprintf(pBueffel,511,"ERROR: failed to convert %s to number",
argv[i+2]);
SCWrite(pCon,pBueffel,eError);
return 0;
}
fSet[i] = (float)dVal;
}
angle2HKL(self,(double)fSet[0],(double)fSet[1],
(double)fSet[2],(double)fSet[3],fHKL);
sprintf(pBueffel,"HKL from angles: %8.4f %8.4f %8.4f ",
fHKL[0], fHKL[1],fHKL[2]);
SCWrite(pCon,pBueffel,eValue);
return 1;
}
/*------------- lambda */
else if(strcmp(argv[1],"lambda") == 0)
{