From 9f9f67f62e6d20db2cf14289d74e57b69222c3bf Mon Sep 17 00:00:00 2001 From: Jim Chiang Date: Fri, 17 Feb 2017 08:21:09 -0800 Subject: [PATCH 1/3] fix jobname keyword arguments so that simulated acquisition jobs are not hard-wired in --- .../fe55_raft_analysis/v0/validator_fe55_raft_analysis.py | 2 ++ harnessed_jobs/prnu_raft/v0/validator_prnu_raft.py | 2 +- .../qe_raft_analysis/v0/validator_qe_raft_analysis.py | 2 +- harnessed_jobs/read_noise_raft/v0/validator_read_noise_raft.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/harnessed_jobs/fe55_raft_analysis/v0/validator_fe55_raft_analysis.py b/harnessed_jobs/fe55_raft_analysis/v0/validator_fe55_raft_analysis.py index 0166c1d..16816ad 100755 --- a/harnessed_jobs/fe55_raft_analysis/v0/validator_fe55_raft_analysis.py +++ b/harnessed_jobs/fe55_raft_analysis/v0/validator_fe55_raft_analysis.py @@ -59,6 +59,8 @@ slot=slot, sensor_id=sensor_id)) + results.extend([lcatr.schema.fileref.make(x) for x in output_files]) + results.extend(siteUtils.jobInfo()) lcatr.schema.write_file(results) lcatr.schema.validate_file() diff --git a/harnessed_jobs/prnu_raft/v0/validator_prnu_raft.py b/harnessed_jobs/prnu_raft/v0/validator_prnu_raft.py index 0b1d9c3..dac4ac2 100755 --- a/harnessed_jobs/prnu_raft/v0/validator_prnu_raft.py +++ b/harnessed_jobs/prnu_raft/v0/validator_prnu_raft.py @@ -27,7 +27,7 @@ qe_acq_job_id = \ siteUtils.get_prerequisite_job_id('S*/%s_lambda_flat_*.fits' % sensor_id, - jobname='qe_raft_acq_sim') + jobname=siteUtils.getProcessName('qe_raft_acq')) md = dict(illumination_non_uniformity_file=dict(JOB_ID=qe_acq_job_id)) results.extend(eotestUtils.eotestCalibsPersist('illumination_non_uniformity_file', metadata=md)) diff --git a/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py b/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py index ee53f8b..3585465 100755 --- a/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py +++ b/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py @@ -49,7 +49,7 @@ sensor_id = raft.sensor_names[0] qe_acq_job_id = siteUtils.get_prerequisite_job_id(('S*/%s_lambda_flat_*.fits' % sensor_id), - jobname='qe_raft_acq_sim') + jobname=siteUtils.getProcessName('qe_raft_acq')) md = dict(photodiode_ratio_file=dict(JOB_ID=qe_acq_job_id), illumination_non_uniformity_file=dict(JOB_ID=qe_acq_job_id)) diff --git a/harnessed_jobs/read_noise_raft/v0/validator_read_noise_raft.py b/harnessed_jobs/read_noise_raft/v0/validator_read_noise_raft.py index 803d841..7ff4e4f 100755 --- a/harnessed_jobs/read_noise_raft/v0/validator_read_noise_raft.py +++ b/harnessed_jobs/read_noise_raft/v0/validator_read_noise_raft.py @@ -33,7 +33,7 @@ sensor_id=sensor_id)) fe55_acq_job_id = siteUtils.get_prerequisite_job_id('S*/%s_fe55_fe55_*.fits' % sensor_id, - jobname='fe55_raft_acq_sim') + jobname=siteUtils.getProcessName('fe55_raft_acq')) files = glob.glob('%s_read_noise?*.fits' % sensor_id) for fitsfile in files: From 53d685616979d6b7a8d3d4d7c70079df6e2a8dd8 Mon Sep 17 00:00:00 2001 From: Jim Chiang Date: Sat, 18 Feb 2017 10:57:13 -0800 Subject: [PATCH 2/3] make y-axis of gain bar chart log scale --- .../collect_raft_results/v0/producer_collect_raft_results.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harnessed_jobs/collect_raft_results/v0/producer_collect_raft_results.py b/harnessed_jobs/collect_raft_results/v0/producer_collect_raft_results.py index b364ade..4748f99 100755 --- a/harnessed_jobs/collect_raft_results/v0/producer_collect_raft_results.py +++ b/harnessed_jobs/collect_raft_results/v0/producer_collect_raft_results.py @@ -115,5 +115,5 @@ def slot_dependency_glob(pattern, jobname): plt.savefig('%s_psf_sigma.png' % raft_id) bar_charts.make_multi_bar_chart(('GAIN', 'PTC_GAIN'), 'System Gain (e-/ADU)', - title=raft_id, colors='br') + title=raft_id, colors='br', ylog=True) plt.savefig('%s_system_gain.png' % raft_id) From d2084c23b0b1da4ed5aa9a800e859f420183789a Mon Sep 17 00:00:00 2001 From: Jim Chiang Date: Mon, 20 Feb 2017 16:10:28 -0800 Subject: [PATCH 3/3] avoid persisting more than one copy of QE files --- .../qe_raft_analysis/v0/validator_qe_raft_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py b/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py index 3585465..86b5abc 100755 --- a/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py +++ b/harnessed_jobs/qe_raft_analysis/v0/validator_qe_raft_analysis.py @@ -30,7 +30,7 @@ band=band, QE=np.mean(QE[band]), slot=slot, sensor_id=sensor_id)) - qe_files = glob.glob('*QE*.*') + qe_files = glob.glob('%s_*QE*.*' % sensor_id) for item in qe_files: if item.endswith('.fits'): eotestUtils.addHeaderData(item, LSST_NUM=sensor_id,