@@ -372,7 +372,7 @@ int main(int argc, char* argv[]) {
372372 vec1f bulge_angle, bulge_radius, bulge_ratio;
373373 vec1f bt, m_disk, m_bulge;
374374
375- vec1f tdust, fpah, mdust;
375+ vec1f tdust, ir8, fpah, mdust;
376376
377377 vec1b passive;
378378
@@ -1230,23 +1230,28 @@ if (!no_flux) {
12301230 note (" generate IR properties..." );
12311231 }
12321232
1233- // Tdust and f_PAH as observed in stacks and detections of Herschel galaxies
1233+ // Tdust and IR8 as observed in stacks and detections of Herschel galaxies
12341234 out.tdust .resize (ngal);
1235- out.fpah .resize (ngal);
1235+ out.ir8 .resize (ngal);
12361236
1237- out.tdust = min ( 20.2 * pow ( 1.0 + out.z , 0.44 ), 26.3 * pow ( 1.0 +out. z , 0.20 ))
1237+ out.tdust = 4.65 *( out.z - 2.0 ) + 31.0
12381238 // Starbursts are warmer
12391239 + 6.6 *out.rsb
12401240 // Add some random scatter
1241- + 3.0 *randomn (seed, ngal);
1241+ + 3.0 *randomn (seed, ngal)
1242+ // Massive galaxies are colder (= downfall of SFE)
1243+ - 1.5 *min (0.0 , out.z -2.0 )*clamp (out.m - 10.7 , 0.0 , 1.0 );
12421244
1243- out.fpah = (0.04 + 0.035 *( 1.0 - 0.85 * clamp ( out.z , 1.0 , 2.0 )) )
1244- // Starburst have weaker PAH
1245- *e10 (- 0.47 *max (1 .0 , out.rsb ))
1245+ out.ir8 = (1.95 * min ( 0.0 , out.z - 2.0 ) + 7.73 )
1246+ // Starburst have larger IR8
1247+ *e10 (0.43 *max (0 .0 , out.rsb ))
12461248 // Add some random scatter
1247- *e10 (0.2 *randomn (seed, ngal));
1249+ *e10 (0.1 *randomn (seed, ngal))
1250+ // Low-mass galaxies have larger IR8
1251+ *e10 (-1.8 *clamp (out.m - 10.0 , -1 , 0.0 ));
12481252
1249- out.fpah = clamp (out.fpah , 0.0 , 1.0 );
1253+ out.ir8 = clamp (out.ir8 , 0.48 , 22.8 ); // range allowed by IR library
1254+ out.fpah = 0.267 /(out.ir8 - 0.217 ) - 0.0118 ;
12501255
12511256 out.lir = out.sfrir /1.72e-10 ;
12521257 vec1u idb = where (!is_finite (out.lir ));
@@ -1487,7 +1492,7 @@ if (!no_flux) {
14871492 out.rfuv_bulge , out.rfuv_disk , out.rfvj_bulge , out.rfvj_disk ,
14881493 out.sfrir , out.sfruv , out.irx , out.lir , out.ir_sed ,
14891494 out.opt_sed_bulge , out.opt_sed_disk ,
1490- out.tdust , out.fpah , out.mdust ,
1495+ out.tdust , out.ir8 , out. fpah , out.mdust ,
14911496 out.zb , out.cmd
14921497 ));
14931498
0 commit comments