| 108 |
|
/* worth using? */ |
| 109 |
|
if (dtmp > FTINY) { |
| 110 |
|
copycolor(ctmp, np->scolor); |
| 111 |
< |
dtmp *= omega / np->pdot; |
| 111 |
> |
dtmp *= omega * sqrt(ldot/np->pdot); |
| 112 |
|
scalecolor(ctmp, dtmp); |
| 113 |
|
addcolor(cval, ctmp); |
| 114 |
|
} |
| 134 |
|
/* worth using? */ |
| 135 |
|
if (dtmp > FTINY) { |
| 136 |
|
copycolor(ctmp, np->mcolor); |
| 137 |
< |
dtmp *= np->tspec * omega / np->pdot; |
| 137 |
> |
dtmp *= np->tspec * omega * sqrt(ldot/np->pdot); |
| 138 |
|
scalecolor(ctmp, dtmp); |
| 139 |
|
addcolor(cval, ctmp); |
| 140 |
|
} |
| 186 |
|
else |
| 187 |
|
setcolor(nd.scolor, 1.0, 1.0, 1.0); |
| 188 |
|
scalecolor(nd.scolor, nd.rspec); |
| 189 |
< |
if (nd.specfl & SP_PURE) { /* improved model */ |
| 190 |
< |
dtmp = exp(-BSPEC(m)*nd.pdot); |
| 191 |
< |
for (i = 0; i < 3; i++) |
| 192 |
< |
colval(nd.scolor,i) += |
| 193 |
< |
(1.0-colval(nd.scolor,i))*dtmp; |
| 194 |
< |
nd.rspec += (1.0-nd.rspec)*dtmp; |
| 195 |
< |
} else if (specthresh > FTINY && /* check threshold */ |
| 189 |
> |
/* improved model */ |
| 190 |
> |
dtmp = exp(-BSPEC(m)*nd.pdot); |
| 191 |
> |
for (i = 0; i < 3; i++) |
| 192 |
> |
colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp; |
| 193 |
> |
nd.rspec += (1.0-nd.rspec)*dtmp; |
| 194 |
> |
/* check threshold */ |
| 195 |
> |
if (!(nd.specfl & SP_PURE) && |
| 196 |
> |
specthresh > FTINY && |
| 197 |
|
(specthresh >= 1.-FTINY || |
| 198 |
|
specthresh > nd.rspec)) |
| 199 |
|
nd.specfl |= SP_RBLT; |
