Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit b64e1e8

Browse files
authored
Merge pull request #64 from rubin-dp0/tickets/PREOPS-1224
Updating to w_2022_22
2 parents 4c2f655 + 2650f51 commit b64e1e8

10 files changed

+39
-37
lines changed

01_Intro_to_DP0_Notebooks.ipynb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"source": [
88
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
99
"<b>Introduction to Jupyter Notebooks for Data Preview 0</b> <br>\n",
10-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12<br>\n",
10+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1111
"Contact author: Melissa Graham <br>\n",
1212
"Target audience: All DP0 delegates, especially those new to Notebooks. <br>\n",
1313
"Container Size: medium <br>\n",
@@ -610,7 +610,9 @@
610610
"my_patch_id = my_tract.getSequentialPatchIndex(my_patch)\n",
611611
"print('my_tract = ', my_tract)\n",
612612
"print('my_patch = ', my_patch)\n",
613-
"print('my_patch_id = ',my_patch_id)"
613+
"print('my_patch_id = ',my_patch_id)\n",
614+
"\n",
615+
"# Note: This will trigger a warning from CFITSIO in w_2022_22. This warning can be safely ignored and will be corrected in the future."
614616
]
615617
},
616618
{
@@ -722,7 +724,7 @@
722724
"name": "python",
723725
"nbconvert_exporter": "python",
724726
"pygments_lexer": "ipython3",
725-
"version": "3.8.12"
727+
"version": "3.10.4"
726728
},
727729
"toc-autonumbering": false
728730
},

02_Intermediate_TAP_Query.ipynb

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"source": [
77
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250, style=\"padding: 10px\"> \n",
88
"<b>Intermediate TAP Queries for DP0 catalogs </b> <br>\n",
9-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
9+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1010
"Contact authors: Leanne Guy <br>\n",
1111
"Target audience: All DP0 delegates. <br>\n",
1212
"Container Size: medium <br>\n",
@@ -889,13 +889,6 @@
889889
"source": [
890890
"job.delete()"
891891
]
892-
},
893-
{
894-
"cell_type": "code",
895-
"execution_count": null,
896-
"metadata": {},
897-
"outputs": [],
898-
"source": []
899892
}
900893
],
901894
"metadata": {
@@ -914,7 +907,7 @@
914907
"name": "python",
915908
"nbconvert_exporter": "python",
916909
"pygments_lexer": "ipython3",
917-
"version": "3.8.12"
910+
"version": "3.10.4"
918911
}
919912
},
920913
"nbformat": 4,

03_Image_Display_and_Manipulation.ipynb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"source": [
1111
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
1212
"<b>Displaying images using the LSST astronomical framework (afw) library</b> <br>\n",
13-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
13+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1414
"Contact authors: Alex Drlica-Wagner, Jeff Carlin <br>\n",
1515
"Target audience: All DP0 delegates. <br>\n",
1616
"Container Size: medium <br>\n",
@@ -210,7 +210,9 @@
210210
"butler = Butler(repo, collections=collection)\n",
211211
"\n",
212212
"# Retrieve the data using the `butler` instance and its function `get()`\n",
213-
"calexp = butler.get('calexp', **dataId)"
213+
"calexp = butler.get('calexp', **dataId)\n",
214+
"\n",
215+
"# Note: This will trigger a warning from CFITSIO in w_2022_22. This warning can be safely ignored and will be corrected in the future."
214216
]
215217
},
216218
{
@@ -850,7 +852,7 @@
850852
"name": "python",
851853
"nbconvert_exporter": "python",
852854
"pygments_lexer": "ipython3",
853-
"version": "3.8.12"
855+
"version": "3.10.4"
854856
},
855857
"livereveal": {
856858
"scroll": true,

03b_Image_Display_with_Firefly.ipynb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
88
"<br>\n",
99
"<b>Displaying images using Firefly</b> <br>\n",
10-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
10+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1111
"Contact authors: Jeff Carlin <br>\n",
1212
"Target audience: All DP0 delegates. <br>\n",
1313
"Container Size: medium <br>\n",
@@ -115,7 +115,9 @@
115115
"butler = Butler(repo, collections=collection)\n",
116116
"\n",
117117
"# Retrieve the data using the `butler` instance and its function `get()`\n",
118-
"calexp = butler.get('calexp', **dataId)"
118+
"calexp = butler.get('calexp', **dataId)\n",
119+
"\n",
120+
"# Note: This will trigger a warning from CFITSIO in w_2022_22. This warning can be safely ignored and will be corrected in the future."
119121
]
120122
},
121123
{
@@ -136,7 +138,8 @@
136138
"outputs": [],
137139
"source": [
138140
"afwDisplay.setDefaultBackend('firefly')\n",
139-
"afw_display = afwDisplay.Display(frame=1)"
141+
"afw_display = afwDisplay.Display(frame=1)\n",
142+
"afw_display.getClient().show_lab_tab()"
140143
]
141144
},
142145
{
@@ -486,7 +489,7 @@
486489
"name": "python",
487490
"nbconvert_exporter": "python",
488491
"pygments_lexer": "ipython3",
489-
"version": "3.8.12"
492+
"version": "3.10.4"
490493
}
491494
},
492495
"nbformat": 4,

