Merge pull request #3 from lsst-camera-dh/LSSTTD-905

Fix persistence of analysis job data products
lsst-camera-dh · Feb 21, 2017 · 5b546d0 · 5b546d0
2 parents 4683e2b + d2084c2
commit 5b546d0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
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
@@ -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)
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
@@ -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
@@ -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
@@ -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,
@@ -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
@@ -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: