From 84a9bcc99c1001c46a651a019f370db7367d51bf Mon Sep 17 00:00:00 2001 From: James Chiang Date: Wed, 3 Oct 2018 07:53:09 -0700 Subject: [PATCH] python 3 compatibility --- .../collect_raft_results/v0/producer_collect_raft_results.py | 2 +- .../fe55_raft_analysis/v0/producer_fe55_raft_analysis.py | 2 +- harnessed_jobs/qa_plots_raft/v0/producer_qa_plots_raft.py | 2 +- .../qe_raft_analysis/v0/producer_qe_raft_analysis.py | 2 +- python/correlated_noise.py | 5 +++-- 5 files changed, 7 insertions(+), 6 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 index d5dfa29..fbe0ece 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 @@ -27,7 +27,7 @@ def slot_dependency_glob(pattern, jobname): # Use a mean bias file to determine the maximum number of active # pixels for the image quality statistics. bias_files = slot_dependency_glob('*_mean_bias_*.fits', 'fe55_raft_analysis') -total_num, rolloff_mask = sensorTest.pixel_counts(bias_files.values()[0]) +total_num, rolloff_mask = sensorTest.pixel_counts(list(bias_files.values())[0]) # Exposure time (in seconds) for 95th percentile dark current shot # noise calculation. diff --git a/harnessed_jobs/fe55_raft_analysis/v0/producer_fe55_raft_analysis.py b/harnessed_jobs/fe55_raft_analysis/v0/producer_fe55_raft_analysis.py index 1ed3077..0f8e4db 100755 --- a/harnessed_jobs/fe55_raft_analysis/v0/producer_fe55_raft_analysis.py +++ b/harnessed_jobs/fe55_raft_analysis/v0/producer_fe55_raft_analysis.py @@ -53,7 +53,7 @@ def run_fe55_task(sensor_id): '%s_fe55_apflux_parallel.png' % file_prefix, pixel_coord='y') - except StandardError as eobj: + except Exception as eobj: print("Exception raised while creating pixel statistics plots:") print(str(eobj)) print("Skipping these plots.") diff --git a/harnessed_jobs/qa_plots_raft/v0/producer_qa_plots_raft.py b/harnessed_jobs/qa_plots_raft/v0/producer_qa_plots_raft.py index 1760cbd..9cc99c1 100755 --- a/harnessed_jobs/qa_plots_raft/v0/producer_qa_plots_raft.py +++ b/harnessed_jobs/qa_plots_raft/v0/producer_qa_plots_raft.py @@ -16,7 +16,7 @@ def dirname_dependencyGlob(ccd_vendor, **kwds): Return the directory path with the FITS output files for the specified jobname. """ - if kwds.has_key('jobname'): + if 'jobname' in kwds: kwds['jobname'] = siteUtils.getProcessName(kwds['jobname']) file0 = dependency_glob('S*/%(ccd_vendor)s*.fits' % locals(), **kwds)[0] # Apply os.path.dirname twice to omit both slot folder and file diff --git a/harnessed_jobs/qe_raft_analysis/v0/producer_qe_raft_analysis.py b/harnessed_jobs/qe_raft_analysis/v0/producer_qe_raft_analysis.py index f25c717..93dae46 100755 --- a/harnessed_jobs/qe_raft_analysis/v0/producer_qe_raft_analysis.py +++ b/harnessed_jobs/qe_raft_analysis/v0/producer_qe_raft_analysis.py @@ -56,7 +56,7 @@ def run_qe_task(sensor_id): try: plots.flat_fields(os.path.dirname(lambda_files[0]), annotation='e-/pixel, gain-corrected, bias-subtracted') - except StandardError as eobj: + except Exception as eobj: print("Exception raised while creating flat fields:") print(str(eobj)) diff --git a/python/correlated_noise.py b/python/correlated_noise.py index d0c4fae..2c1711e 100644 --- a/python/correlated_noise.py +++ b/python/correlated_noise.py @@ -1,3 +1,4 @@ +from __future__ import print_function import glob from collections import namedtuple, defaultdict import itertools @@ -236,7 +237,7 @@ def set_ticks(ax, slots, amps=16): = correlated_noise(bias_files, make_plots=True, plot_corr=False, title='Run 5808D, ETU1, S00') for amp, stats in etu1_stats.items(): - print amp, stats + print(amp, stats) plt.figure(f1.number) plt.savefig('ETU1_S00_noise_corr.png') @@ -245,6 +246,6 @@ def set_ticks(ax, slots, amps=16): = correlated_noise(bias_files, make_plots=True, plot_corr=False, title='Run 6288, RTM-005, S00') for amp, stats in rtm005_stats.items(): - print amp, stats + print(amp, stats) plt.figure(f1.number) plt.savefig('RTM-005_S00_noise_corr.png')