Clean up more data utilities

dirac-institute · Sep 9, 2024 · 4955eda · 4955eda
1 parent f6770b7
commit 4955eda
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 815 deletions.
diff --git a/notebooks/Kbmod_Reference.ipynb b/notebooks/Kbmod_Reference.ipynb
@@ -181,7 +181,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from kbmod.data_interface import load_deccam_layered_image\n",
+    "from kbmod.file_utils import load_deccam_layered_image\n",
     "\n",
     "im = load_deccam_layered_image(im_file, p)\n",
     "print(f\"Loaded a {im.get_width()} by {im.get_height()} image at time {im.get_obstime()}\")"
@@ -526,13 +526,6 @@
     "# These top_results are all be duplicating searches on the same bright object we added.\n",
     "top_results[:20]"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

diff --git a/notebooks/kbmod_search_results_for_fakes.ipynb b/notebooks/kbmod_search_results_for_fakes.ipynb
@@ -32,7 +32,6 @@
     "import os\n",
     "\n",
     "from kbmod.analysis.plotting import *\n",
-    "from kbmod.data_interface import load_deccam_layered_image\n",
     "from kbmod.search import ImageStack, PSF, StampCreator, Trajectory\n",
     "from kbmod.results import Results\n",
     "from kbmod.work_unit import WorkUnit\n",
@@ -260,9 +259,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Wilson’s KBMOD Analysis",
+   "display_name": "Jeremy's KBMOD",
    "language": "python",
-   "name": "wbeebe_kbmod_analysis"
+   "name": "kbmod_jk"
   },
   "language_info": {
    "codemirror_mode": {
@@ -274,7 +273,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/kbmod_visualize.ipynb b/notebooks/kbmod_visualize.ipynb
@@ -30,7 +30,7 @@
     "import os\n",
     "\n",
     "from kbmod.analysis.plotting import *\n",
-    "from kbmod.data_interface import load_deccam_layered_image\n",
+    "from kbmod.file_utils import load_deccam_layered_image\n",
     "from kbmod.search import ImageStack, PSF, StampCreator, Trajectory\n",
     "from kbmod.results import Results\n",
     "\n",

diff --git a/src/kbmod/__init__.py b/src/kbmod/__init__.py
@@ -87,7 +87,6 @@ def is_interactive():
 
 from . import (  # noqa: F401
     analysis,
-    data_interface,
     file_utils,
     filters,
     jointfit_functions,

diff --git a/src/kbmod/data_interface.py b/src/kbmod/data_interface.py