From 271cf8fba2ff31c738a4e34ae2b0014c7aef1ea9 Mon Sep 17 00:00:00 2001 From: Parker Fagrelius Date: Tue, 27 Aug 2024 13:38:58 -0700 Subject: [PATCH] increased min exptime to 1 sec --- doc/news/DM-46003.feature.rst | 1 + .../lsst/ts/observatory/control/auxtel/atcalsys.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 doc/news/DM-46003.feature.rst diff --git a/doc/news/DM-46003.feature.rst b/doc/news/DM-46003.feature.rst new file mode 100644 index 00000000..6240938e --- /dev/null +++ b/doc/news/DM-46003.feature.rst @@ -0,0 +1 @@ +Increase minimum electrometer exposure time to 1 second for Keithley electrometer diff --git a/python/lsst/ts/observatory/control/auxtel/atcalsys.py b/python/lsst/ts/observatory/control/auxtel/atcalsys.py index ec1df77d..4bce45f7 100644 --- a/python/lsst/ts/observatory/control/auxtel/atcalsys.py +++ b/python/lsst/ts/observatory/control/auxtel/atcalsys.py @@ -310,6 +310,7 @@ async def _calculate_electrometer_exposure_times( electrometer_buffer_size = 16667 electrometer_integration_overhead = 0.00254 electrometer_time_separation_vs_integration = 3.07 + keithley_min_exptime = 1.0 electrometer_exptimes: list[float | None] = [] for exptime in exptimes: @@ -319,13 +320,19 @@ async def _calculate_electrometer_exposure_times( * electrometer_time_separation_vs_integration ) + electrometer_integration_overhead max_exp_time = electrometer_buffer_size * time_sep - if exptime > max_exp_time: - electrometer_exptimes.append(max_exp_time) + if exptime < keithley_min_exptime: + elec_exptime = keithley_min_exptime + self.log.info( + f"Electrometer exposure time increased from {exptime} to {keithley_min_exptime} sec." + ) + elif exptime > max_exp_time: + elec_exptime = max_exp_time self.log.info( f"Electrometer exposure time reduced to {max_exp_time}" ) else: - electrometer_exptimes.append(exptime) + elec_exptime = exptime + electrometer_exptimes.append(elec_exptime) else: electrometer_exptimes.append(None) return electrometer_exptimes