fix notebooks

thomaswmorris · Aug 27, 2023 · 1bcd684 · 1bcd684
1 parent d02fbdf
commit 1bcd684
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 25 deletions.
diff --git a/docs/source/tutorials/atmosphere.ipynb b/docs/source/tutorials/atmosphere.ipynb
@@ -38,7 +38,7 @@
     "AtLAST = maria.get_array(\"MUSTANG-2\", \n",
     "                         primary_size=200)\n",
     "\n",
-    "daisy_scan = maria.get_pointing(\"DAISY-2deg\", \n",
+    "daisy_scan = maria.get_pointing(\"daisy\", \n",
     "                                integration_time=60,\n",
     "                                coord_center=[0,90],\n",
     "                                coord_frame=\"az_el\")\n",

diff --git a/docs/source/tutorials/customizing.ipynb b/docs/source/tutorials/customizing.ipynb
@@ -38,7 +38,7 @@
     "AtLAST = maria.get_array(\"MUSTANG-2\", \n",
     "                         primary_size=200)\n",
     "\n",
-    "daisy_scan = maria.get_pointing(\"DAISY-2deg\", \n",
+    "daisy_scan = maria.get_pointing(\"daisy\", \n",
     "                                integration_time=60,\n",
     "                                coord_center=[0,90],\n",
     "                                coord_frame=\"az_el\")\n",

diff --git a/docs/source/tutorials/getting-started.ipynb b/docs/source/tutorials/getting-started.ipynb
@@ -10,16 +10,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "id": "16efcfb6",
    "metadata": {},
    "outputs": [],
    "source": [
+    "import maria\n",
     "from maria import Simulation\n",
     "\n",
     "sim = Simulation(\n",
     "    array     = 'MUSTANG-2',       # Array type\n",
-    "    pointing  = 'DAISY-2deg',      # Scanning strategy \n",
+    "    pointing  = 'daisy',      # Scanning strategy \n",
     "    site      = 'GBT',             # Site\n",
     "    atm_model = 'linear_angular',  # The atmospheric model, set to None if you want a noiseless observation.\n",
     ")   \n"
@@ -66,7 +67,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "daisy_scan = maria.get_pointing(\"DAISY-2deg\")\n",
+    "daisy_scan = maria.get_pointing(\"daisy\")\n",
     "daisy_scan.description"
    ]
   },
@@ -80,23 +81,6 @@
     "daisy_scan.scan_radius"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "542b3f89",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "plt.figure(figsize=(4,4))\n",
-    "\n",
-    "plt.plot(np.degrees(daisy_scan.ra), \n",
-    "         np.degrees(daisy_scan.dec),\n",
-    "         lw=5e-1)\n",
-    "\n",
-    "plt.xlabel(r'RA (degrees)')\n",
-    "plt.ylabel(r'Dec. (degrees)')"
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "352f68d6",

diff --git a/docs/source/tutorials/ingredients.ipynb b/docs/source/tutorials/ingredients.ipynb
@@ -62,7 +62,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "daisy_scan = maria.get_pointing(\"DAISY-2deg\")\n",
+    "daisy_scan = maria.get_pointing(\"daisy\")\n",
     "daisy_scan.description"
    ]
   },

diff --git a/docs/source/tutorials/mock-observations.ipynb b/docs/source/tutorials/mock-observations.ipynb
@@ -73,7 +73,7 @@
     "    # Mandatory minimal weither settings\n",
     "    # ---------------------\n",
     "    array     = 'MUSTANG-2',       # Array type\n",
-    "    pointing  = 'DAISY-2deg',      # Scanning strategy \n",
+    "    pointing  = 'daisy',      # Scanning strategy \n",
     "    site      = 'GBT',             # Site\n",
     "    atm_model = 'linear_angular',  # The atmospheric model, set to None if you want a noiseless observation.\n",
     "    # atm_model = None,              # The atmospheric model, set to None if you want a noiseless observation.\n",

diff --git a/maria/mock_obs.py b/maria/mock_obs.py
@@ -11,7 +11,7 @@
 from . import utils
 
 class WeObserve:
-    def __init__(self, project, skymodel, array_name='AtLAST', pointing_name='DAISY-2deg_4ra_10.5dec_600s', site_name='APEX', verbose=True, cmb = False, **kwargs):
+    def __init__(self, project, skymodel, array_name='AtLAST', pointing_name='daisy_4ra_10.5dec_600s', site_name='APEX', verbose=True, cmb = False, **kwargs):
 
         self.verbose   = verbose
         self.file_name = skymodel