updates

Author: kadrlica

03_Intro_to_AFW_Display.ipynb

@@ -23,7 +23,7 @@
     "\n",
     "This tutorial is designed to help users get a brief feel for the `lsst.afw.display` library that enables the visual inspection of data. The [`lsst.afw` library](https://github.com/lsst/afw) provides an \"Astronomical Framework\" (afw) while the `lsst.daf.*` libraries (see, e.g., [daf_base](https://github.com/lsst/daf_base)) provides a Data Access Framework (daf). Both libraries are used in this tutorial, with the `lsst.daf.persistence` library used to access a calibrated exposure (calexp) and the `lsst.afw.display` library used to show the exposure image on the screen.\n",
     "\n",
-    "**Credit:** This tutorial is based on the [`AFW_Display_Demo.ipynb`](https://github.com/LSSTScienceCollaborations/StackClub/blob/master/Visualization/AFW_Display_Demo.ipynb) notebook originally written by Brant Robertson and maintained by the LSST Stack Club. More examples of the use of `lsst.afw.display` can be found in the [Stack ](https://pipelines.lsst.io/getting-started/display.html).\n",
+    "**Credit:** This tutorial is based on the [`AFW_Display_Demo.ipynb`](https://github.com/LSSTScienceCollaborations/StackClub/blob/master/Visualization/AFW_Display_Demo.ipynb) notebook originally written by Brant Robertson and maintained by the LSST Stack Club. More examples of the use of `lsst.afw.display` can be found in the [LSST Science Pipelines documentation](https://pipelines.lsst.io/getting-started/display.html).\n",
     "\n",
     "### Set Up"
    ]
@@ -125,9 +125,9 @@
     "\n",
     "To display an image, we must first load some data. These data have been processed with the LSST Science Pipelines, and are organized in a structure that enables us to access them through the `Butler`. For more information on the `Butler`, see [lsst.daf.butler](https://pipelines.lsst.io/modules/lsst.daf.butler/index.html).\n",
     "\n",
-    "The DP0.1 data set contains simulated images from the LSST DESC Data Challenge 2 (DC2). These data are available in the data directory `/datasets/DC2/DR6/Run2.2i/patched/2021-02-10/rerun/run2.2i-calexp-v1/`. We access a single image from a specific visit (`512055`), raft (`R20`), and detector (`76`). This happens to be an i-band exposure.\n",
+    "The DP0.1 data set contains simulated images from the LSST DESC Data Challenge 2 (DC2). These data are available in an S3 bucket `s3://butler-us-central1-dp01`. We access a single image from a specific visit (`227982`) and detector (`129`).\n",
     "\n",
-    "Once we define a string that contains the data directory, we start the `Butler` instance using the `lsst.daf.persistence` library alias `dafPersist` and its `Butler` class. The `Butler` object is initialized with a string containing the data directory we wish to access. Running the cell may take a few moments.\n",
+    "Once we define a string that contains the data directory, we start the `Butler` instance using the `lsst.daf.butler` library and its `Butler` class. The `Butler` object is initialized with a string containing the data directory we wish to access. Running the cell may take a few moments.\n",
     "\n",
     "With the `Butler` instance now generated using our data directory, we can retrieve the desired calibrated exposure by telling the butler which filter, CCD, and visit we wish to view. To do this, we definie dictionary with the required information."
    ]
@@ -140,7 +140,7 @@
    "source": [
     "# Note that the keys are slightly different for DC2/LSSTCam \n",
     "# You can view all the keys by creating the butler and calling: print(butler.getKeys('calexp'))\n",
-    "dataId = {'visit': 227982, 'raftName': 'R31', 'detector': 129}\n",
+    "dataId = {'visit': 227982, 'detector': 129}\n",
     "repo = 's3://butler-us-central1-dp01'  \n",
     "collection='2.2i/runs/DP0.1'\n",
     "butler = Butler(repo,collections=collection)\n",

04_Intro_to_Butler.ipynb

@@ -321,7 +321,9 @@
     "# We could pass the datasetRef that we found above, but since the query may \n",
     "# return results in a different order we define the dataId explicitly for reproducibility. \n",
     "dataId = {'visit': '703697', 'detector': 80, 'band':'g'}\n",
-    "calexp = butler.get('calexp',dataId=dataId)"
+    "calexp = butler.get('calexp',dataId=dataId)\n",
+    "\n",
+    "# This will print a warning related to the gen2 to gen3 Butler conversion that was performed on DP0.1"
    ]
   },
   {
@@ -500,7 +502,7 @@
     "    -------\n",
     "    MaskedImage\n",
     "    \"\"\"\n",
-    "    radec = geom.SpherePoint(ra, dec, afwGeom.degrees)\n",
+    "    radec = geom.SpherePoint(ra, dec, geom.degrees)\n",
     "    cutoutSize = geom.ExtentI(cutoutSideLength, cutoutSideLength)\n",
     "\n",
     "    if skymap is None:\n",
@@ -527,7 +529,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ra,dec = 55.064, -29.783 # center of DC2 region\n",
+    "ra,dec = 55.064, -29.783 # center of the DC2 region\n",
     "cutout_image = cutout_coadd(butler,ra,dec,datasetType='deepCoadd', cutoutSideLength=201)\n",
     "print(\"The size of the cutout is: \",cutout_image.image.array.shape)"
    ]