Fixed imports related to issue 154 and updated requirements for dev (#…

…155) * Fixed imports related to issue 154 and updated requirements for dev * style: pre-commit fixes * Updated numba version * Bumped numba version to 0.58, one version down from the problematic 0.59 * style: pre-commit fixes * Updated numpy version in requirements to be more flexible and accomodate dev requirements * Bumbed numpy version causing problems with python 3.11 * style: pre-commit fixes * make explicit imports * add test import * Remove empty test_imports file * Update tutorials with new import structure * fix magnification call in base --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Connor Stone <connorstone628@gmail.com>
Ciela-Institute · Feb 14, 2024 · 61c4c51 · 61c4c51
1 parent 776e991
commit 61c4c51
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -32,10 +32,10 @@ import matplotlib.pyplot as plt
 import caustics
 import torch
 
-cosmology = caustics.cosmology.FlatLambdaCDM()
-sie = caustics.lenses.SIE(cosmology=cosmology, name="lens")
-src = caustics.light.Sersic(name="source")
-lnslt = caustics.light.Sersic(name="lenslight")
+cosmology = caustics.FlatLambdaCDM()
+sie = caustics.SIE(cosmology=cosmology, name="lens")
+src = caustics.Sersic(name="source")
+lnslt = caustics.Sersic(name="lenslight")
 
 x = torch.tensor([
 #   z_s  z_l   x0   y0   q    phi     b    x0   y0   q     phi    n    Re
@@ -44,7 +44,7 @@ x = torch.tensor([
     5.0, -0.2, 0.0, 0.8, 0.0, 1., 1.0, 10.0
 ])  # fmt: skip
 
-minisim = caustics.sims.Lens_Source(
+minisim = caustics.Lens_Source(
     lens=sie, source=src, lens_light=lnslt, pixelscale=0.05, pixels_x=100
 )
 plt.imshow(minisim(x, quad_level=3), origin="lower")

diff --git a/docs/source/intro.md b/docs/source/intro.md
@@ -27,10 +27,10 @@ import matplotlib.pyplot as plt
 import caustics
 import torch
 
-cosmology = caustics.cosmology.FlatLambdaCDM()
-sie = caustics.lenses.SIE(cosmology=cosmology, name="lens")
-src = caustics.light.Sersic(name="source")
-lnslt = caustics.light.Sersic(name="lenslight")
+cosmology = caustics.FlatLambdaCDM()
+sie = caustics.SIE(cosmology=cosmology, name="lens")
+src = caustics.Sersic(name="source")
+lnslt = caustics.Sersic(name="lenslight")
 
 x = torch.tensor([
 #   z_s  z_l   x0   y0   q    phi     b    x0   y0   q     phi    n    Re
@@ -39,7 +39,7 @@ x = torch.tensor([
     5.0, -0.2, 0.0, 0.8, 0.0, 1., 1.0, 10.0
 ])  # fmt: skip
 
-minisim = caustics.sims.Lens_Source(
+minisim = caustics.Lens_Source(
     lens=sie, source=src, lens_light=lnslt, pixelscale=0.05, pixels_x=100
 )
 plt.imshow(minisim(x, quad_level=3), origin="lower")

diff --git a/docs/source/tutorials/BasicIntroduction.ipynb b/docs/source/tutorials/BasicIntroduction.ipynb
@@ -44,7 +44,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "cosmology = caustics.cosmology.FlatLambdaCDM()"
+    "cosmology = caustics.FlatLambdaCDM()"
    ]
   },
   {
@@ -62,7 +62,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "sie = caustics.lenses.SIE(cosmology=cosmology, name=\"lens\")"
+    "sie = caustics.SIE(cosmology=cosmology, name=\"lens\")"
    ]
   },
   {
@@ -80,7 +80,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "src = caustics.light.Sersic(name=\"source\")"
+    "src = caustics.Sersic(name=\"source\")"
    ]
   },
   {
@@ -98,7 +98,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lnslt = caustics.light.Sersic(name=\"lenslight\")"
+    "lnslt = caustics.Sersic(name=\"lenslight\")"
    ]
   },
   {
@@ -116,7 +116,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "minisim = caustics.sims.Lens_Source(\n",
+    "minisim = caustics.Lens_Source(\n",
     "    lens=sie, source=src, lens_light=lnslt, pixelscale=0.05, pixels_x=100\n",
     ")"
    ]

diff --git a/docs/source/tutorials/InvertLensEquation.ipynb b/docs/source/tutorials/InvertLensEquation.ipynb
@@ -42,7 +42,7 @@
    "source": [
     "# initialization stuff for an SIE lens\n",
     "\n",
-    "cosmology = caustics.cosmology.FlatLambdaCDM(name=\"cosmo\")\n",
+    "cosmology = caustics.FlatLambdaCDM(name=\"cosmo\")\n",
     "cosmology.to(dtype=torch.float32)\n",
     "n_pix = 100\n",
     "res = 0.05\n",
@@ -56,7 +56,7 @@
     ")\n",
     "z_l = torch.tensor(0.5, dtype=torch.float32)\n",
     "z_s = torch.tensor(1.5, dtype=torch.float32)\n",
-    "lens = caustics.lenses.SIE(\n",
+    "lens = caustics.SIE(\n",
     "    cosmology=cosmology,\n",
     "    name=\"sie\",\n",
     "    z_l=z_l,\n",

diff --git a/docs/source/tutorials/LensZoo.ipynb b/docs/source/tutorials/LensZoo.ipynb
@@ -38,10 +38,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "cosmology = caustics.cosmology.FlatLambdaCDM()\n",
+    "cosmology = caustics.FlatLambdaCDM()\n",
     "cosmology.to(dtype=torch.float32)\n",
     "z_s = torch.tensor(1.0)\n",
-    "base_sersic = caustics.light.Sersic(\n",
+    "base_sersic = caustics.Sersic(\n",
     "    x0=0.1,\n",
     "    y0=0.1,\n",
     "    q=0.6,\n",
@@ -85,13 +85,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.Point(\n",
+    "lens = caustics.Point(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    th_ein=1.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -126,13 +126,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.SIS(\n",
+    "lens = caustics.SIS(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    th_ein=1.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -170,15 +170,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.SIE(\n",
+    "lens = caustics.SIE(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    q=0.6,\n",
     "    phi=np.pi / 2,\n",
     "    b=1.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -216,7 +216,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.EPL(\n",
+    "lens = caustics.EPL(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
@@ -225,7 +225,7 @@
     "    b=1.0,\n",
     "    t=0.5,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -265,14 +265,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.NFW(\n",
+    "lens = caustics.NFW(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    m=1e13,\n",
     "    c=20.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -314,15 +314,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.TNFW(\n",
+    "lens = caustics.TNFW(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    mass=1e12,\n",
     "    scale_radius=1.0,\n",
     "    tau=3.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -364,15 +364,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.PseudoJaffe(\n",
+    "lens = caustics.PseudoJaffe(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    mass=1e13,\n",
     "    core_radius=5e-1,\n",
     "    scale_radius=15.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -410,14 +410,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.ExternalShear(\n",
+    "lens = caustics.ExternalShear(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    gamma_1=1.0,\n",
     "    gamma_2=-1.0,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",
@@ -453,13 +453,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lens = caustics.lenses.MassSheet(\n",
+    "lens = caustics.MassSheet(\n",
     "    cosmology=cosmology,\n",
     "    x0=0.0,\n",
     "    y0=0.0,\n",
     "    surface_density=1.5,\n",
     ")\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens,\n",
     "    source=base_sersic,\n",
     "    pixelscale=res,\n",

diff --git a/docs/source/tutorials/MultiplaneDemo.ipynb b/docs/source/tutorials/MultiplaneDemo.ipynb
@@ -40,7 +40,7 @@
    "outputs": [],
    "source": [
     "# initialization stuff for lenses\n",
-    "cosmology = caustics.cosmology.FlatLambdaCDM(name=\"cosmo\")\n",
+    "cosmology = caustics.FlatLambdaCDM(name=\"cosmo\")\n",
     "cosmology.to(dtype=torch.float32)\n",
     "n_pix = 100\n",
     "res = 0.5\n",
@@ -73,7 +73,7 @@
     "\n",
     "    for _ in range(N_lenses):\n",
     "        lenses.append(\n",
-    "            caustics.lenses.SIE(\n",
+    "            caustics.SIE(\n",
     "                cosmology=cosmology,\n",
     "                z_l=z_p,\n",
     "                x0=np.random.uniform(-fov / 4.0, fov / 4.0),\n",
@@ -85,12 +85,12 @@
     "        )\n",
     "\n",
     "    planes.append(\n",
-    "        caustics.lenses.SinglePlane(\n",
+    "        caustics.SinglePlane(\n",
     "            z_l=z_p, cosmology=cosmology, lenses=lenses, name=f\"plane_{p}\"\n",
     "        )\n",
     "    )\n",
     "\n",
-    "lens = caustics.lenses.Multiplane(name=\"multiplane\", cosmology=cosmology, lenses=planes)"
+    "lens = caustics.Multiplane(name=\"multiplane\", cosmology=cosmology, lenses=planes)"
    ]
   },
   {

diff --git a/docs/source/tutorials/Parameters.ipynb b/docs/source/tutorials/Parameters.ipynb
@@ -49,19 +49,19 @@
    "outputs": [],
    "source": [
     "# Flat cosmology with all dynamic parameters\n",
-    "cosmo = caustics.cosmology.FlatLambdaCDM(name=\"cosmo\", h0=None, Om0=None)\n",
+    "cosmo = caustics.FlatLambdaCDM(name=\"cosmo\", h0=None, Om0=None)\n",
     "\n",
     "# SIE lens with q and b as static parameters\n",
-    "lens = caustics.lenses.SIE(cosmology=cosmo, q=0.4, b=1.0)\n",
+    "lens = caustics.SIE(cosmology=cosmo, q=0.4, b=1.0)\n",
     "\n",
     "# Sersic with all dynamic parameters except the sersic index, effective radius, and effective brightness\n",
-    "source = caustics.light.Sersic(name=\"source\", n=2.0, Re=1.0, Ie=1.0)\n",
+    "source = caustics.Sersic(name=\"source\", n=2.0, Re=1.0, Ie=1.0)\n",
     "\n",
     "# Sersic with all dynamic parameters except the x position, position angle, and effective radius\n",
-    "lens_light = caustics.light.Sersic(name=\"lenslight\", x0=0.0, phi=1.3, Re=1.0)\n",
+    "lens_light = caustics.Sersic(name=\"lenslight\", x0=0.0, phi=1.3, Re=1.0)\n",
     "\n",
     "# A simulator which captures all these parameters into a single DAG\n",
-    "sim = caustics.sims.Lens_Source(\n",
+    "sim = caustics.Lens_Source(\n",
     "    lens=lens, source=source, lens_light=lens_light, pixelscale=0.05, pixels_x=100\n",
     ")"
    ]

diff --git a/docs/source/tutorials/Playground.ipynb b/docs/source/tutorials/Playground.ipynb
@@ -49,7 +49,7 @@
     ")\n",
     "z_l = torch.tensor(0.5, dtype=torch.float32)\n",
     "z_s = torch.tensor(1.5, dtype=torch.float32)\n",
-    "cosmology = caustics.cosmology.FlatLambdaCDM(name=\"cosmo\")\n",
+    "cosmology = caustics.FlatLambdaCDM(name=\"cosmo\")\n",
     "cosmology.to(dtype=torch.float32)"
    ]
   },
@@ -64,7 +64,7 @@
     "\n",
     "\n",
     "def plot_lens_metrics(thx0, thy0, q, phi, b):\n",
-    "    lens = caustics.lenses.SIE(\n",
+    "    lens = caustics.SIE(\n",
     "        cosmology=cosmology,\n",
     "        z_l=z_l,\n",
     "        x0=thx0,\n",
@@ -143,7 +143,7 @@
     "    Re_src,\n",
     "    Ie_src,\n",
     "):\n",
-    "    lens = caustics.lenses.SIE(\n",
+    "    lens = caustics.SIE(\n",
     "        cosmology,\n",
     "        z_l,\n",
     "        x0=x0_lens,\n",
@@ -152,7 +152,7 @@
     "        phi=phi_lens,\n",
     "        b=b_lens,\n",
     "    )\n",
-    "    source = caustics.light.Sersic(\n",
+    "    source = caustics.Sersic(\n",
     "        x0=x0_src,\n",
     "        y0=y0_src,\n",
     "        q=q_src,\n",