- Removed -fwritable-string

SKIPPED:
	psi/dornier2.c
	psi/ecbdriv.c
	psi/el734hp.c
	psi/libpsi.a
	psi/make_gen
	psi/makefile_linux
	psi/pimotor.c
	psi/pipiezo.c
	psi/sinqhttp.c
	psi/tcpdornier.c
	psi/velodornier.c
This commit is contained in:
koennecke
2006-03-31 15:24:52 +00:00
parent 4081448055
commit 51a60375d6
38 changed files with 1232 additions and 154 deletions

View File

@ -171,6 +171,25 @@ void phimat(MATRIX phim, double phi);
* returns 1 on success, 0 else
*/
int calcTheta(double lambda, MATRIX z1, double *d, double *theta);
/**
* try very hard to calculate settings for the bisecting position
* within the instruments limits. Tries to tweak omega and to rotate
* psi until a usable position can be found.
* @param lambda The wavelength
* @param z1 The scattering for which to find a position
* @param fSet The output setting angles. In case of a failure this
* contains the normal setting angles for psi = 0. The order is:
* 2 theta, om, chi, phi
* @testFunc A user supplied function which test if the setting angles
* are in range.
* @param userData A user specified pointer to some data which may be needed
* in testing the range.
* @return 0 on failure, 1 on success.
*/
typedef int (*inRange)(void *userData, float dSet[4], int mask[4]);
int findAllowedBisecting(double lambda, MATRIX z1, float fSet[4],
inRange testFunc, void *userData);
#endif