Merge pull request #165 from lsst-ts/tickets/DM-47641

doc/news/DM-47641.feature.1.rst

@@ -0,0 +1 @@
+In base_take_twilight_flats.py, change logic for high counts at sunset.

doc/news/DM-47641.feature.2.rst

@@ -0,0 +1 @@
+In love_manager_client and moke_love_stress_tests, make sure LoveManagerClient uses a child logging from the script.

doc/news/DM-47641.feature.rst

@@ -0,0 +1,3 @@
+In maintel/take_twilight_flats_comcam.py:
+- Add nounwrap az wrap strategy.
+- Fix table name in ConsDB for sky counts.

python/lsst/ts/externalscripts/base_take_twilight_flats.py

@@ -548,13 +548,34 @@ async def take_twilight_flats(self):
 
             if exp_time < self.config.min_exp_time:
                 if self.where_sun == "setting":
-                    sleep_time = 30
-                    self.log.warning(
-                        f"Calculated exposure time {exp_time} below min exposure time "
-                        f"{self.config.min_exp_time}. Waiting {sleep_time}s."
-                    )
-                    await asyncio.sleep(sleep_time)
-                    continue
+                    while exp_time < self.config.min_exp_time:
+                        sleep_time = 30
+                        self.log.warning(
+                            f"Calculated exposure time {exp_time} below min exposure time "
+                            f"{self.config.min_exp_time}. Waiting {sleep_time}s."
+                        )
+                        await asyncio.sleep(sleep_time)
+
+                        # TODO: change from take_acq to take_sflat (DM-46675)
+                        flat_image = await self.camera.take_acq(
+                            exptime=self.config.min_exp_time,
+                            n=1,
+                            group_id=self.group_id,
+                            program=self.program,
+                            reason=self.reason,
+                        )
+
+                        self.latest_exposure_id = int(flat_image[0])
+
+                        sky_counts = await self.get_sky_counts()
+                        self.log.info(
+                            f"Flat just taken with exposure time {self.config.min_exp_time} \
+                                had counts of {sky_counts}"
+                        )
+
+                        exp_time = self.get_new_exptime(
+                            sky_counts, self.config.min_exp_time
+                        )
                 else:
                     self.log.warning(
                         f"Calculated exposure time {exp_time} below min exposure time "

python/lsst/ts/externalscripts/love_manager_client.py

@@ -64,9 +64,14 @@ def __init__(
         password,
         event_streams,
         telemetry_streams,
+        log=None,
         msg_tracing=False,
     ):
-        self.log = logging.getLogger(f"{__name__}.{self.__class__.__name__}")
+        self.log = (
+            log.getChild(type(self).__name__)
+            if log is not None
+            else logging.getLogger(type(self).__name__)
+        )
 
         self.username = username
         self.event_streams = event_streams
@@ -129,7 +134,7 @@ async def __handle_message_reception(self):
             async for message in self.__websocket:
                 if message.type == aiohttp.WSMsgType.TEXT:
                     msg = json.loads(message.data)
-                    self.log.debug("Received message: ", msg)
+                    self.log.debug(f"Received message: {msg}")
                     if "category" not in msg or (
                         "option" in msg and msg["option"] == "subscribe"
                     ):
@@ -162,6 +167,7 @@ async def __subscribe_to(self, csc, salindex, topic, topic_type):
             "salindex": salindex,
             "stream": topic,
         }
+        self.log.debug(f"send_str={subscribe_msg}")
         await self.__websocket.send_str(json.dumps(subscribe_msg))
 
     async def start_ws_client(self):

python/lsst/ts/externalscripts/maintel/take_twilight_flats_comcam.py

@@ -28,6 +28,7 @@
 from lsst.ts.observatory.control.maintel.comcam import ComCam, ComCamUsages
 from lsst.ts.observatory.control.maintel.mtcs import MTCS, MTCSUsages
 from lsst.ts.observatory.control.utils import RotType
+from lsst.ts.xml.enums.MTPtg import WrapStrategy
 
 try:
     from lsst.summit.utils import ConsDbClient
@@ -134,8 +135,10 @@ async def get_sky_counts(self) -> float:
             "LSSTComCam", self.latest_exposure_id, detector_num
         )
 
-        query = f"SELECT * from cdb_lsstcomcam.ccdvisit1_quicklook \
-            where ccdvisit_id={ccd_exp_id}"
+        query = (
+            "SELECT * from cdb_lsstcomcam.ccdexposure_quicklook "
+            f"where ccdexposure_id={ccd_exp_id}"
+        )
         item = "postisr_pixel_median"
         get_counts = functools.partial(
             self.client.wait_for_item_in_row,
@@ -185,6 +188,7 @@ async def track_radec_and_setup_instrument(self, ra, dec):
             dec=dec,
             rot_type=RotType.Physical,
             rot=0,
+            az_wrap_strategy=WrapStrategy.NOUNWRAP,
         )
 
         current_filter = await self.comcam.get_current_filter()
@@ -204,6 +208,7 @@ async def track_radec_and_setup_instrument(self, ra, dec):
             dec=dec,
             rot_type=RotType.PhysicalSky,
             rot=self.config.rotator_angle,
+            az_wrap_strategy=WrapStrategy.NOUNWRAP,
         )
 
         self.tracking_started = True

python/lsst/ts/externalscripts/make_love_stress_tests.py

@@ -212,6 +212,7 @@ async def run(self):
                 self.password,
                 event_streams,
                 telemetry_streams,
+                log=self.log,
                 msg_tracing=True,
             )
             self.clients.append(client)