a few more fixes related to inhomogenous arrays issue, test suite passing locally

Author: mirochaj

ares/populations/GalaxyCohort.py

@@ -2492,11 +2492,11 @@ def _SAM_1z(self, z, y):
         if not self.pf['pop_star_formation']:
             fstar = SFR = 0.0
         elif self.pf['pop_sfr'] is None:
-            fstar = self.SFE(**kw)
+            fstar = float(self.get_sfe(z=z, Mh=Mh))
             SFR = PIR * fstar
         else:
             fstar = 1e-10
-            SFR = self.sfr(**kw) * dtdz
+            SFR = self.get_sfr(z=z, Mh=Mh) * dtdz
 
         # "Quiet" mass growth
         fsmooth = self.fsmooth(**kw)

ares/populations/GalaxyEnsemble.py

@@ -1979,8 +1979,6 @@ def _cache_L(self, key):
         if not hasattr(self, '_cache_L_'):
             self._cache_L_ = {}
 
-
-        print('hey', key in self._cache_L_, key, self._cache_L_.keys())
         if key in self._cache_L_:
             return self._cache_L_[key]
 

tests/test_static_phot_synth.py

@@ -115,8 +115,8 @@ def test(tol=0.25):
             "These should all be identical! z={}".format(z)
 
         results = [mag_from_spec, mag_from_flux, mag_from_lum,
-            mag_from_spec_20, mag_from_spec_50, mag_from_spec_100,
-            mag_from_phot_mean, mag_from_phot_close, mag_from_phot_interp]
+            mag_from_spec_20[0], mag_from_spec_50[0], mag_from_spec_100[0],
+            mag_from_phot_mean, mag_from_phot_close[0], mag_from_phot_interp[0]]
 
         assert np.all(np.abs(np.diff(results)) < tol), \
             "Error in magnitudes! z={}".format(z)