move plotting of per amp noise for each sensor to dark_current_raft j…

…ob so that shot noise can be included
lsst-camera-dh · May 31, 2017 · e20c350 · e20c350
1 parent f0a2cac
commit e20c350
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/harnessed_jobs/dark_current_raft/v0/producer_dark_current_raft.py b/harnessed_jobs/dark_current_raft/v0/producer_dark_current_raft.py
@@ -9,6 +9,7 @@
 from multiprocessor_execution import sensor_analyses
 
 def run_dark_current_task(sensor_id):
+    "Single sensor execution of dark current analyses."
     file_prefix = '%s_%s' % (sensor_id, siteUtils.getRunNumber())
     dark_files = siteUtils.dependency_glob('S*/%s_dark_dark_*.fits' % sensor_id,
                                            jobname=siteUtils.getProcessName('dark_raft_acq'),
@@ -35,5 +36,9 @@ def run_dark_current_task(sensor_id):
                             dark_curr_pixels, read_noise, dark95s,
                             exptime=16, title=sensor_id)
 
+    plots = sensorTest.EOTestPlots(sensor_id, results_file=results_file)
+    siteUtils.make_png_file(plots.total_noise, '%s_noise.png' % file_prefix,
+                            dark95s=dark95s)
+
 if __name__ == '__main__':
     sensor_analyses(run_dark_current_task)
diff --git a/harnessed_jobs/read_noise_raft/v0/producer_read_noise_raft.py b/harnessed_jobs/read_noise_raft/v0/producer_read_noise_raft.py
@@ -26,10 +26,5 @@ def run_read_noise_task(sensor_id):
     task.run(sensor_id, bias_files, gains, system_noise=system_noise,
              mask_files=mask_files, use_overscan=True)
 
-    results_file = '%s_eotest_results.fits' % sensor_id
-    plots = sensorTest.EOTestPlots(sensor_id, results_file=results_file)
-
-    siteUtils.make_png_file(plots.noise, '%s_noise.png' % file_prefix)
-
 if __name__ == '__main__':
     sensor_analyses(run_read_noise_task)