Removed columns from Qserv query that are not using in NB; modified several options

Author: Leanne Guy

08b_Interactive_Catalog_Visualization.ipynb

@@ -177,7 +177,7 @@
     "# 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",
-    "radius = 6 * u.arcmin"
+    "radius = 0.1 * u.deg"
    ]
   },
   {
@@ -186,14 +186,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "query = \"SELECT obj.ra, obj.dec, obj.objectId, obj.mag_g, obj.mag_r, \" \\\n",
-    "        \"obj.mag_i, obj.mag_g_cModel, obj.mag_r_cModel, obj.mag_i_cModel,\" \\\n",
-    "        \"obj.psFlux_g, obj.psFlux_r, obj.psFlux_i, obj.cModelFlux_g, \" \\\n",
-    "        \"obj.cModelFlux_r, obj.cModelFlux_i, obj.tract, obj.patch, \" \\\n",
-    "        \"obj.extendedness, obj.good, obj.clean, \" \\\n",
-    "        \"truth.mag_r as truth_mag_r, truth.match_objectId, \"\\\n",
-    "        \"truth.flux_g, truth.flux_r, truth.flux_i, truth.truth_type, \" \\\n",
-    "        \"truth.match_sep, truth.is_variable \" \\\n",
+    "query = \"SELECT obj.ra, obj.dec, obj.objectId, \"\\\n",
+    "        \"obj.mag_g_cModel, obj.mag_r_cModel, obj.mag_i_cModel, \"\\\n",
+    "        \"truth_type, truth.match_objectId \" \\\n",
     "        \"FROM dp01_dc2_catalogs.object as obj \" \\\n",
     "        \"JOIN dp01_dc2_catalogs.truth_match as truth \" \\\n",
     "        \"ON truth.match_objectId = obj.objectId \" \\\n",
@@ -205,6 +200,17 @@
     "# 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,
@@ -214,7 +220,16 @@
     "%%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) == 10284 # 102096"
+    "# assert len(data) == 14589 # 10284 # 102096"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "len(data)"
    ]
   },
   {
@@ -346,11 +361,11 @@
     "# Slice the data and set some moore options\n",
     "skyplot = hv.Scatter(data[[\"ra\", \"dec\"]]).opts(\n",
     "    title=\"Skyplot\", toolbar='above', tools = ['hover'], \n",
-    "    height=350, width=350) \n",
+    "    height=350, width=350, alpha=0.2, size=2) \n",
     "\n",
     "# Construct a layout using the `+` operator\n",
     "skyplots = skyplot + \\\n",
-    "           skyplot[59.67:60.07, -30.71:-29.78].opts(\n",
+    "           skyplot[59.75:60.07, -30.71:-29.95].opts(\n",
     "    title=\"Skyplot region\", tools=[]) + \\\n",
     "           ra_distribution.options(height=350, width=350)"
    ]
@@ -385,15 +400,15 @@
    "outputs": [],
    "source": [
     "# Bokeh specific customizations as a python dictionary \n",
-    "plot_style_bkh = dict(alpha=0.4, color='darkmagenta', \n",
-    "                      marker='triangle', size=3,\n",
+    "plot_style_bkh = dict(alpha=0.2, color='darkmagenta', \n",
+    "                      marker='triangle', size=2,\n",
     "                      xticks=5, yticks=5,\n",
     "                      height=400, width=400, \n",
     "                      toolbar='above')\n",
     "\n",
     "# Matplotlib specific customizations\n",
     "plot_style_mpl = dict(alpha=0.2, color='c', marker='s', \n",
-    "                      fig_size = 200, s=3, \n",
+    "                      fig_size = 200, s=2, \n",
     "                      fontsize=14, xticks=8, yticks=8)"
    ]
   },
@@ -498,7 +513,7 @@
    "outputs": [],
    "source": [
     "%%opts Scatter [tools=['hover'], toolbar='above',height=400, width=400](color='grey')\n",
-    "hv.Scatter(data)"
+    "hv.Scatter(data).opts(alpha=0.2, size=1)"
    ]
   },
   {
@@ -535,7 +550,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "hv.Scatter(data).opts(tools=[raDecHover], **plot_style_bkh)"
+    "hv.Scatter(data).opts(tools=[raDecHover], \n",
+    "                      **plot_style_bkh)"
    ]
   },
   {
@@ -640,31 +656,28 @@
     "stars = CDSView(source=source,\n",
     "                filters=[GroupFilter(column_name='truth_type', group=\"star\")])\n",
     "\n",
-    "left = figure(tools=tools_left, plot_width=400, plot_height=400,\n",
-    "              output_backend=\"webgl\",\n",
+    "left = figure(tools=tools_left, \n",
+    "              plot_width=400, plot_height=400,\n",
     "              title='Spatial: Centered on (RA, Dec) = (%.2f, %.2f)' %\n",
     "              (c1.ra.value, c1.dec.value))\n",
     "left.circle('x0', 'y0', hover_color='firebrick', \n",
-    "            source=source, view=stars, # select only stars\n",
-    "            selection_fill_color='steelblue',\n",
-    "            selection_line_color='steelblue',\n",
-    "            nonselection_fill_color='silver',\n",
-    "            nonselection_line_color='silver')\n",
+    "            size=2, alpha=0.5,\n",
+    "            source=source, \n",
+    "            view=stars # select only stars\n",
+    "           )\n",
     "left.x_range = Range1d(0.15, -0.15)\n",
     "left.y_range = Range1d(-0.15, 0.15)\n",
     "left.xaxis.axis_label = 'Delta RA'\n",
     "left.yaxis.axis_label = 'Delta DEC'\n",
     "\n",
     "# create another new plot and add a renderer\n",
     "right = figure(tools=tools_right, plot_width=400, plot_height=400, \n",
-    "               output_backend=\"webgl\",\n",
     "               title='CMD')\n",
     "right.circle('x1', 'y1', hover_color='firebrick', \n",
-    "             source=source, view=stars,  # Select only stars\n",
-    "             selection_fill_color='steelblue',\n",
-    "             selection_line_color='steelblue',\n",
-    "             nonselection_fill_color='silver',\n",
-    "             nonselection_line_color='silver')\n",
+    "             size=2, alpha=0.5,\n",
+    "             source=source, \n",
+    "             view=stars  # Select only stars\n",
+    "            )\n",
     "right.x_range = Range1d(-1.5, 2.5)\n",
     "right.y_range = Range1d(32., 16.)\n",
     "right.xaxis.axis_label = 'g - r'\n",
@@ -793,7 +806,7 @@
     "           x_range=(-2.0, 3.0), y_range=(-2.0, 3.0),\n",
     "           **plot_options)\n",
     "p.circle(x='gmr', y='rmi', source=source,\n",
-    "         size=3, alpha=0.3,\n",
+    "         size=1, alpha=0.1,\n",
     "         hover_color='firebrick',\n",
     "         legend_field=\"truth_type\",\n",
     "         color=factor_cmap('truth_type', 'Category10_3',\n",