From d9bfec0ec5b9941dc6b8fa807d5b26caa7a9eb5e Mon Sep 17 00:00:00 2001 From: Jim Chiang Date: Tue, 17 Oct 2017 21:40:51 -0700 Subject: [PATCH 1/2] retrieve eotest results files with Fe55 gains for plotting the overscan profiles in e-/pixel --- harnessed_jobs/cte_raft/v0/producer_cte_raft.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/harnessed_jobs/cte_raft/v0/producer_cte_raft.py b/harnessed_jobs/cte_raft/v0/producer_cte_raft.py index ad31d9e..220f2d1 100755 --- a/harnessed_jobs/cte_raft/v0/producer_cte_raft.py +++ b/harnessed_jobs/cte_raft/v0/producer_cte_raft.py @@ -40,7 +40,10 @@ def run_cte_task(sensor_id): task.run(sensor_id, sflat_low_files, flux_level='low', gains=gains, mask_files=mask_files) - results_file = '%s_eotest_results.fits' % sensor_id + results_file \ + = siteUtils.dependency_glob('%s_eotest_results.fits' % sensor_id, + jobname='fe55_raft_analysis', + description='Fe55 results file')[0] plots = sensorTest.EOTestPlots(sensor_id, results_file=results_file) superflat_files = sorted(glob.glob('%s_superflat_*.fits' % sensor_id)) From 2a5b81ec5bb12f6eb2de29c9dbc0a1512011f4a2 Mon Sep 17 00:00:00 2001 From: Jim Chiang Date: Wed, 18 Oct 2017 15:52:49 -0700 Subject: [PATCH 2/2] copy results file from fe55_raft_analysis to cwd so that gains are available and so that CTI results can be written to the same file --- harnessed_jobs/cte_raft/v0/producer_cte_raft.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/harnessed_jobs/cte_raft/v0/producer_cte_raft.py b/harnessed_jobs/cte_raft/v0/producer_cte_raft.py index 220f2d1..52719a7 100755 --- a/harnessed_jobs/cte_raft/v0/producer_cte_raft.py +++ b/harnessed_jobs/cte_raft/v0/producer_cte_raft.py @@ -3,6 +3,8 @@ Producer script for raft-level CTE analysis. """ from __future__ import print_function +import os +import shutil import glob import lsst.eotest.sensor as sensorTest import siteUtils @@ -24,6 +26,12 @@ def run_cte_task(sensor_id): for mask_file in mask_files: print(" " + mask_file) + results_file \ + = siteUtils.dependency_glob('%s_eotest_results.fits' % sensor_id, + jobname='fe55_raft_analysis', + description='Fe55 results file')[0] + shutil.copy(results_file, os.path.basename(results_file)) + results_file = os.path.basename(results_file) sflat_high_files = \ siteUtils.dependency_glob('S*/%s_sflat_500_flat_H*.fits' % sensor_id, jobname=siteUtils.getProcessName('sflat_raft_acq'), @@ -40,10 +48,6 @@ def run_cte_task(sensor_id): task.run(sensor_id, sflat_low_files, flux_level='low', gains=gains, mask_files=mask_files) - results_file \ - = siteUtils.dependency_glob('%s_eotest_results.fits' % sensor_id, - jobname='fe55_raft_analysis', - description='Fe55 results file')[0] plots = sensorTest.EOTestPlots(sensor_id, results_file=results_file) superflat_files = sorted(glob.glob('%s_superflat_*.fits' % sensor_id))