WCS memleak fix + same schedtel-generated fnames fix

macro-consortium · Jan 2, 2025 · 9d97887 · 9d97887
1 parent 7c9e156
commit 9d97887
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/pyscope/telrun/schedtel.py b/pyscope/telrun/schedtel.py
@@ -753,8 +753,8 @@ def schedtel_cli(
                     if block.name == ""
                     else block.name.replace(" ", "_").replace(".", "_")
                 ),
-                start_time=block.start_time.isot.replace(":", "-").split(".")[0],
-                end_time=block.end_time.isot.replace(":", "-").split(".")[0],
+                start_time=block.start_time.isot.replace(":", "-").replace(".", "_"),
+                end_time=block.end_time.isot.replace(":", "-").replace(".", "_"),
                 duration="%i" % block.duration.to(u.second).value,
                 ra=block.target.ra.to_string(
                     sep="hms", unit="hourangle", precision=2, pad=True

diff --git a/pyscope/telrun/telrun_operator.py b/pyscope/telrun/telrun_operator.py
@@ -2122,6 +2122,16 @@ def execute_block(self, *args, slew=True, **kwargs):
                         history=hist,
                         overwrite=True,
                     )
+                    # if the length of _wcs_threads exceeds 7, join the first thread in the list
+                    if len(self._wcs_threads) > 7:
+                        logger.info(
+                            "Main thread + 7 wcs threads currently running, waiting for the first wcs thread to finish before continuing..."
+                        )
+                        self._wcs_threads[0].join()
+                        self._wcs_threads = self._wcs_threads[1:]
+                        logger.info(
+                            "Main thread + 6 wcs threads currently running, continuing..."
+                        )
                     self._wcs_threads.append(
                         threading.Thread(
                             target=self._async_wcs_solver,
@@ -2158,6 +2168,16 @@ def execute_block(self, *args, slew=True, **kwargs):
                     history=hist,
                     overwrite=True,
                 )
+                # if the length of _wcs_threads exceeds 7, join the first thread in the list
+                if len(self._wcs_threads) > 7:
+                    logger.info(
+                        "Main thread + 7 wcs threads currently running, waiting for the first wcs thread to finish before continuing..."
+                    )
+                    self._wcs_threads[0].join()
+                    self._wcs_threads = self._wcs_threads[1:]
+                    logger.info(
+                        "Main thread + 6 wcs threads currently running, continuing..."
+                    )
                 self._wcs_threads.append(
                     threading.Thread(
                         target=self._async_wcs_solver,
@@ -2479,7 +2499,7 @@ def _async_wcs_solver(
                 # parity=2,
                 # tweak_order=3,
                 # crpix_center=True,
-                # solve_timeout=self.wcs_timeout,
+                solve_timeout=60,
             )
         elif self.wcs_solver.lower() == "maxim_pinpoint_wcs":
             from ..reduction import maxim_pinpoint_wcs