320 |
|
for (j = 0; j < mtx_ncols(mig); j++) |
321 |
|
if ((mv = mtx_coef(mig,i,j)) > cthresh) { |
322 |
|
const RBFVAL *rbf1j = &mig->rbfv[1]->rbfa[j]; |
323 |
< |
double rad1 = R2ANG(rbf1j->crad); |
323 |
> |
double rad2; |
324 |
|
FVECT v; |
325 |
|
int pos[2]; |
326 |
< |
rbf->rbfa[n].peak = peak0 * mv * rbf->vtotal; |
327 |
< |
rbf->rbfa[n].crad = ANG2R(sqrt(rad0*rad0*(1.-t) + |
328 |
< |
rad1*rad1*t)); |
326 |
> |
rad2 = R2ANG(rbf1j->crad); |
327 |
> |
rad2 = rad0*rad0*(1.-t) + rad2*rad2*t; |
328 |
> |
rbf->rbfa[n].peak = peak0 * mv * rbf->vtotal * |
329 |
> |
rad0*rad0/rad2; |
330 |
> |
rbf->rbfa[n].crad = ANG2R(sqrt(rad2)); |
331 |
|
ovec_from_pos(v, rbf1j->gx, rbf1j->gy); |
332 |
|
geodesic(v, v0, v, t, GEOD_REL); |
333 |
|
pos_from_vec(pos, v); |
428 |
|
for (j = 0; j < mtx_ncols(miga[0]); j++) { |
429 |
|
const float ma = mtx_coef(miga[0],i,j); |
430 |
|
const RBFVAL *rbf1j; |
431 |
< |
double rad1j, srad2; |
431 |
> |
double srad2; |
432 |
|
if (ma <= cthresh) |
433 |
|
continue; |
434 |
|
rbf1j = &miga[0]->rbfv[1]->rbfa[j]; |
435 |
< |
rad1j = R2ANG(rbf1j->crad); |
436 |
< |
srad2 = (1.-s)*(1.-t)*rad0i*rad0i + s*(1.-t)*rad1j*rad1j; |
435 |
> |
srad2 = R2ANG(rbf1j->crad); |
436 |
> |
srad2 = (1.-s)*(1.-t)*rad0i*rad0i + s*(1.-t)*srad2*srad2; |
437 |
|
ovec_from_pos(v1, rbf1j->gx, rbf1j->gy); |
438 |
|
geodesic(v1, v0, v1, s, GEOD_REL); |
439 |
|
for (k = 0; k < mtx_ncols(miga[2]); k++) { |
440 |
|
float mb = mtx_coef(miga[1],j,k); |
441 |
|
float mc = mtx_coef(miga[2],i,k); |
442 |
|
const RBFVAL *rbf2k; |
443 |
< |
double rad2k; |
443 |
> |
double rad2; |
444 |
|
int pos[2]; |
445 |
|
if ((mb <= cthresh) & (mc <= cthresh)) |
446 |
|
continue; |
447 |
|
rbf2k = &miga[2]->rbfv[1]->rbfa[k]; |
448 |
< |
rbf->rbfa[n].peak = w0i * ma * (mb*mbfact + mc*mcfact); |
449 |
< |
rad2k = R2ANG(rbf2k->crad); |
450 |
< |
rbf->rbfa[n].crad = ANG2R(sqrt(srad2 + t*rad2k*rad2k)); |
448 |
> |
rad2 = R2ANG(rbf2k->crad); |
449 |
> |
rad2 = srad2 + t*rad2*rad2; |
450 |
> |
rbf->rbfa[n].peak = w0i * ma * (mb*mbfact + mc*mcfact) * |
451 |
> |
rad0i*rad0i/rad2; |
452 |
> |
rbf->rbfa[n].crad = ANG2R(sqrt(rad2)); |
453 |
|
ovec_from_pos(v2, rbf2k->gx, rbf2k->gy); |
454 |
|
geodesic(v2, v1, v2, t, GEOD_REL); |
455 |
|
pos_from_vec(pos, v2); |