Merge pull request #41 from lsst/tickets/DM-35896

DM-35896: Use gen3 butler in examples

doc/lsst.display.firefly/getting-started-lsp.rst

@@ -34,9 +34,9 @@ Retrieve a simulated LSST image.
 .. code-block:: py
     :name: getting-started-getimage
 
-    from lsst.daf.persistence import Butler
-    butler = Butler('/project/shared/data/Twinkles_subset/output_data_v2')
-    dataId = {'filter': 'r', 'raft': '2,2', 'sensor': '1,1', 'visit': 235}
+    from lsst.daf.butler import Butler
+    butler = Butler('/repo/main', collectiions='output_data_v2')
+    dataId = {'physical_filter': 'r', 'raft': 'R01', 'name_in_raft': 'S01', 'visit': 235}
     calexp = butler.get('calexp', **dataId)
 
 Set the scaling and mask transparency, and display the image.
@@ -73,5 +73,3 @@ Erase the regions while leaving the image and masks displayed.
     :name: getting-started-erase
 
     display1.erase()
-
-

doc/lsst.display.firefly/viewing-footprints.rst

@@ -13,9 +13,9 @@ Define a Butler instance and an identifier for retrieving the data.
 
 .. code-block:: py
 
-    from lsst.daf.persistence import Butler
-    butler = Butler('/datasets/hsc/repo/rerun/RC/w_2019_22/DM-19244/')
-    dataId = dict(filter='HSC-R', tract=9813, patch='4,4')
+    from lsst.daf.butler import Butler
+    butler = Butler('/datasets/hsc/repo/', collections='rerun/RC/w_2019_22/DM-19244/')
+    dataId = dict(pysical_filter='HSC-R', tract=9813, patch=32)
 
 Define bounding boxes for two regions of interest, one for the catalog and
 a somewhat larger one for the image. Use these to retrieve a cutout of
@@ -28,7 +28,7 @@ the coadd image.
                                 dimensions=geom.Extent2I(600,600))
     imageBbox = geom.Box2I(corner=geom.Point2I(16800, 18600),
                            dimensions=geom.Extent2I(800,800))
-    calexp = butler.get('deepCoadd_calexp_sub', dataId=dataId, bbox=imageBbox)
+    calexp = butler.get('deepCoadd_calexp', dataId=dataId, parameters={'bbox'=imageBbox})
 
 Retrieve the entire catalog and then select only those records with pixel
 locations inside the footprints bounding box.