Changed ivoa.ObsCore to dp02_dc2_catalogs.ObsCore for DP0.2 NBs 02c, 13a, and 18. Also updated some of the text to reflect this change in 2c and 13a.

Author: DouglasLeeTucker

DP0.2/02c_Image_Queries_with_TAP.ipynb

@@ -368,58 +368,14 @@
     "del query, results"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "id": "8463597f-8c70-479e-8187-9cbd046db21c",
-   "metadata": {},
-   "source": [
-    "### 2.1. The IVOA schema\n",
-    "\n",
-    "IVOA stands for [International Virtual Observatory Alliance](https://ivoa.net/), and they work towards defining standards\n",
-    "for astronomical data storage that enable wide data sharing.\n",
-    "The LSST Science Pipelines use IVOA standards.\n",
-    "\n",
-    "Retrieve all of the tables available in the `ivoa` schema and display them as a pandas table."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "951f4ae4-c0d4-4064-b10a-e2f1f8add499",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "query = \"SELECT * \" \\\n",
-    "        \"FROM tap_schema.tables \" \\\n",
-    "        \"WHERE tap_schema.tables.schema_name = 'ivoa'\"\n",
-    "results = service.search(query)\n",
-    "results.to_table().to_pandas()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "35361f18-579a-40cc-8caf-af28201869a3",
-   "metadata": {},
-   "source": [
-    "There is only one `ivoa` table available for DP0: `ObsCore`."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5738f062-0e63-43a4-a43e-e8032b4e2e59",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "del query, results"
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "16d98269-9dba-468f-84dc-8c0548926728",
    "metadata": {},
    "source": [
-    "### 2.2. The ObsCore table\n",
+    "### 2.1. The ObsCore table\n",
+    "\n",
+    "The `ObsCore` table schema conforms to the IVOA ([International Virtual Observatory Alliance](https://ivoa.net/)) standards.\n",
     "\n",
     "The LSST `ObsCore` table is essentially a view into the images\n",
     "stored in the LSST's [data butler](https://pipelines.lsst.io/modules/lsst.daf.butler/index.html) registry (e.g., [DMTN-236](https://dmtn-236.lsst.io/)).\n",
@@ -440,7 +396,7 @@
    "source": [
     "query = \"SELECT column_name, datatype, description, unit \" \\\n",
     "        \"FROM tap_schema.columns \" \\\n",
-    "        \"WHERE table_name = 'ivoa.ObsCore'\"\n",
+    "        \"WHERE table_name = 'dp02_dc2_catalogs.ObsCore'\"\n",
     "results = service.search(query)\n",
     "results.to_table().to_pandas()"
    ]
@@ -483,7 +439,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query = \"SELECT * FROM ivoa.ObsCore \"\\\n",
+    "query = \"SELECT * FROM dp02_dc2_catalogs.ObsCore \"\\\n",
     "        \"WHERE CONTAINS(POINT('ICRS', \" + target_str_ra + \\\n",
     "        \", \" + target_str_dec + \"), s_region) = 1\"\n",
     "print(query)"
@@ -1196,7 +1152,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query = \"SELECT * FROM ivoa.ObsCore \"\\\n",
+    "query = \"SELECT * FROM dp02_dc2_catalogs.ObsCore \"\\\n",
     "        \"WHERE CONTAINS(POINT('ICRS', \" + \\\n",
     "        target_str_ra + \", \" + target_str_dec + \"), s_region) = 1 \"\\\n",
     "        \"AND lsst_band = 'i' \"\\\n",
@@ -1901,7 +1857,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query = \"SELECT * FROM ivoa.ObsCore \"\\\n",
+    "query = \"SELECT * FROM dp02_dc2_catalogs.ObsCore \"\\\n",
     "        \"WHERE CONTAINS(POINT('ICRS', \" + \\\n",
     "        target_str_ra + \", \" + target_str_dec + \"), s_region) = 1 \"\\\n",
     "        \"AND lsst_band = 'i' \"\\\n",

DP0.2/13a_Image_Cutout_SciDemo.ipynb

@@ -37,7 +37,7 @@
    "id": "393da88f-7978-4920-aa4a-a9830df6eed9",
    "metadata": {},
    "source": [
-    "**LSST Data Products:** Images (deepCoadd, calexp), catalogs (objectTable, diaObject, truthTables, ivoa.ObsCore)."
+    "**LSST Data Products:** Images (deepCoadd, calexp), catalogs (objectTable, diaObject, truthTables, dp02_dc2_catalogs.ObsCore)."
    ]
   },
   {
@@ -411,7 +411,7 @@
     "\n",
     "        query = \"SELECT access_format, access_url, dataproduct_subtype, \" + \\\n",
     "            \"lsst_visit, lsst_detector, lsst_band \" + \\\n",
-    "            \"FROM ivoa.ObsCore WHERE dataproduct_type = 'image' \" + \\\n",
+    "            \"FROM dp02_dc2_catalogs.ObsCore WHERE dataproduct_type = 'image' \" + \\\n",
     "            \"AND obs_collection = 'LSST.DP02' \" + \\\n",
     "            \"AND dataproduct_subtype = 'lsst.calexp' \" + \\\n",
     "            \"AND lsst_visit = \" + str(dataId[\"visit\"]) + \" \" + \\\n",
@@ -428,7 +428,7 @@
     "\n",
     "        query = \"SELECT access_format, access_url, dataproduct_subtype, \" + \\\n",
     "            \"lsst_patch, lsst_tract, lsst_band \" + \\\n",
-    "            \"FROM ivoa.ObsCore WHERE dataproduct_type = 'image' \" + \\\n",
+    "            \"FROM dp02_dc2_catalogs.ObsCore WHERE dataproduct_type = 'image' \" + \\\n",
     "            \"AND obs_collection = 'LSST.DP02' \" + \\\n",
     "            \"AND dataproduct_subtype = 'lsst.deepCoadd_calexp' \" + \\\n",
     "            \"AND lsst_tract = \" + str(tract) + \" \" + \\\n",
@@ -584,7 +584,7 @@
     "\n",
     "### 2.1 Initiate the TAP service, and define sky coordinates for the image cutout\n",
     "\n",
-    "The TAP service is used to query the ivoa.Obscore table for the datalink (a web URL identifying where the data is hosted)."
+    "The TAP service is used to query the dp02_dc2_catalogs.ObsCore table for the datalink (a web URL identifying where the data is hosted)."
    ]
   },
   {
@@ -627,7 +627,7 @@
    "id": "551c859a-730a-4f4e-811b-6c2a13c4c30d",
    "metadata": {},
    "source": [
-    "The next cell shows the TAP query for the metadata that is associated with the image's remote location in the LSST data archive. The DP0.2 has a schema (table collection) called \"ivoa\", which contains a table called ivoa.ObsCore. The IVOA-defined obscore table contains generic metadata for the DP0.2 datasets. The table is accessible via ADQL queries via a TAP endpoint. The mechanism for locating the images LSST is to use the TAP service to query the ObsCore schema. "
+    "The next cell shows the TAP query for the metadata that is associated with the image's remote location in the LSST data archive. The DP0.2 has a schema (table collection) called \"dp02_dc2_catalogs\", which contains a table called dp02_dc2_catalogs.ObsCore. The IVOA-defined `ObsCore` table contains generic metadata for the DP0.2 datasets. The table is accessible via ADQL queries via a TAP endpoint. The mechanism for locating the images LSST is to use the TAP service to query the `ObsCore` schema. "
    ]
   },
   {
@@ -639,7 +639,7 @@
    "source": [
     "query = \"SELECT lsst_patch, lsst_tract, s_region, \" + \\\n",
     "        \"access_format, access_url, dataproduct_subtype \" + \\\n",
-    "        \"FROM ivoa.ObsCore \" + \\\n",
+    "        \"FROM dp02_dc2_catalogs.ObsCore \" + \\\n",
     "        \"WHERE dataproduct_type = 'image' \" + \\\n",
     "        \"AND obs_collection = 'LSST.DP02' \" + \\\n",
     "        \"AND dataproduct_subtype = 'lsst.deepCoadd_calexp' \" + \\\n",