working notebooks

LSSTDESC · Jun 11, 2024 · db3836a · db3836a
1 parent 0aa9b67
commit db3836a
Show file tree

Hide file tree

Showing 8 changed files with 2,107 additions and 112 deletions.
diff --git a/nb/demo.ipynb b/nb/demo.ipynb
diff --git a/nb/priors_example.ipynb b/nb/priors_example.ipynb
diff --git a/src/qp/projectors/projector_base.py b/src/qp/projectors/projector_base.py
@@ -28,7 +28,7 @@ def _project_base(self, zs, pzs):
         self.pz_mean = np.mean(self.pzs, axis=0)
         self.prior = None
 
-    @dispatch(qp.ensemble.Ensemble)
+    @dispatch(Ensemble)
     def _project_base(self, ens, z=None):
         if z is None:
             z = np.linspace(0, 1.5, 45)

diff --git a/src/qp/projectors/tests/__init__.py b/src/qp/projectors/tests/__init__.py
diff --git a/src/qp/projectors/tests/dummy.npz → tests/qp/dummy.npz b/src/qp/projectors/tests/dummy.npz → tests/qp/dummy.npz
diff --git a/...p/projectors/tests/test_projector_base.py → tests/qp/test_projector_base.py b/...p/projectors/tests/test_projector_base.py → tests/qp/test_projector_base.py
@@ -1,6 +1,6 @@
 import qp
+import qp.projectors as proj
 import numpy as np
-import rail_projector.projectors as rp
 
 
 def make_qp_ens(file):
@@ -12,9 +12,9 @@ def make_qp_ens(file):
     return q
 
 def test_base_from_qp():
-    file = np.load('rail_projector/tests/dummy.npz')
+    file = np.load('tests/qp/dummy.npz')
     ens = make_qp_ens(file)
-    projector = rp.ProjectorBase(ens)
+    projector = proj.ProjectorBase.ProjectorBase(ens)
     m, n = projector.pzs.shape
     k, = projector.z.shape
     pzs = file['pzs']
@@ -23,10 +23,10 @@ def test_base_from_qp():
     assert np.allclose(projector.pz_mean, np.mean(pzs, axis=0))
 
 def test_base_from_arrs():
-    file = np.load('rail_projector/tests/dummy.npz')
+    file = np.load('tests/qp/dummy.npz')
     zs = file['zs']
     pzs = file['pzs']
-    projector = rp.ProjectorBase(zs, pzs)
+    projector = proj.ProjectorBase.ProjectorBase(zs, pzs)
     m, n = projector.pzs.shape
     k, = projector.z.shape
     pzs = file['pzs']

diff --git a/...rojectors/tests/test_projector_moments.py → tests/qp/test_projector_moments.py b/...rojectors/tests/test_projector_moments.py → tests/qp/test_projector_moments.py
@@ -1,6 +1,6 @@
 import qp
 import numpy as np
-import rail_projector.projectors as rp
+import qp.projectors as proj
 
 
 def make_qp_ens(file):
@@ -13,9 +13,9 @@ def make_qp_ens(file):
 
 
 def make_projector():
-    file = np.load('rail_projector/tests/dummy.npz')
+    file = np.load('tests/qp/dummy.npz')
     ens = make_qp_ens(file)
-    return rp.ProjectorMoments(ens)
+    return proj.projector_moments.ProjectorMoments(ens)
 
 
 def test_prior():

diff --git a/...projectors/tests/test_projector_shifts.py → tests/qp/test_projector_shifts.py b/...projectors/tests/test_projector_shifts.py → tests/qp/test_projector_shifts.py
@@ -1,6 +1,6 @@
 import qp
 import numpy as np
-import rail_projector.projectors as rp
+import qp.projectors as proj
 
 
 def make_qp_ens(file):
@@ -13,9 +13,9 @@ def make_qp_ens(file):
 
 
 def make_projector():
-    file = np.load('rail_projector/tests/dummy.npz')
+    file = np.load('tests/qp/dummy.npz')
     ens = make_qp_ens(file)
-    return rp.ProjectorShifts(ens)
+    return proj.projector_shifts.ProjectorShifts(ens)
 
 
 def test_prior():