From e20c350433e8749f96e5f7e776b0e7b2d4eba991 Mon Sep 17 00:00:00 2001 From: Jim Chiang Date: Wed, 31 May 2017 08:22:10 -0700 Subject: [PATCH] move plotting of per amp noise for each sensor to dark_current_raft job so that shot noise can be included --- .../dark_current_raft/v0/producer_dark_current_raft.py | 5 +++++ .../read_noise_raft/v0/producer_read_noise_raft.py | 5 ----- 2 files changed, 5 insertions(+), 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 index f49e300..26c3edd 100755 --- 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 index 0d8b3b5..83d385b 100755 --- 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)