simplify modify_intensities hook

Author: kecnry

phoebe/backend/universe.py

@@ -1919,6 +1919,24 @@ def _populate_lc(self, dataset, ignore_effects=False, **kwargs):
                 abs_intensities *= extinct_factors
                 abs_normal_intensities *= extinct_factors
 
+            if not ignore_effects:
+                for feature in self.features:
+                    if self.__class__.__name__ == 'Star_roche_envelope_half' and self.ind_self != self.ind_self_vel:
+                        # then this is the secondary half of a contact envelope
+                        roche_coords_for_computations = np.array([1.0, 0.0, 0.0]) - mesh.roche_coords_for_computations
+                    else:
+                        roche_coords_for_computations = self.mesh.roche_coords_for_computations
+                    abs_normal_intensities, abs_intensities = feature.modify_intensities(abs_normal_intensities,
+                                                                                         abs_intensities,
+                                                                                         self.mesh.mus_for_computations,
+                                                                                         self.get_pblum_scale(dataset),
+                                                                                         extinct_factors,
+                                                                                         boost_factors,
+                                                                                         roche_coords_for_computations,
+                                                                                         s=self.polar_direction_xyz,
+                                                                                         t=self.time)
+
+
             # Handle pblum - distance and l3 scaling happens when integrating (in observe)
             # we need to scale each triangle so that the summed normal_intensities over the
             # entire star is equivalent to pblum / 4pi
@@ -1933,21 +1951,6 @@ def _populate_lc(self, dataset, ignore_effects=False, **kwargs):
         else:
             raise NotImplementedError("lc_method '{}' not recognized".format(lc_method))
 
-        if not ignore_effects:
-            for feature in self.features:
-                if self.__class__.__name__ == 'Star_roche_envelope_half' and self.ind_self != self.ind_self_vel:
-                    # then this is the secondary half of a contact envelope
-                    roche_coords_for_computations = np.array([1.0, 0.0, 0.0]) - mesh.roche_coords_for_computations
-                else:
-                    roche_coords_for_computations = self.mesh.roche_coords_for_computations
-                abs_normal_intensities, normal_intensities, abs_intensities, intensities = feature.modify_intensities(abs_normal_intensities,
-                                                                                                                      normal_intensities,
-                                                                                                                      abs_intensities,
-                                                                                                                      intensities,
-                                                                                                                      roche_coords_for_computations,
-                                                                                                                      s=self.polar_direction_xyz,
-                                                                                                                      t=self.time)
-
         # TODO: do we really need to store all of these if store_mesh==False?
         # Can we optimize by only returning the essentials if we know we don't need them?
         return {'abs_normal_intensities': abs_normal_intensities,

phoebe/features/component_features.py

@@ -129,13 +129,29 @@ def modify_teffs(self, teffs, roche_coords, s=[0., 0., 1.], t=None):
         """
         return teffs
 
-    def modify_intensities(self, abs_normal_intensities, normal_intensities, abs_intensities, intensities,
+    def modify_intensities(self, abs_normal_intensities, abs_intensities,
+                           mus, pblum_scale, extinct_factors, boost_factors,
                            roche_coords, s=[0., 0., 1.], t=None):
         """
         Method for a feature to modify the intensities.
         Features that affect intensities should override this method
-        """
-        return abs_normal_intensities, normal_intensities, abs_intensities, intensities
+
+        Arguments
+        ----------
+        * `abs_normal_intensities` (ndarray): Absolute normal intensities, already multiplied
+            by `extinct_factors`.
+        * `abs_intensities` (ndarray): Absolute intensities, already multiplied by
+            `extinct_factors` and `boost_factors`.
+        * `mus` (ndarray): Cosine of the angle between the normal vector and the line of sight
+        * `pblum_scale` (ndarray): Scale factor for the pblum, that will be applied to the abs_intensities
+            AFTER modify_intensities to result in the scaled intensities
+        * `extinct_factors` (ndarray): Extinction factors for the intensities
+        * `boost_factors` (ndarray): Boost factors for the intensities
+        * `roche_coords` (ndarray): Roche coordinates for the computations
+        * `s` (array-like): Spin vector in Roche coordinates
+        * `t` (float): Current time
+        """
+        return abs_normal_intensities, abs_intensities
 
 
 class Spot(ComponentFeature):