From 52ac7f98111339d8f7b07f4d54d20f486c84a6cb Mon Sep 17 00:00:00 2001 From: James Chiang Date: Thu, 20 Aug 2020 14:43:35 -0700 Subject: [PATCH 1/3] enable use of dark current files for raft mosaic --- .../raft_results_summary_BOT/v0/raft_results_task.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py b/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py index ed91e5b..69ee85a 100755 --- a/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py +++ b/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py @@ -112,11 +112,16 @@ def plt_savefig(filename): del median_bias # Dark mosaic + dark_files = None try: dark_files = get_raft_files_by_slot(raft_name, 'median_dark_bp.fits') - except FileNotFoundError as eobj: - print(eobj) - else: + except FileNotFoundError: + try: + dark_files = get_raft_files_by_slot(raft_name, + 'median_dark_current.fits') + except FileNotFoundError as eobj: + print(eobj) + if dark_files is not None: dark_mosaic = raftTest.make_raft_mosaic(dark_files, gains=gains, bias_frames=bias_frames) dark_mosaic.plot(title='{}, medianed dark frames'.format(title), From e320088cb3960f1c751da87375c62cf620b0e9db Mon Sep 17 00:00:00 2001 From: James Chiang Date: Wed, 26 Aug 2020 17:00:34 -0700 Subject: [PATCH 2/3] add verbose option to get_amplifier_gains --- python/bot_eo_analyses.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/python/bot_eo_analyses.py b/python/bot_eo_analyses.py index 26055b5..e1e812c 100644 --- a/python/bot_eo_analyses.py +++ b/python/bot_eo_analyses.py @@ -385,7 +385,8 @@ class GetAmplifierGains: configuration. """ def __init__(self, bot_eo_config_file=None, - et_results_file='et_results.pkl', run=None): + et_results_file='et_results.pkl', run=None, verbose=True): + self.verbose = verbose if run is None: self.run = siteUtils\ .get_analysis_run('gain', bot_eo_config_file=bot_eo_config_file) @@ -405,7 +406,8 @@ def _get_curated_gains(self): # Read the curated gains from the json file. with open(gain_file, 'r') as fd: self.curated_gains = json.load(fd) - print("GetAmplifierGains: Using gains from", gain_file) + if self.verbose: + print("GetAmplifierGains: Using gains from", gain_file) def _get_gains_from_run(self, et_results_file): if not os.path.isfile(et_results_file): @@ -415,7 +417,8 @@ def _get_gains_from_run(self, et_results_file): else: with open(et_results_file, 'rb') as fd: self.et_results = pickle.load(fd) - print("GetAmplifierGains: Using gains from run", self.run) + if self.verbose: + print("GetAmplifierGains: Using gains from run", self.run) def __call__(self, file_pattern): if self.run is None: @@ -428,7 +431,8 @@ def __call__(self, file_pattern): det_name = file_pattern[match.start(): match.end()] if self.curated_gains is not None: - print('GetAmplifierGains.__call__: retrieving curated gains.') + if self.verbose: + print('GetAmplifierGains.__call__: retrieving curated gains.') my_gains = self.curated_gains[det_name] if len(my_gains) == 8: channels = siteUtils.ETResults.wf_amp_names @@ -436,11 +440,13 @@ def __call__(self, file_pattern): channels = siteUtils.ETResults.amp_names return {amp: my_gains[_] for amp, _ in enumerate(channels, 1)} - print("GetAmplifierGains.__call__: retrieving gains from eT.") + if self.verbose: + print("GetAmplifierGains.__call__: retrieving gains from eT.") gains = self.et_results.get_amp_gains(det_name) if not gains: - print("GetAmplifierGains.__call__: " - "gains from eT not found, using unit gains.") + if self.verbose: + print("GetAmplifierGains.__call__: " + "gains from eT not found, using unit gains.") return {amp: 1 for amp in range(1, 17)} return gains From 532e07d1a808e32631ce3f2cc8672ef38f5af284 Mon Sep 17 00:00:00 2001 From: James Chiang Date: Wed, 26 Aug 2020 17:02:13 -0700 Subject: [PATCH 3/3] fix typo in WF sensor slot name --- harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py b/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py index 69ee85a..26c7154 100755 --- a/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py +++ b/harnessed_jobs/raft_results_summary_BOT/v0/raft_results_task.py @@ -277,7 +277,7 @@ def plt_savefig(filename): file_prefix = make_file_prefix(run, raft_name) df_raft = pd.read_pickle(stats_file) if raft_name in 'R00 R04 R40 R44': - slots = 'SG0 SW2 SW0 SG1'.split() + slots = 'SG0 SW1 SW0 SG1'.split() else: slots = 'S20 S21 S22 S10 S11 S12 S00 S01 S02'.split() t0 = int(np.min(df_raft['MJD']))