From 4c6bd70a1f4a3389774c1780331d7ac05e9bf30a Mon Sep 17 00:00:00 2001 From: James Chiang Date: Tue, 18 Dec 2018 09:03:37 -0800 Subject: [PATCH 1/2] add function to find flat2 files for BOT data --- .../BOT_EO_analysis/v0/producer_BOT_EO_analysis.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py b/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py index 897167e..2bc5feb 100755 --- a/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py +++ b/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py @@ -330,6 +330,13 @@ def cte_task(det_name): output.write('{}\n'.format(item)) +def find_flat2_bot(file1): + pattern = os.path.join(file1.split('flat1')[0], 'flat2', + file1.split('_')[-1]) + flat2 = glob.glob(pattern)[0] + return flat2 + + def flat_pairs_task(det_name): """Single sensor execution of the flat pairs task.""" run = siteUtils.getRunNumber() @@ -350,7 +357,8 @@ def flat_pairs_task(det_name): task = sensorTest.FlatPairTask() task.run(file_prefix, flat_files, mask_files, gains, - linearity_spec_range=(1e4, 9e4), use_exptime=use_exptime) + linearity_spec_range=(1e4, 9e4), use_exptime=use_exptime, + flat2_finder=find_flat2_bot) results_file = '%s_eotest_results.fits' % file_prefix plots = sensorTest.EOTestPlots(file_prefix, results_file=results_file) From 5eb72093dca5d0ff6359692b9c1463666a869211 Mon Sep 17 00:00:00 2001 From: James Chiang Date: Tue, 15 Jan 2019 08:37:09 -0800 Subject: [PATCH 2/2] use correct pattern for finding flat2 file corresponding to a flat1 file --- .../BOT_EO_analysis/v0/producer_BOT_EO_analysis.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py b/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py index 2bc5feb..ec8224a 100755 --- a/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py +++ b/harnessed_jobs/BOT_EO_analysis/v0/producer_BOT_EO_analysis.py @@ -331,8 +331,9 @@ def cte_task(det_name): def find_flat2_bot(file1): - pattern = os.path.join(file1.split('flat1')[0], 'flat2', - file1.split('_')[-1]) + basename_pattern = '*_' + file1[-len('R22_S11.fits'):] + pattern = os.path.join(file1.split('flat1')[0] + 'flat2', + basename_pattern) flat2 = glob.glob(pattern)[0] return flat2 @@ -391,7 +392,8 @@ def ptc_task(det_name): gains = get_amplifier_gains(eotest_results_file) task = sensorTest.PtcTask() - task.run(file_prefix, flat_files, mask_files, gains) + task.run(file_prefix, flat_files, mask_files, gains, + flat2_finder=find_flat2_bot) results_file = '%s_eotest_results.fits' % file_prefix plots = sensorTest.EOTestPlots(file_prefix, results_file=results_file)