- Currently disabled attempts at logging commands
- Added a warning for excessive data rates on monitors - Added statistics to devser and thus to scriptcontext - Added byte concatenation to dynstring - Added aborting for reflection generation to fourmess.c - Added data checksum testing to hipadaba, use for update tests - Fixed interrupt discovery in network.c, caused invalid interrupt codes which in turn confused sicscron which had to be fixed too. - Renamed ubcalc into ubcalcint in order to reclaim the ubcalc for Jurg - Added an a3offset to tasub in order to fix what I perceive an IS problem - Added support for the newer version of the Siemens SPS, the S7 - Added a not yet fully working sinqhttpopt driver which talks to http HM without libghttp SKIPPED: psi/delcam.c psi/make_gen psi/psi.c psi/sinq.c psi/sinq.h psi/sinqhttpopt.c psi/slsvme.c psi/spss7.c
This commit is contained in:
11
tasublib.c
11
tasublib.c
@ -540,8 +540,8 @@ int calcTasMisalignment(ptasMachine machine, tasQEPosition qe, double *misalign
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------------*/
|
||||
int calcTasQAngles(MATRIX UB, MATRIX planeNormal, int ss, tasQEPosition qe,
|
||||
ptasAngles angles)
|
||||
int calcTasQAngles(MATRIX UB, MATRIX planeNormal, int ss, double a3offset,
|
||||
tasQEPosition qe, ptasAngles angles)
|
||||
{
|
||||
MATRIX R, QC;
|
||||
double om, q, theta, cos2t;
|
||||
@ -596,14 +596,14 @@ int calcTasQAngles(MATRIX UB, MATRIX planeNormal, int ss, tasQEPosition qe,
|
||||
|
||||
theta = calcTheta(qe.ki, qe.kf, angles->sample_two_theta);
|
||||
|
||||
angles->a3 = om + theta;
|
||||
angles->a3 = om + theta + a3offset;
|
||||
/*
|
||||
put a3 into -180, 180 properly. We can always turn by 180 because the
|
||||
scattering geometry is symmetric in this respect. It is like looking at
|
||||
the scattering plane from the other side
|
||||
*/
|
||||
angles->a3 -= 180.;
|
||||
if (angles->a3 < -180.) {
|
||||
if (angles->a3 < -180 - a3offset) {
|
||||
angles->a3 += 360.;
|
||||
}
|
||||
|
||||
@ -680,7 +680,8 @@ int calcAllTasAngles(ptasMachine machine, tasQEPosition qe,
|
||||
}
|
||||
|
||||
status = calcTasQAngles(machine->UB, machine->planeNormal,
|
||||
machine->ss_sample, qe, angles);
|
||||
machine->ss_sample,
|
||||
machine->a3offset, qe, angles);
|
||||
if (status != 1) {
|
||||
return status;
|
||||
}
|
||||
|
Reference in New Issue
Block a user