Merge pull request #239 from macro-consortium/peg-dev

Sky plot updates

.gitignore

@@ -144,3 +144,4 @@ dmypy.json
 docs/source/api/auto_api/
 docs/source/_build/
 pgHardware
+pgtest

pyscope/telrun/schedtab.py

@@ -615,12 +615,12 @@ def validate(schedule_table, observatory=None):
             #             f"Column '{column.name}' must be of type int64, not {column.dtype}"
             #         )
             case "exposure" | "pm_ra_cosdec" | "pm_dec":
-                if not np.issubdtype(column.dtype, np.dtype("float64")):
+                if not np.issubdtype(column.dtype, np.floating):
                     logger.error(
-                        f"Column '{column.name}' must be of type float64, not {column.dtype}"
+                        f"Column '{column.name}' must be of a float type, not {column.dtype}"
                     )
                     raise ValueError(
-                        f"Column '{column.name}' must be of type float64, not {column.dtype}"
+                        f"Column '{column.name}' must be of a float type, not {column.dtype}"
                     )
             case "shutter_state":
                 if column.dtype != bool:

pyscope/telrun/schedtel.py

@@ -807,6 +807,14 @@ def schedtel_cli(
         queue_table = schedtab.blocks_to_table(queue_blocks)
 
     exec_blocks = exec_blocks + unscheduled_slots
+    for block in exec_blocks:
+        try:
+            # print(block.configuration["ID"], type(block.configuration["ID"]))
+            my_id = block.configuration["ID"].mjd
+            # print(my_id, type(my_id))
+            block.configuration["ID"] = my_id
+        except:
+            pass
     exec_table = schedtab.blocks_to_table(exec_blocks)
 
     # Write the schedule to file
@@ -1119,24 +1127,51 @@ def plot_schedule_sky_cli(schedule_table, observatory):
         )
         return
 
-    fig, ax = plt.subplots(1, 1, figsize=(7, 7), subplot_kw={"projection": "polar"})
-    for i, row in enumerate(schedule_table):
+    # Get unique targets in the schedule
+    target_times = {}
+
+    for row in schedule_table:
         if row["name"] == "TransitionBlock" or row["name"] == "EmptyBlock":
             continue
+        target_string = row["target"].to_string("hmsdms")
+        target_name = row["name"]
+        if target_string not in target_times:
+            target_times[target_string] = {
+                "name": target_name,
+                "times": [row["start_time"]],
+            }
+        else:
+            target_times[target_string]["times"].append(row["start_time"])
+
+    # targets = [t.to_string("hmsdms") for t in schedule_table["target"]]
+
+    fig, ax = plt.subplots(1, 1, figsize=(7, 7), subplot_kw={"projection": "polar"})
+    for target, target_dict in target_times.items():
+        times = target_dict["times"]
+        try:
+            label = target_dict["name"]
+        except:
+            label = target.to_string("hmsdms")
+        target = coord.SkyCoord(target, unit=(u.hourangle, u.deg))
         ax = astroplan_plots.plot_sky(
-            astroplan.FixedTarget(row["target"]),
+            astroplan.FixedTarget(target),
             observatory,
+            times,
             astrotime.Time(np.float64(row["start_time"].jd), format="jd"),
             ax=ax,
-            style_kwargs={
-                "label": row["target"].to_string("hmsdms"),
-            },
+            style_kwargs={"label": label},
         )
+
     handles, labels = ax.get_legend_handles_labels()
-    unique = [
-        (h, l) for i, (h, l) in enumerate(zip(handles, labels)) if l not in labels[:i]
-    ]
-    ax.legend(*zip(*unique), loc=(1.1, 0))
+
+    # Commented out - if objects have same name, they will be combined in the legend
+    # print(labels)
+    # unique = [
+    #     (h, l) for i, (h, l) in enumerate(zip(handles, labels)) if l not in labels[:i]
+    # ]
+    # ax.legend(*zip(*unique), loc=(1.1, 0))
+
+    ax.legend(labels, loc=(1.1, 0))
 
     fig.set_facecolor("white")
     fig.set_dpi(300)