From e1ab7ff19de9677bc54c1fec5679bb43212c4f39 Mon Sep 17 00:00:00 2001
From: Javier Sanchez <jsanchez@Javiers-MacBook-Air.local>
Date: Mon, 29 Jan 2024 17:53:35 -0500
Subject: [PATCH] fixing after update

---
 augur/analyze.py             |  2 --
 augur/generate.py            |  3 +--
 augur/tests/conftest.py      | 19 -------------------
 augur/tests/test_generate.py |  4 ++--
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 augur/tests/conftest.py

diff --git a/augur/analyze.py b/augur/analyze.py
index df6220a..4d907b7 100644
--- a/augur/analyze.py
+++ b/augur/analyze.py
@@ -129,7 +129,6 @@ def f(self, x, labels, pars_fid, sys_fid):
                 self.lk.reset()
                 cosmo = ccl.Cosmology(**_pars)
                 self.lk.update(ParamsMap(_sys_pars))
-                self.tools.update(ParamsMap(_sys_pars))
                 self.tools.prepare(cosmo)
                 f_out = self.lk.compute_theory_vector(self.tools)
             elif x.ndim == 2:
@@ -148,7 +147,6 @@ def f(self, x, labels, pars_fid, sys_fid):
                     self.tools.reset()
                     self.lk.reset()
                     self.lk.update(ParamsMap(_sys_pars))
-                    self.tools.update(ParamsMap(_sys_pars))
                     cosmo = ccl.Cosmology(**_pars)
                     self.tools.prepare(cosmo)
                     f_out.append(self.lk.compute_theory_vector(self.tools))
diff --git a/augur/generate.py b/augur/generate.py
index 5a91160..62a1dd6 100644
--- a/augur/generate.py
+++ b/augur/generate.py
@@ -18,7 +18,7 @@
 from firecrown.likelihood.gauss_family.gaussian import ConstGaussian
 from firecrown.modeling_tools import ModelingTools
 from firecrown.parameters import ParamsMap
-from augur.utils.config_io import parse_config
+
 
 implemented_nzs = [ZDist, LensSRD2018, SourceSRD2018]
 
@@ -292,7 +292,6 @@ def generate(config, return_all_outputs=False, write_sacc=True, force_read=True)
     cosmo.compute_nonlin_power()
     tools = ModelingTools(pt_calculator=pt_calculator)
     lk.update(sys_params)
-    tools.update(sys_params)
     tools.prepare(cosmo)
     # Run the likelihood (to get the theory)
     lk.compute_loglike(tools)
diff --git a/augur/tests/conftest.py b/augur/tests/conftest.py
deleted file mode 100644
index 710c9f7..0000000
--- a/augur/tests/conftest.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-from ..parser import parse
-
-
-@pytest.fixture
-def example_yaml(tmpdir):
-    yaml = parse("examples/srd_y1_3x2.yaml")
-    yaml['verbose'] = True
-    yaml['generate']['two_point']['sacc_file'] = str(tmpdir.join('test.sacc'))
-    yaml['analyze']['two_point']['sacc_data'] = str(tmpdir.join('test.sacc'))
-    yaml['analyze']['cosmosis']['output_dir'] = str(tmpdir)
-
-    # make fewer parameters to enable fisher to run faster
-    pars = yaml['analyze']['cosmosis']['parameters']
-    for key in list(pars.keys()):  # to avoid dictionary size change
-        if key not in ['sigma8', 'bias_lens0']:
-            del pars[key]
-
-    return yaml
diff --git a/augur/tests/test_generate.py b/augur/tests/test_generate.py
index 00bcff4..8e503da 100644
--- a/augur/tests/test_generate.py
+++ b/augur/tests/test_generate.py
@@ -2,6 +2,6 @@
 from ..generate import generate
 
 
-def test_generate(example_yaml):
-    generate(example_yaml)
+def test_generate():
+    generate('./examples/srd_y1_3x2.yaml')
     assert os.path.isfile(example_yaml['generate']['two_point']['sacc_file'])