Skip to content

Commit

Permalink
Merge pull request #12 from lsst-sitcom/202402_changes
Browse files Browse the repository at this point in the history
202402 changes
  • Loading branch information
mareuter authored Nov 1, 2024
2 parents 36855fc + 57303d9 commit fa0ba90
Show file tree
Hide file tree
Showing 14 changed files with 1,044 additions and 53 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,6 @@ dmypy.json

reports
DSM_Report*.ipynb

.DS_Store

28 changes: 14 additions & 14 deletions notebooks/base-teststand/auxtel/MakePlaylists.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"source": [
"# Create default playlist\n",
"playlist = BTS_PLAYLISTS[\"default\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"default.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"default\",\n",
" folder=playlist.daq_folder,\n",
" images=playlist.get_image_names_as_string(),\n",
" timeout=60)\n",
Expand All @@ -76,7 +76,7 @@
"source": [
"# Create bias playlist\n",
"playlist = BTS_PLAYLISTS[\"bias\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias\",\n",
" folder=playlist.daq_folder,\n",
" images=playlist.get_image_names_as_string(),\n",
" timeout=60)\n",
Expand All @@ -92,7 +92,7 @@
"source": [
"# Create dark playlist\n",
"playlist = BTS_PLAYLISTS[\"dark\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"dark.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"dark\",\n",
" folder=playlist.daq_folder,\n",
" images=playlist.get_image_names_as_string(),\n",
" timeout=60)\n",
Expand All @@ -108,7 +108,7 @@
"source": [
"# Create flat playlist\n",
"playlist = BTS_PLAYLISTS[\"flat\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"flat.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"flat\",\n",
" folder=playlist.daq_folder,\n",
" images=playlist.get_image_names_as_string(),\n",
" timeout=60)\n",
Expand All @@ -128,13 +128,13 @@
"biases = BTS_PLAYLISTS[\"bias\"]\n",
"darks = BTS_PLAYLISTS[\"dark\"]\n",
"flats = BTS_PLAYLISTS[\"flat\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias_dark.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias_dark\",\n",
" folder=biases.daq_folder,\n",
" images=\":\".join(biases.get_image_names() +\n",
" darks.get_image_names()),\n",
" timeout=60)\n",
"print(ack)\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias_dark_flat.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias_dark_flat\",\n",
" folder=biases.daq_folder,\n",
" images=\":\".join(biases.get_image_names() +\n",
" darks.get_image_names() +\n",
Expand All @@ -152,7 +152,7 @@
"source": [
"# Create ptc playlist\n",
"playlist = BTS_PLAYLISTS[\"ptc\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"ptc.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"ptc\",\n",
" folder=playlist.daq_folder,\n",
" images=playlist.get_image_names_as_string(),\n",
" timeout=60)\n",
Expand All @@ -170,7 +170,7 @@
"biases = BTS_PLAYLISTS[\"bias\"]\n",
"darks = BTS_PLAYLISTS[ \"dark\"]\n",
"ptcs = BTS_PLAYLISTS[\"ptc\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias_dark_ptc.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"bias_dark_ptc\",\n",
" folder=biases.daq_folder,\n",
" images=\":\".join(biases.get_image_names() +\n",
" darks.get_image_names() +\n",
Expand All @@ -188,7 +188,7 @@
"source": [
"# Create CWFS playlist\n",
"playlist = BTS_PLAYLISTS[\"cwfs\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"cwfs-test_take_sequence.plist\",\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=\"cwfs-test_take_sequence\",\n",
" folder=playlist.daq_folder,\n",
" images=playlist.get_image_names_as_string(),\n",
" timeout=60)\n",
Expand All @@ -203,7 +203,7 @@
"outputs": [],
"source": [
"# Create LATISS image sequence for acquisition and verification\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_acquisition_with_verification.plist\"\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_acquisition_with_verification\"\n",
"playlist = BTS_PLAYLISTS[\"verify\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=playlist_name,\n",
" folder=playlist.daq_folder,\n",
Expand All @@ -220,7 +220,7 @@
"outputs": [],
"source": [
"# Create LATISS image sequence\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_sequence.plist\"\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_sequence\"\n",
"playlist = BTS_PLAYLISTS[\"test\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=playlist_name,\n",
" folder=playlist.daq_folder,\n",
Expand All @@ -237,7 +237,7 @@
"outputs": [],
"source": [
"# Create LATISS image sequence for pointing acquisition\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_acquisition_pointing.plist\"\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_acquisition_pointing\"\n",
"playlist = BTS_PLAYLISTS[\"pointing\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=playlist_name,\n",
" folder=playlist.daq_folder,\n",
Expand All @@ -254,7 +254,7 @@
"outputs": [],
"source": [
"# Create LATISS nominal image sequence\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_acquisition_nominal.plist\"\n",
"playlist_name = \"latiss_acquire_and_take_sequence-test_take_acquisition_nominal\"\n",
"playlist = BTS_PLAYLISTS[\"standard_visit\"]\n",
"ack = await ATCamera.cmd_playlist.set_start(playlist=playlist_name,\n",
" folder=playlist.daq_folder,\n",
Expand Down Expand Up @@ -288,7 +288,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.10"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
12 changes: 6 additions & 6 deletions notebooks/general/AuxTel/CheckHeader.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"efd_name = se.get_efd()\n",
"collections = [\"LATISS/raw/all\"]\n",
"instrument = \"LATISS\"\n",
"butler = dafButler.Butler(instrument, collections=collections, instrument=instrument)\n",
"butler = dafButler.Butler(\"/repo/embargo\", collections=collections, instrument=instrument)\n",
"client = EfdClient(efd_name)"
]
},
Expand All @@ -63,10 +63,10 @@
"metadata": {},
"outputs": [],
"source": [
"obs_date = 20210804\n",
"seq_num = 218\n",
"dataId = {\"instrument\": instrument, \"detector\": 0,\n",
" \"exposure.day_obs\": obs_date, \"exposure.seq_num\": seq_num}\n",
"obs_date = 20230321\n",
"seq_num = 53\n",
"records = butler.registry.queryDimensionRecords(\"exposure\", where=\" and \".join([f\"exposure.day_obs={obs_date}\", f\"exposure.seq_num={seq_num}\"]))\n",
"dataId = {\"instrument\": instrument, \"detector\": 0, \"exposure.id\": list(records)[0].id}\n",
"raw = butler.get('raw.metadata', dataId)"
]
},
Expand Down Expand Up @@ -488,7 +488,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.9"
}
},
"nbformat": 4,
Expand Down
92 changes: 92 additions & 0 deletions notebooks/general/CSC/Handle_ComCam.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"id": "b59bd3a7-dea3-4c88-b8c0-59727ffb15e8",
"metadata": {},
"outputs": [],
"source": [
"import asyncio\n",
"import logging\n",
"import sys\n",
"\n",
"from lsst.ts import salobj\n",
"from lsst.ts.observatory.control.maintel.comcam import ComCam"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "1003b7d9-510b-4421-baf2-e7d09bbd5fad",
"metadata": {},
"outputs": [],
"source": [
"domain = salobj.Domain()\n",
"await asyncio.sleep(10)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "4a5ff465-1325-4b5a-bf85-fc509ac484ae",
"metadata": {},
"outputs": [],
"source": [
"comcam = ComCam(domain)\n",
"await comcam.start_task"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "5ec1f5c5-ca32-4349-a586-1548fc8a9a75",
"metadata": {},
"outputs": [],
"source": [
"await salobj.set_summary_state(comcam.rem.ccheaderservice, salobj.State.ENABLED)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "5ff053a4-181f-45d2-bac9-79a23596c42f",
"metadata": {},
"outputs": [],
"source": [
"await salobj.set_summary_state(comcam.rem.ccamera, salobj.State.ENABLED, override=\"Normal\")"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "e61adb3e-94d5-4cda-b491-31cb3e529faf",
"metadata": {},
"outputs": [],
"source": [
"await salobj.set_summary_state(comcam.rem.ccoods, salobj.State.ENABLED)"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "LSST",
"language": "python",
"name": "lsst"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.7"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
Loading

0 comments on commit fa0ba90

Please sign in to comment.