From 2d0ac8f83290cffe46ae1fd022f93d892627f37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20S=C3=A1nchez-Gallego?= <gallegoj@uw.edu>
Date: Tue, 30 Jan 2024 14:57:17 -0800
Subject: [PATCH] Use /screen flag for LCO slews

---
 CHANGELOG.md                 |  8 ++++++++
 src/hal/macros/goto_field.py | 13 +++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8191625..903f9d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Next version
+
+### ✨ Improved
+
+* Retry lamps at LCO to deal with cases when `TCS_FF` fails.
+* Use `/screen` flag for LCO slews.
+
+
 ## 1.0.1 - January 15, 2024
 
 ### ✨ Improved
diff --git a/src/hal/macros/goto_field.py b/src/hal/macros/goto_field.py
index b3e44ea..f3c1dcf 100644
--- a/src/hal/macros/goto_field.py
+++ b/src/hal/macros/goto_field.py
@@ -681,8 +681,8 @@ async def _slew_telescope(self, screen: bool = False):
         ra, dec, pa = self._get_pointing()
 
         command_string = f"target {ra}, {dec} /posAngle={pa:.3f}"
-        # if screen:
-        #     command_string += " /screen"
+        if screen:
+            command_string += " /screen"
 
         self.command.info("Slewing to field RA/Dec/PA.")
 
@@ -694,15 +694,8 @@ async def _slew_telescope(self, screen: bool = False):
     async def _remove_screen(self):
         """Ensures the screen is not in front of the telescope."""
 
-        # HACK: for now, if we the screen is in front of the telescope we wait 25
-        # seconds to give observers time to remove it.
         if self.screen_on:
-            self.command.warning("Waiting for FFS to be removed.")
-            await asyncio.sleep(25)
-            self.screen_on = False
-
-        # if self.screen_on:
-        #     await self._slew_telescope(False)
+            await self._slew_telescope(False)
 
     async def _guide_preconditions(self, stage: str):
         """Ensure the system is ready to guide/acquire."""