04_Intro_to_Butler.ipynb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"source": [
77
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
88
"<b>Introduction to the LSST data Butler</b> <br>\n",
9-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
9+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1010
"Contact authors: Alex Drlica-Wagner, Melissa Graham <br>\n",
1111
"Target audience: All DP0 delegates. <br>\n",
1212
"Container Size: medium <br>\n",
@@ -601,8 +601,7 @@
601601
"dataId = {'visit': '703697', 'detector': 80, 'band': 'g'}\n",
602602
"calexp = butler.get('calexp', dataId=dataId)\n",
603603
"\n",
604-
"# This will print a warning related to the gen2 to gen3 Butler conversion.\n",
605-
"# It is ok to ignore this warning for DP0.1."
604+
"# Note: This will trigger a warning from CFITSIO in w_2022_22. This warning can be safely ignored and will be corrected in the future."
606605
]
607606
},
608607
{
@@ -1007,7 +1006,7 @@
10071006
"name": "python",
10081007
"nbconvert_exporter": "python",
10091008
"pygments_lexer": "ipython3",
1010-
"version": "3.8.12"
1009+
"version": "3.10.4"
10111010
}
10121011
},
10131012
"nbformat": 4,

05_Intro_to_Source_Detection.ipynb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"source": [
77
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
88
"<b>Introduction to Source Detection</b> <br>\n",
9-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
9+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1010
"Contact author: Alex Drlica-Wagner, Melissa Graham <br>\n",
1111
"Target audience: All DP0 delegates. <br>\n",
1212
"Container Size: medium <br>\n",
@@ -85,7 +85,9 @@
8585
"from lsst.pipe.tasks.calibrate import CalibrateTask\n",
8686
"from lsst.meas.algorithms.detection import SourceDetectionTask\n",
8787
"from lsst.meas.deblender import SourceDeblendTask\n",
88-
"from lsst.meas.base import SingleFrameMeasurementTask"
88+
"from lsst.meas.base import SingleFrameMeasurementTask\n",
89+
"\n",
90+
"# Note: This will trigger a warning from CFITSIO in w_2022_22. This warning can be safely ignored and will be corrected in the future."
8991
]
9092
},
9193
{
@@ -898,7 +900,7 @@
898900
"name": "python",
899901
"nbconvert_exporter": "python",
900902
"pygments_lexer": "ipython3",
901-
"version": "3.8.12"
903+
"version": "3.10.4"
902904
}
903905
},
904906
"nbformat": 4,

06_Comparing_Object_and_Truth_Tables.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
99
"<br>\n",
1010
"<b>Comparing Object and Truth Tables</b> <br>\n",
11-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
11+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1212
"Contact author: Jeff Carlin <br>\n",
1313
"Target audience: All DP0 delegates. <br>\n",
1414
"Container Size: medium <br>\n",
@@ -424,7 +424,7 @@
424424
"name": "python",
425425
"nbconvert_exporter": "python",
426426
"pygments_lexer": "ipython3",
427-
"version": "3.8.12"
427+
"version": "3.10.4"
428428
}
429429
},
430430
"nbformat": 4,

