Fixed Milky Way attenuation curve

Author: cschreib

src/fast++-gridder.cpp

@@ -400,7 +400,7 @@ namespace dust {
 
         const double iRv = 1.0/3.1;
 
-        l = 1e-4/l; // Angstrom to 1/um
+        l = 1e4/l; // Angstrom to 1/um
         if (l <= 1.1) {
             l = (0.574 - 0.527*iRv)*pow(l, 1.61);
         } else if (l <= 3.3) {
@@ -410,14 +410,18 @@ namespace dust {
                 (0.01979 - 0.62251*iRv)*pow(l,5) - (0.77530 - 5.3026*iRv)*pow(l,6) +
                 (0.32999 - 2.09002*iRv)*pow(l,7);
         } else if (l <= 8.0) {
-            l = 1.752 - 3.09*iRv - (0.316 - 1.825)*l - 0.104/(pow(l - 4.67, 2) + 0.341) +
-                1.206*iRv/(pow(l - 4.62, 2) + 0.263) + (l <= 5.9 ? 0 :
-                    -0.04473*pow(l - 5.9, 2) - 0.009779*pow(l - 5.9, 3) +
-                    (0.2130*pow(l - 5.9, 2) + 0.1207*pow(l - 5.9, 3))*iRv
-                );
+            double fafb = 0.0;
+            if (l > 5.9) {
+                fafb = -0.04473*pow(l - 5.9, 2) - 0.009779*pow(l - 5.9, 3)
+                + (0.2130*pow(l - 5.9, 2) + 0.1207*pow(l - 5.9, 3))*iRv;
+            }
+
+            l = 1.752 - 3.09*iRv + (-0.316 + 1.825*iRv)*l - 0.104/(pow(l - 4.67, 2) + 0.341) +
+                1.206*iRv/(pow(l - 4.62, 2) + 0.263) + fafb;
         } else {
-            l = -1.073 + 13.67*iRv - (0.628 - 4.257*iRv)*(l - 8.0) +
-                (0.137 - 0.42*iRv)*pow(l - 8.0, 2) + 0.374*iRv*pow(l - 8.0, 3);
+            l -= 8.0;
+            l = -1.073 + 13.67*iRv - (0.628 - 4.257*iRv)*l +
+                (0.137 - 0.42*iRv)*pow(l, 2) + 0.374*iRv*pow(l, 3);
         }
 
         if (l < 0) l = 0;