slight generalization so pop_scatter_mar works even if pop_sfr is supplied

Author: mirochaj

ares/populations/GalaxyEnsemble.py

@@ -1101,10 +1101,16 @@ def _gen_prescribed_galaxy_histories(self, zstop=0):
         if 'SFR' in halos:
             SFR = halos['SFR'][:,-1::-1]
         else:
-            iz = np.argmin(np.abs(6. - z))
-            SFR = self.guide.get_fstar(z=z2d, Mh=Mh)
-            np.multiply(SFR, MAR, out=SFR)
-            SFR *= fb
+            if self.pf['pop_sfr'] is not None:
+                SFR = np.ones_like(MAR) * self.pf['pop_sfr']
+                sigma_mar = self.pf['pop_scatter_mar']
+                np.random.seed(self.pf['pop_scatter_mar_seed'])
+                noise = self.get_noise_lognormal(SFR, sigma_mar)
+                SFR += noise
+            else:
+                SFR = self.guide.get_fstar(z=z2d, Mh=Mh)
+                np.multiply(SFR, MAR, out=SFR)
+                SFR *= fb
 
         ##
         # Duty cycle effects

ares/util/SetDefaultParameterValues.py

@@ -515,6 +515,7 @@ def PopulationParameters():
 
     "pop_target_volume": None,
     "pop_target_redshift": None,
+    "pop_target_density": 0.,
     "pop_target_seed": None,
 
     "pop_tunnel": None,
@@ -655,8 +656,6 @@ def PopulationParameters():
     "pop_fstar_max": 1.0,
     "pop_fstar_negligible": 1e-5, # relative to maximum
 
-    "pop_sfr": None,
-
     "pop_facc": 0.0,
     "pop_fsmooth": 1.0,
 

input/litdata/harikane2022.py

@@ -34,7 +34,8 @@
  'alpha': [],
 }
 
-# Table 5
+# Table 5: reminder, errors stored in (+/-) order, will be flipped in internal
+# analysis routines to satisfy matplotlib's errorbar.
 tmp_data = {}
 tmp_data['lf'] = \
 {