Use a more advanced method to change SKIRTOR SED shape. Now it also works for...

Use a more advanced method to change SKIRTOR SED shape. Now it also works for scatter component and type-2 case

database_builder/__init__.py

@@ -738,6 +738,8 @@ def build_skirtor2016(base):
     wl_uncut *= 1e3
     # Convert from F_lam*lam to F_lam
     intrin_disk_unnormed /= wl_uncut
+    # The old disk SED, total energy normalized to 1
+    disk_old_unnormed = intrin_disk_unnormed / np.trapz(intrin_disk_unnormed, x=wl_uncut)
 
     # Define the new disk SED shape
     # Modify the disk SED to Feltre et al. (2012), following the method in
@@ -785,13 +787,15 @@ def build_skirtor2016(base):
         dust /= norm
         intrin_disk = intrin_disk_unnormed / norm
 
-        if i_float<=(90-oa_float):
+        #if i_float<=(90-oa_float):
             # For type-1 AGN, update the disk emission
             # Re-normalize the entire new disk SED to keep energy conservation
-            disk = np.trapz(disk, x=wl_uncut) * disk_new_unnormed
+        #    disk = np.trapz(disk, x=wl_uncut) * disk_new_unnormed
 
         # Add the scatter component to disk for simplicity
         disk += scatt
+        # Apply the new disk SED shape
+        disk = np.nan_to_num(disk*disk_new_unnormed/disk_old_unnormed)
 
         # Apply wavelength cut to avoid X-ray wavelength
         lam_cut = 10**0.9