use ogcore demographics

ogzaf/calibrate.py

@@ -1,10 +1,8 @@
-from ogzaf import demographics
-from ogzaf import macro_params
-from ogzaf import income
+from ogzaf import macro_params, income
 from ogzaf import input_output as io
 import os
 import numpy as np
-from ogcore import txfunc
+from ogcore import txfunc, demographics
 from ogcore.utils import safe_read_pickle, mkdirs
 import pkg_resources
 
@@ -71,10 +69,26 @@ def __init__(
 
         # demographics
         self.demographic_params = demographics.get_pop_objs(
-            p.E, p.S, p.T, p.start_year
+            p.E,
+            p.S,
+            p.T,
+            0,
+            99,
+            country_id="710",  # UN code for ZAF
+            initial_data_year=p.start_year - 1,
+            final_data_year=p.start_year,
         )
         # demographics for 80 period lives (needed for getting e below)
-        demog80 = demographics.get_pop_objs(20, 80, p.T, p.start_year)
+        demog80 = demographics.get_pop_objs(
+            20,
+            80,
+            p.T,
+            0,
+            99,
+            country_id="710",  # UN code for ZAF
+            initial_data_year=p.start_year - 1,
+            final_data_year=p.start_year,
+        )
 
         # earnings profiles
         self.e = income.get_e_interp(