Implemented fix to bug report astropy#993

aphearin · Feb 19, 2021 · b96a096 · b96a096
1 parent bee45fc
commit b96a096
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/halotools/empirical_models/factories/model_factory_template.py b/halotools/empirical_models/factories/model_factory_template.py
@@ -243,7 +243,12 @@ def populate_mock(
                 "halo_mass_column_key"
             ]
         except KeyError:
-            pass
+            if hasattr(self, "_haloprop_list"):
+                self._haloprop_list.extend(model_defaults.default_halo_mvir_props)
+            else:
+                a = model_defaults.default_haloprop_list_inherited_by_mock
+                b = model_defaults.default_halo_mvir_props
+                self._haloprop_list = a + b
         self.mock = self.mock_factory(**mock_factory_init_args)
 
         additional_potential_kwargs = (

diff --git a/halotools/empirical_models/model_defaults.py b/halotools/empirical_models/model_defaults.py
@@ -34,11 +34,10 @@
     "halo_vx",
     "halo_vy",
     "halo_vz",
-    "halo_mvir",
-    "halo_rvir",
-    "halo_upid",
 ]
 
+default_halo_mvir_props = ["halo_mvir", "halo_rvir", "halo_upid"]
+
 prim_haloprop_key = "halo_mvir"
 sec_haloprop_key = "halo_nfw_conc"