Merge pull request #39 from lsst-camera-dh/LSSTTD-1292

Added dark frame acquisitions to xy_stage_acq
lsst-camera-dh · Aug 2, 2018 · 6ce4ee8 · 6ce4ee8
2 parents f505bf7 + c5fff4b
commit 6ce4ee8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/harnessed_jobs/xy_stage_acq/v0/ccs_xy_stage_acq.py b/harnessed_jobs/xy_stage_acq/v0/ccs_xy_stage_acq.py
@@ -50,6 +50,9 @@ def run(self):
             for i in range(self.imcount):
                 self.take_image(seqno, exptime, openShutter, actuateXed,
                                 image_type, file_template=file_template)
+            # Take dark frame(s)
+            for i in range(self.dcount):
+                self.dark_image(seqno, exptime)
             # Take bias frame(s).
             for i in range(self.bcount):
                 self.bias_image(seqno)

diff --git a/python/eo_acquisition.py b/python/eo_acquisition.py
@@ -359,6 +359,16 @@ def bias_image(self, seqno, max_tries=3):
         self.take_image(seqno, exptime, openShutter, actuateXed, "BIAS",
                         timeout=150, max_tries=max_tries)
 
+    def dark_image(self, seqno, exptime, max_tries=3):
+        """
+        Take dark image
+        """
+        openShutter = False
+        actuateXed = False
+        timeout = int(max(150, exptime + 20))
+        self.take_image(seqno, exptime, openShutter, actuateXed, "DARK",
+                        timeout=timeout, max_tries=max_tries)
+
     def measured_flux(self, wl, seqno=0, fluxcal_time=2.):
         """
         Compute the measured flux by taking an exposure at the

diff --git a/python/xy_stage_acquisition.py b/python/xy_stage_acquisition.py
@@ -22,6 +22,8 @@ def __init__(self, seqfile, acq_config_file, acqname, metadata,
 
         self.bcount = int(self.eo_config.get('%s_BCOUNT' % acqname.upper(),
                                              default=1))
+        self.dcount = int(self.eo_config.get('%s_DCOUNT' % acqname.upper(),
+                                             default=0))
         self.imcount = int(self.eo_config.get('%s_IMCOUNT' % acqname.upper(),
                                               default=1))
         self.xoffset = float(self.eo_config.get('%s_XOFFSET' % acqname.upper(),