final version

Author: MelissaGraham

DP1/300_Science_Demos/306_Extragalactic_transients/306_3_Cross_match_queries.ipynb

@@ -206,15 +206,7 @@
   {
    "cell_type": "markdown",
    "id": "d1b736d4-03d4-4fe2-9d47-a086b75cb25e",
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2025-07-12T20:54:42.295267Z",
-     "iopub.status.busy": "2025-07-12T20:54:42.294407Z",
-     "iopub.status.idle": "2025-07-12T20:54:42.300822Z",
-     "shell.execute_reply": "2025-07-12T20:54:42.300205Z",
-     "shell.execute_reply.started": "2025-07-12T20:54:42.295227Z"
-    }
-   },
+   "metadata": {},
    "source": [
     "Option to view the table."
    ]
@@ -285,7 +277,11 @@
     "\n",
     "Upload the table to the TAP service and join it with the `DiaObject` table.\n",
     "\n",
-    "Use a spatial cross-match radius of 0.5 arcsec (0.00014 deg), and impose the constraint that only matched `DiaObjects` that were detected more than 10 times are returned."
+    "Use a spatial cross-match radius of 0.5 arcsec (0.00014 deg), and impose the constraint that only matched `DiaObjects` that were detected more than 10 times are returned (`nDiaSources` > 10).\n",
+    "\n",
+    "Also return the `DISTANCE()`, the radial distance in degrees, between the target and the `DiaObject`.\n",
+    "In this scenario, all matches to the `DiaObject` table are exact matches to known `DiaObjects`, so\n",
+    "all distances will be 0.0, but in other scenarios it would be informative."
    ]
   },
   {
@@ -333,6 +329,14 @@
     "dia_objects = job.fetch_result().to_table()"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "ea8c6ee8-582c-4d76-ab35-94dc8aaaa1c5",
+   "metadata": {},
+   "source": [
+    "Show the table of the 13 matched `DiaObjects`."
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -463,58 +467,10 @@
   },
   {
    "cell_type": "markdown",
-   "id": "5de2d0b7-df38-4fcc-9f40-30dfd13b0b20",
+   "id": "f14e55e2-b4ed-4642-8d98-0f63dda10be3",
    "metadata": {},
    "source": [
-    "### 3.3. Plot light curves\n",
-    "\n",
-    "Show the first six light curves."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d30ff9ff-44d9-414c-865c-cd2c04ec29fd",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "fig, ax = plt.subplots(3, 2, figsize=(8, 6), sharey=False, sharex=False)\n",
-    "x = 0\n",
-    "for i in range(3):\n",
-    "    for j in range(2):\n",
-    "        for f, filt in enumerate(filter_names):\n",
-    "            dx = np.where(fsodo_table['diaObjectId'] == dia_objects['diaObjectId'][x])\n",
-    "            lc = fsodo_table[dx]\n",
-    "            fx = np.where(lc['band'] == filt)[0]\n",
-    "            ax[i, j].plot(lc['expMidptMJD'][fx], lc['psfDiffFlux'][fx],\n",
-    "                          filter_symbols[filt], ms=5, mew=0, alpha=0.5,\n",
-    "                          color=filter_colors[filt])\n",
-    "            del dx, fx\n",
-    "        ax[i, j].set_title(dia_objects['diaObjectId'][x])\n",
-    "        del lc\n",
-    "        if i == 2:\n",
-    "            ax[i, j].xaxis.set_label_text('MJD (days)')\n",
-    "        if j == 0:\n",
-    "            ax[i, j].yaxis.set_label_text('Diff Flux (nJy)')\n",
-    "        x += 1\n",
-    "plt.tight_layout()\n",
-    "plt.show()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "4e7a87a5-591e-40bd-bc84-6b4684086c22",
-   "metadata": {
-    "execution": {
-     "iopub.execute_input": "2025-07-11T23:08:26.897157Z",
-     "iopub.status.busy": "2025-07-11T23:08:26.896523Z",
-     "iopub.status.idle": "2025-07-11T23:08:26.900745Z",
-     "shell.execute_reply": "2025-07-11T23:08:26.900226Z",
-     "shell.execute_reply.started": "2025-07-11T23:08:26.897137Z"
-    }
-   },
-   "source": [
-    "> **Figure 2**: The first six light curves."
+    "See Section 5 for a demonstration of how to plot light curves using the retrieved forced photometry."
    ]
   },
   {
@@ -532,7 +488,7 @@
    "id": "e1a38fc2-7157-44be-a46e-65a7d7034959",
    "metadata": {},
    "source": [
-    "## 4. Query in one step with table join\n",
+    "## 4. Query in one step (table join)\n",
     "\n",
     "Combine the two steps of Section 3 into a single query with table joins.\n",
     "\n",
@@ -609,10 +565,72 @@
     "The `fsodo_table_2` table contains the same data as the `fsodo_table` from Section 3.2."
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "754d3933-7f37-4760-be40-5d7d87d85380",
+   "metadata": {},
+   "source": [
+    "## 5. Plot light curves\n",
+    "\n",
+    "How to plot light curves is also demonstrated in other tutorials.\n",
+    "\n",
+    "First get the identifiers of the unique `DiaObjects` for which forced photometry was returned."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "7a7abda0-06e9-4a8d-9a1c-304e5836496e",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "unique_dia_obj_id = np.unique(fsodo_table_2['diaObjectId'])\n",
+    "assert len(unique_dia_obj_id) == 13\n",
+    "print(len(unique_dia_obj_id))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ece45d82-9c46-4933-8017-7943fbda2f61",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "fig, ax = plt.subplots(3, 2, figsize=(8, 6), sharey=False, sharex=False)\n",
+    "x = 0\n",
+    "for i in range(3):\n",
+    "    for j in range(2):\n",
+    "        for f, filt in enumerate(filter_names):\n",
+    "            dx = np.where(fsodo_table_2['diaObjectId'] == unique_dia_obj_id[x])\n",
+    "            lc = fsodo_table_2[dx]\n",
+    "            fx = np.where(lc['band'] == filt)[0]\n",
+    "            ax[i, j].plot(lc['expMidptMJD'][fx], lc['psfDiffFlux'][fx],\n",
+    "                          filter_symbols[filt], ms=5, mew=0, alpha=0.5,\n",
+    "                          color=filter_colors[filt])\n",
+    "            del dx, fx\n",
+    "        ax[i, j].set_title(unique_dia_obj_id[x])\n",
+    "        del lc\n",
+    "        if i == 2:\n",
+    "            ax[i, j].xaxis.set_label_text('MJD (days)')\n",
+    "        if j == 0:\n",
+    "            ax[i, j].yaxis.set_label_text('Diff Flux (nJy)')\n",
+    "        x += 1\n",
+    "plt.tight_layout()\n",
+    "plt.show()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "13980e34-720d-45f6-8203-aafd3cc81f9f",
+   "metadata": {},
+   "source": [
+    "> **Figure 2**: The first six light curves."
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "a4409ee3-913a-4b26-b011-7f2377505def",
+   "id": "554754c2-4520-4b2f-bacb-a7abf485eec2",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -622,7 +640,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "248dcf99-df74-4f63-9cd2-ef30ad01adc7",
+   "id": "554ccd20-3008-46e7-94b9-583412eef179",
    "metadata": {},
    "outputs": [],
    "source": []