Skip to content

Commit

Permalink
Update to allow ToO deletes
Browse files Browse the repository at this point in the history
  • Loading branch information
@robertdstein
robertdstein committed Feb 4, 2024
1 parent 22ebade commit 305b06f
Show file tree
Hide file tree
Showing 6 changed files with 1,381 additions and 108 deletions.
116 changes: 58 additions & 58 deletions notebooks/Example_2_Submitting_a_ToO.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
{
"data": {
"text/plain": [
"WinterRaDecToO(ra_deg=249.1311789, dec_deg=47.858962, use_field_grid=True, filters=['Y', 'J'], target_priority=50.0, t_exp=960.0, n_exp=1, n_dither=8, dither_distance=30.0, start_time_mjd=60341.97954473166, end_time_mjd=60342.9695447362, max_airmass=2.0)"
"WinterRaDecToO(ra_deg=249.1311789, dec_deg=47.858962, use_field_grid=False, filters=['Y', 'J'], target_priority=50.0, t_exp=960.0, n_exp=1, n_dither=8, dither_distance=30.0, start_time_mjd=60344.047604738545, end_time_mjd=60345.03760474149, max_airmass=2.0)"
]
},
"execution_count": 6,
Expand All @@ -89,7 +89,7 @@
{
"data": {
"text/plain": [
"WinterRaDecToO(ra_deg=249.1311789, dec_deg=47.858962, use_field_grid=True, filters=['Hs'], target_priority=50.0, t_exp=960.0, n_exp=1, n_dither=15, dither_distance=30.0, start_time_mjd=60341.97954473166, end_time_mjd=60342.9695447362, max_airmass=2.0)"
"WinterRaDecToO(ra_deg=249.1311789, dec_deg=47.858962, use_field_grid=False, filters=['Hs'], target_priority=50.0, t_exp=960.0, n_exp=1, n_dither=15, dither_distance=30.0, start_time_mjd=60344.047604738545, end_time_mjd=60345.03760474149, max_airmass=2.0)"
]
},
"execution_count": 7,
Expand Down Expand Up @@ -183,17 +183,17 @@
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>Y</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>False</td>\n",
" <td>2.0</td>\n",
" <td>8</td>\n",
Expand All @@ -202,17 +202,17 @@
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>J</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>False</td>\n",
" <td>2.0</td>\n",
" <td>8</td>\n",
Expand All @@ -221,17 +221,17 @@
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>Hs</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>False</td>\n",
" <td>2.0</td>\n",
" <td>15</td>\n",
Expand All @@ -243,20 +243,20 @@
"</div>"
],
"text/plain": [
" raDeg decDeg fieldID filter visitExpTime priority progPI progName \\\n",
"0 249.0 48.0 5327 Y 960.0 50.0 Stein 202XA000 \n",
"1 249.0 48.0 5327 J 960.0 50.0 Stein 202XA000 \n",
"2 249.0 48.0 5327 Hs 960.0 50.0 Stein 202XA000 \n",
" raDeg decDeg fieldID filter visitExpTime priority progPI \\\n",
"0 249.131179 47.858962 999999999 Y 960.0 50.0 Stein \n",
"1 249.131179 47.858962 999999999 J 960.0 50.0 Stein \n",
"2 249.131179 47.858962 999999999 Hs 960.0 50.0 Stein \n",
"\n",
" progID validStart validStop observed maxAirmass ditherNumber \\\n",
"0 1 60341.979545 60342.969545 False 2.0 8 \n",
"1 1 60341.979545 60342.969545 False 2.0 8 \n",
"2 1 60341.979545 60342.969545 False 2.0 15 \n",
" progName progID validStart validStop observed maxAirmass \\\n",
"0 202XA000 1 60344.047605 60345.037605 False 2.0 \n",
"1 202XA000 1 60344.047605 60345.037605 False 2.0 \n",
"2 202XA000 1 60344.047605 60345.037605 False 2.0 \n",
"\n",
" ditherStepSize obsHistID \n",
"0 30.0 0 \n",
"1 30.0 1 \n",
"2 30.0 2 "
" ditherNumber ditherStepSize obsHistID \n",
"0 8 30.0 0 \n",
"1 8 30.0 1 \n",
"2 15 30.0 2 "
]
},
"execution_count": 10,
Expand Down Expand Up @@ -320,7 +320,7 @@
{
"data": {
"text/plain": [
"\"Request passed validation! Triggering was set to True. Schedule name is 'request_202XA000_02_01_2024_15_16_14' .\""
"\"Request passed validation! Triggering was set to True. Schedule name is 'request_202XA000_2024_02_03_16_54_12' .\""
]
},
"execution_count": 13,
Expand Down Expand Up @@ -386,17 +386,17 @@
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>Y</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>False</td>\n",
" <td>2.0</td>\n",
" <td>8</td>\n",
Expand All @@ -405,17 +405,17 @@
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>J</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>False</td>\n",
" <td>2.0</td>\n",
" <td>8</td>\n",
Expand All @@ -424,17 +424,17 @@
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>Hs</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>False</td>\n",
" <td>2.0</td>\n",
" <td>15</td>\n",
Expand All @@ -446,20 +446,20 @@
"</div>"
],
"text/plain": [
" raDeg decDeg fieldID filter visitExpTime priority progPI progName \\\n",
"0 249.0 48.0 5327 Y 960.0 50.0 Stein 202XA000 \n",
"1 249.0 48.0 5327 J 960.0 50.0 Stein 202XA000 \n",
"2 249.0 48.0 5327 Hs 960.0 50.0 Stein 202XA000 \n",
" raDeg decDeg fieldID filter visitExpTime priority progPI \\\n",
"0 249.131179 47.858962 999999999 Y 960.0 50.0 Stein \n",
"1 249.131179 47.858962 999999999 J 960.0 50.0 Stein \n",
"2 249.131179 47.858962 999999999 Hs 960.0 50.0 Stein \n",
"\n",
" progID validStart validStop observed maxAirmass ditherNumber \\\n",
"0 1 60341.979545 60342.969545 False 2.0 8 \n",
"1 1 60341.979545 60342.969545 False 2.0 8 \n",
"2 1 60341.979545 60342.969545 False 2.0 15 \n",
" progName progID validStart validStop observed maxAirmass \\\n",
"0 202XA000 1 60344.047605 60345.037605 False 2.0 \n",
"1 202XA000 1 60344.047605 60345.037605 False 2.0 \n",
"2 202XA000 1 60344.047605 60345.037605 False 2.0 \n",
"\n",
" ditherStepSize obsHistID \n",
"0 30.0 0 \n",
"1 30.0 1 \n",
"2 30.0 2 "
" ditherNumber ditherStepSize obsHistID \n",
"0 8 30.0 0 \n",
"1 8 30.0 1 \n",
"2 15 30.0 2 "
]
},
"execution_count": 14,
Expand All @@ -475,7 +475,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "03095da8",
"id": "ba9f510f",
"metadata": {},
"outputs": [],
"source": []
Expand Down
70 changes: 35 additions & 35 deletions notebooks/Example_3_Interacting_with_Observatory_Queue.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,22 +132,22 @@
" <th>0</th>\n",
" <td>202XA000</td>\n",
" <td>0.0</td>\n",
" <td>request_202XA000_02_01_2024_15_16_14</td>\n",
" <td>request_202XA000_2024_02_03_16_54_12</td>\n",
" <td>3</td>\n",
" <td>0.8</td>\n",
" <td>2024-02-01 23:30:32.665</td>\n",
" <td>2024-02-02 23:16:08.665</td>\n",
" <td>2024-02-04 01:08:33.049</td>\n",
" <td>2024-02-05 00:54:09.050</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" prog_name observed_frac too_schedule_name n_entries \\\n",
"0 202XA000 0.0 request_202XA000_02_01_2024_15_16_14 3 \n",
"0 202XA000 0.0 request_202XA000_2024_02_03_16_54_12 3 \n",
"\n",
" total_time_hours window_start window_end \n",
"0 0.8 2024-02-01 23:30:32.665 2024-02-02 23:16:08.665 "
"0 0.8 2024-02-04 01:08:33.049 2024-02-05 00:54:09.050 "
]
},
"execution_count": 7,
Expand Down Expand Up @@ -182,7 +182,7 @@
"metadata": {},
"outputs": [],
"source": [
"schedule_name = \"request_202XA000_02_01_2024_15_16_14\""
"schedule_name = \"request_202XA000_2024_02_03_16_54_12\""
]
},
{
Expand All @@ -194,7 +194,7 @@
{
"data": {
"text/plain": [
"'Returning details of schedule request_202XA000_02_01_2024_15_16_14'"
"'Returning details of schedule request_202XA000_2024_02_03_16_54_12'"
]
},
"execution_count": 9,
Expand Down Expand Up @@ -258,17 +258,17 @@
" <tbody>\n",
" <tr>\n",
" <th>0</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>Y</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>0</td>\n",
" <td>2.0</td>\n",
" <td>8</td>\n",
Expand All @@ -277,17 +277,17 @@
" </tr>\n",
" <tr>\n",
" <th>1</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>J</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>0</td>\n",
" <td>2.0</td>\n",
" <td>8</td>\n",
Expand All @@ -296,17 +296,17 @@
" </tr>\n",
" <tr>\n",
" <th>2</th>\n",
" <td>249.0</td>\n",
" <td>48.0</td>\n",
" <td>5327</td>\n",
" <td>249.131179</td>\n",
" <td>47.858962</td>\n",
" <td>999999999</td>\n",
" <td>Hs</td>\n",
" <td>960.0</td>\n",
" <td>50.0</td>\n",
" <td>Stein</td>\n",
" <td>202XA000</td>\n",
" <td>1</td>\n",
" <td>60341.979545</td>\n",
" <td>60342.969545</td>\n",
" <td>60344.047605</td>\n",
" <td>60345.037605</td>\n",
" <td>0</td>\n",
" <td>2.0</td>\n",
" <td>15</td>\n",
Expand All @@ -318,20 +318,20 @@
"</div>"
],
"text/plain": [
" raDeg decDeg fieldID filter visitExpTime priority progPI progName \\\n",
"0 249.0 48.0 5327 Y 960.0 50.0 Stein 202XA000 \n",
"1 249.0 48.0 5327 J 960.0 50.0 Stein 202XA000 \n",
"2 249.0 48.0 5327 Hs 960.0 50.0 Stein 202XA000 \n",
" raDeg decDeg fieldID filter visitExpTime priority progPI \\\n",
"0 249.131179 47.858962 999999999 Y 960.0 50.0 Stein \n",
"1 249.131179 47.858962 999999999 J 960.0 50.0 Stein \n",
"2 249.131179 47.858962 999999999 Hs 960.0 50.0 Stein \n",
"\n",
" progID validStart validStop observed maxAirmass ditherNumber \\\n",
"0 1 60341.979545 60342.969545 0 2.0 8 \n",
"1 1 60341.979545 60342.969545 0 2.0 8 \n",
"2 1 60341.979545 60342.969545 0 2.0 15 \n",
" progName progID validStart validStop observed maxAirmass \\\n",
"0 202XA000 1 60344.047605 60345.037605 0 2.0 \n",
"1 202XA000 1 60344.047605 60345.037605 0 2.0 \n",
"2 202XA000 1 60344.047605 60345.037605 0 2.0 \n",
"\n",
" ditherStepSize obsHistID \n",
"0 30.0 0 \n",
"1 30.0 1 \n",
"2 30.0 2 "
" ditherNumber ditherStepSize obsHistID \n",
"0 8 30.0 0 \n",
"1 8 30.0 1 \n",
"2 15 30.0 2 "
]
},
"execution_count": 10,
Expand Down Expand Up @@ -373,7 +373,7 @@
{
"data": {
"text/plain": [
"'Deleted request_202XA000_02_01_2024_15_16_14'"
"'Deleted request_202XA000_2024_02_03_16_54_12'"
]
},
"execution_count": 11,
Expand Down
Loading

0 comments on commit 305b06f

Please sign in to comment.