Skip to content

Commit 7ba7ae0

Browse files
committed
Fixed Milky Way attenuation curve
1 parent 74bc7ef commit 7ba7ae0

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

src/fast++-gridder.cpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ namespace dust {
400400

401401
const double iRv = 1.0/3.1;
402402

403-
l = 1e-4/l; // Angstrom to 1/um
403+
l = 1e4/l; // Angstrom to 1/um
404404
if (l <= 1.1) {
405405
l = (0.574 - 0.527*iRv)*pow(l, 1.61);
406406
} else if (l <= 3.3) {
@@ -410,14 +410,18 @@ namespace dust {
410410
(0.01979 - 0.62251*iRv)*pow(l,5) - (0.77530 - 5.3026*iRv)*pow(l,6) +
411411
(0.32999 - 2.09002*iRv)*pow(l,7);
412412
} else if (l <= 8.0) {
413-
l = 1.752 - 3.09*iRv - (0.316 - 1.825)*l - 0.104/(pow(l - 4.67, 2) + 0.341) +
414-
1.206*iRv/(pow(l - 4.62, 2) + 0.263) + (l <= 5.9 ? 0 :
415-
-0.04473*pow(l - 5.9, 2) - 0.009779*pow(l - 5.9, 3) +
416-
(0.2130*pow(l - 5.9, 2) + 0.1207*pow(l - 5.9, 3))*iRv
417-
);
413+
double fafb = 0.0;
414+
if (l > 5.9) {
415+
fafb = -0.04473*pow(l - 5.9, 2) - 0.009779*pow(l - 5.9, 3)
416+
+ (0.2130*pow(l - 5.9, 2) + 0.1207*pow(l - 5.9, 3))*iRv;
417+
}
418+
419+
l = 1.752 - 3.09*iRv + (-0.316 + 1.825*iRv)*l - 0.104/(pow(l - 4.67, 2) + 0.341) +
420+
1.206*iRv/(pow(l - 4.62, 2) + 0.263) + fafb;
418421
} else {
419-
l = -1.073 + 13.67*iRv - (0.628 - 4.257*iRv)*(l - 8.0) +
420-
(0.137 - 0.42*iRv)*pow(l - 8.0, 2) + 0.374*iRv*pow(l - 8.0, 3);
422+
l -= 8.0;
423+
l = -1.073 + 13.67*iRv - (0.628 - 4.257*iRv)*l +
424+
(0.137 - 0.42*iRv)*pow(l, 2) + 0.374*iRv*pow(l, 3);
421425
}
422426

423427
if (l < 0) l = 0;

0 commit comments

Comments
 (0)