Merge pull request #60 from lsst-camera-dh/u/jchiang/BFTask_updates_f…

…rom_eotest pass gains to BFTask.run
lsst-camera-dh · Apr 23, 2020 · 1b36689 · 1b36689
2 parents a8437a4 + 2d20861
commit 1b36689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/harnessed_jobs/brighter_fatter_BOT/v0/bf_jh_task.py b/harnessed_jobs/brighter_fatter_BOT/v0/bf_jh_task.py
@@ -7,7 +7,8 @@ def bf_jh_task(det_name):
     import glob
     import siteUtils
     from bot_eo_analyses import make_file_prefix, glob_pattern,\
-        bias_filename, bf_task, find_flat2_bot, get_mask_files
+        bias_filename, bf_task, find_flat2_bot, get_mask_files,\
+        get_amplifier_gains
 
     run = siteUtils.getRunNumber()
     file_prefix = make_file_prefix(run, det_name)
@@ -25,9 +26,10 @@ def bf_jh_task(det_name):
 
     mask_files = get_mask_files(det_name)
     eotest_results_file = '{}_eotest_results.fits'.format(file_prefix)
+    gains = get_amplifier_gains(eotest_results_file)
     bias_frame = bias_filename(run, det_name)
 
-    return bf_task(run, det_name, flat_files, mask_files=mask_files,
+    return bf_task(run, det_name, flat_files, gains, mask_files=mask_files,
                    flat2_finder=find_flat2_bot, bias_frame=bias_frame)
 
 

diff --git a/python/bot_eo_analyses.py b/python/bot_eo_analyses.py
@@ -716,15 +716,15 @@ def ptc_task(run, det_name, flat_files, gains, mask_files=(),
                             ptc_file='%s_ptc.fits' % file_prefix)
 
 
-def bf_task(run, det_name, flat_files, mask_files=(),
+def bf_task(run, det_name, flat_files, gains, mask_files=(),
             flat2_finder=None, bias_frame=None):
     """Single sensor execution of the brighter-fatter task."""
     file_prefix = make_file_prefix(run, det_name)
 
     task = sensorTest.BFTask()
     task.run(file_prefix, flat_files, mask_files=mask_files,
              flat2_finder=flat2_finder, bias_frame=bias_frame,
-             linearity_correction=get_nlc_func(det_name))
+             linearity_correction=get_nlc_func(det_name), gains=gains)
 
     results_file = '%s_eotest_results.fits' % file_prefix
     plots = sensorTest.EOTestPlots(file_prefix, results_file=results_file)