08a_Interactive_Image_Visualization.ipynb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"<b><img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250, style=\"padding: 10px\"> \n",
88
"<p><p><p><p><p><p>\n",
99
"<b>Interactive Image Visualization</b> <br>\n",
10-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
10+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1111
"Contact authors: Leanne Guy <br>\n",
1212
"Target audience: All DP0 delegates. <br>\n",
1313
"Minimum Container Size: medium <br>\n",
@@ -172,8 +172,9 @@
172172
"calexpId = {'visit': 192350, 'detector': 175, 'band': 'i'}\n",
173173
"calexp = butler.get('calexp', calexpId)\n",
174174
"assert calexp is not None\n",
175-
"f\"Visit: {calexp.visitInfo.getExposureId()}, Band:{calexp.getFilterLabel().bandLabel}, \\\n",
176-
"Detector: {calexp.detector.getId()}\""
175+
"print(f\"Visit: {calexp.info.getId()}, Band:{calexp.getFilterLabel().bandLabel}, Detector: {calexp.detector.getId()}\")\n",
176+
"\n",
177+
"# Note: This will trigger a warning from CFITSIO in w_2022_22. This warning can be safely ignored and will be corrected in the future."
177178
]
178179
},
179180
{
@@ -541,7 +542,7 @@
541542
"name": "python",
542543
"nbconvert_exporter": "python",
543544
"pygments_lexer": "ipython3",
544-
"version": "3.8.12"
545+
"version": "3.10.4"
545546
}
546547
},
547548
"nbformat": 4,

08b_Interactive_Catalog_Visualization.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"<b><img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250, style=\"padding: 10px\"> \n",
88
"<p><p><p><p><p><p>\n",
99
"<b>Interactive Catalog Visualization</b> <br>\n",
10-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
10+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1111
"Contact authors: Leanne Guy <br>\n",
1212
"Target audience: All DP0 delegates. <br>\n",
1313
"Minimum Container Size: medium <br>\n",
@@ -379,7 +379,7 @@
379379
"outputs": [],
380380
"source": [
381381
"(ra_bin, count) = np.histogram(data20K['ra'], bins='fd')\n",
382-
"ra_distribution = hv.Histogram(ra_bin, count).opts(\n",
382+
"ra_distribution = hv.Histogram((ra_bin, count)).opts(\n",
383383
" title=\"RA distribution\",color='darkmagenta', \n",
384384
" xlabel='RA', fontscale=1.2,\n",
385385
" height=400, width=400)"
@@ -1104,7 +1104,7 @@
11041104
"name": "python",
11051105
"nbconvert_exporter": "python",
11061106
"pygments_lexer": "ipython3",
1107-
"version": "3.8.12"
1107+
"version": "3.10.4"
11081108
}
11091109
},
11101110
"nbformat": 4,

09_Single_Star_Lightcurve_with_Butler.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"<img align=\"left\" src = https://project.lsst.org/sites/default/files/Rubin-O-Logo_0.png width=250 style=\"padding: 10px\"> \n",
99
"<br>\n",
1010
"<b>Single Star Lightcurve with the Butler</b> <br>\n",
11-
"Last verified to run on 2022-04-18 with LSST Science Pipelines release w_2022_12 <br>\n",
11+
"Last verified to run on 2022-05-31 with LSST Science Pipelines release w_2022_22<br>\n",
1212
"Contact authors: Melissa Graham, Jeff Carlin <br>\n",
1313
"Target audience: All DP0 delegates. <br>\n",
1414
"Container Size: medium <br>\n",
@@ -789,7 +789,7 @@
789789
"name": "python",
790790
"nbconvert_exporter": "python",
791791
"pygments_lexer": "ipython3",
792-
"version": "3.8.12"
792+
"version": "3.10.4"
793793
}
794794
},
795795
"nbformat": 4,

0 commit comments

Comments
 (0)