- 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:
42
fourlib.c
42
fourlib.c
@ -198,7 +198,7 @@ void pol2det(psdDescription *psd, double gamma, double nu, int *x, int *y){
|
||||
turn chi and phi in order to get Z1 into the equatorial plane
|
||||
*/
|
||||
static void turnEquatorial(MATRIX z1, double *chi, double *phi){
|
||||
if(ABS(z1[0][0]) < .0001 || ABS(z1[1][0]) < .0001){
|
||||
if(ABS(z1[0][0]) < .0001 && ABS(z1[1][0]) < .00001){
|
||||
*phi = .0;
|
||||
*chi = 90.;
|
||||
if(z1[2][0] < .0){
|
||||
@ -607,6 +607,46 @@ void z1FromAllAngles(double lambda, double omega , double gamma,
|
||||
z1fromz3(z1,z3,chi,phi);
|
||||
mat_free(z3);
|
||||
}
|
||||
/*-----------------------------------------------------------------------*/
|
||||
int findAllowedBisecting(double lambda, MATRIX z1, float fSet[4],
|
||||
inRange testFunc, void *userData){
|
||||
int status, i, mask[4];
|
||||
double stt, om, chi, phi, psi, ompsi, chipsi, phipsi;
|
||||
float fTest[4];
|
||||
|
||||
status = z1mToBisecting(lambda,z1, &stt, &om, &chi, &phi);
|
||||
chi = circlify(chi);
|
||||
phi = circlify(phi);
|
||||
fSet[0] = stt;
|
||||
fSet[1] = om;
|
||||
fSet[2] = chi;
|
||||
fSet[3] = phi;
|
||||
if(status != 1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for(psi = .0; psi < 360.; psi += .5){
|
||||
rotatePsi(om,chi,phi,psi,&ompsi,&chipsi,&phipsi);
|
||||
fTest[0] = stt;
|
||||
fTest[1] = ompsi;
|
||||
fTest[2] = circlify(chipsi);
|
||||
fTest[3] = circlify(phipsi);
|
||||
status = testFunc(userData,fTest,mask);
|
||||
if(status == 1){
|
||||
for(i = 0; i < 4; i++){
|
||||
fSet[i] = fTest[i];
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
if(mask[0] == 0) {
|
||||
/*
|
||||
* useless: when two theta problem there is no solution
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/*------------------- a test program ------------------------------------*/
|
||||
#ifdef TESTCODE
|
||||
int main(int argc, char *argv[]){
|
||||
|
Reference in New Issue
Block a user