Merge branch 'tickets/PREOPS-723' of github.com:rubin-dp0/tutorial-notebooks into tickets/PREOPS-723

Author: kadrlica

08b_Interactive_Catalog_Visualization.ipynb

@@ -70,14 +70,13 @@
     "from astropy.coordinates import SkyCoord\n",
     "\n",
     "# LSST imports\n",
-    "from lsst.daf.butler import Butler\n",
-    "from rubin_jupyter_utils.lab.notebook import get_tap_service, retrieve_query\n",
+    "from rubin_jupyter_utils.lab.notebook import get_tap_service\n",
     "\n",
     "# Bokeh and Holoviews for visualization\n",
     "import bokeh\n",
     "from bokeh.io import output_notebook, show\n",
     "from bokeh.models import ColumnDataSource, Range1d, HoverTool\n",
-    "from bokeh.models import Selection, CDSView, GroupFilter\n",
+    "from bokeh.models import CDSView, GroupFilter\n",
     "from bokeh.plotting import figure, gridplot\n",
     "from bokeh.transform import factor_cmap\n",
     "\n",
@@ -175,8 +174,8 @@
    "outputs": [],
    "source": [
     "# Define a reference position on the sky and a radius in arcseconds for a cone search\n",
-    "c1 = SkyCoord(ra=59.7955707*u.degree, dec=-29.91176471*u.degree, frame='icrs')\n",
-    "#radius = 15.882353 * u.arcmin\n",
+    "c1 = SkyCoord(ra=59.79*u.degree, dec=-29.91*u.degree, frame='icrs')\n",
+    "# c1 = SkyCoord(ra=50.65*u.degree, dec=-40.*u.degree, frame='icrs')\n",
     "radius = 0.1 * u.deg"
    ]
   },
@@ -195,22 +194,12 @@
     "        \"WHERE CONTAINS(POINT('ICRS', obj.ra, obj.dec),\"\\\n",
     "        \"CIRCLE('ICRS', \" + str(c1.ra.value) + \", \" + str(c1.dec.value) + \", \" \\\n",
     "        + str(radius.to(u.deg).value) + \" )) = 1 \" \\\n",
-    "        \"AND truth.match_objectid >= 0 \"\\\n",
+    "        \"AND obj.good = 1\"  \\\n",
+    "        \"AND truth.match_objectid >= 0 \" \\\n",
     "        \"AND truth.is_good_match = 1\"\n",
     "# print(query)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "        #    \"obj.psFlux_g, obj.psFlux_r, obj.psFlux_i, obj.cModelFlux_g, \" \\\n",
-    "      #  \"truth.flux_g, truth.flux_r, truth.flux_i, truth.truth_type, \" \\\n",
-    "      #  \"obj.mag_g, obj.mag_r, obj.mag_i, obj.mag_g_cModel, obj.mag_r_cModel, obj.mag_i_cModel,\" \\"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -220,7 +209,7 @@
     "%%time\n",
     "# Execute the query and convert the results to a pandas dataframe\n",
     "data = service.search(query).to_table().to_pandas() \n",
-    "assert len(data)  == 14849 "
+    "assert len(data) == 14803"
    ]
   },
   {
@@ -249,9 +238,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# assert data[data[\"truth_type\"] == \"star\"].shape[0] == 226 # 2164  \n",
-    "# assert data[data[\"truth_type\"] == \"galaxy\"].shape[0] == 10058 # 99932\n",
-    "# assert data[data[\"truth_type\"] == \"SNe\"].shape[0] == 0"
+    "assert data[data[\"truth_type\"] == \"star\"].shape[0] == 331\n",
+    "assert data[data[\"truth_type\"] == \"galaxy\"].shape[0] ==  14472\n",
+    "assert data[data[\"truth_type\"] == \"SNe\"].shape[0] == 0"
    ]
   },
   {
@@ -504,7 +493,7 @@
    "outputs": [],
    "source": [
     "%%opts Scatter [tools=['hover'], toolbar='above',height=400, width=400](color='grey')\n",
-    "hv.Scatter(data).opts(alpha=0.2, size=1)"
+    "hv.Scatter(data).opts(alpha=0.2, size=2)"
    ]
   },
   {