From 0b96732bc08baa09809106726edb5308c1b9e1c9 Mon Sep 17 00:00:00 2001 From: Dario Barghini <dario.barghini@inaf.it> Date: Wed, 20 Nov 2024 11:06:26 +0100 Subject: [PATCH] Fix bug for which calibration stops for the whole month if one day is not configured. Fix some return codes --- code/calibration/calibration_day.pro | 3 ++- code/calibration/calibration_image.pro | 3 ++- code/calibration/calibration_month.pro | 3 ++- code/calibration/compression_day.pro | 7 ++++--- code/calibration/compression_image.pro | 7 ++++--- code/calibration/compression_month.pro | 3 ++- code/calibration/export_month.pro | 3 ++- code/calibration/report_year.pro | 7 ++++--- code/calibration/update_config.pro | 3 ++- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/code/calibration/calibration_day.pro b/code/calibration/calibration_day.pro index 96c6ffe..8d77a36 100644 --- a/code/calibration/calibration_day.pro +++ b/code/calibration/calibration_day.pro @@ -9,7 +9,8 @@ compile_opt idl2 message, camera + '_' + day + ' - start day processing.', /informational ; retrieve setting parameters -par = get_par(config, camera, day) +par = get_par(config, camera, day, /return0) +if par.file eq '' then return ; checking for keyword input if isa(report_astro) then par.config.calibration.report_astro = report_astro diff --git a/code/calibration/calibration_image.pro b/code/calibration/calibration_image.pro index 93d6bdf..a92fe98 100644 --- a/code/calibration/calibration_image.pro +++ b/code/calibration/calibration_image.pro @@ -12,7 +12,8 @@ compile_opt idl2 message, camera + '_' + day + ' - start image processing.', /informational ; retrieve setting parameters -par = get_par(config, camera, day) +par = get_par(config, camera, day, /return0) +if par.file eq '' then return ; checking for keyword input if isa(yplot) then par.config.calibration.yplot = yplot diff --git a/code/calibration/calibration_month.pro b/code/calibration/calibration_month.pro index 3306300..0c8d9c8 100644 --- a/code/calibration/calibration_month.pro +++ b/code/calibration/calibration_month.pro @@ -8,7 +8,8 @@ compile_opt idl2 message, camera + '_' + month + ' - start month processing.', /informational ; retrieve setting parameters -par = get_par(config, camera, month) +par = get_par(config, camera, month, /return0) +if par.file eq '' then return ; checking for keyword input if isa(report_astro) then par.config.report_astro = report_astro diff --git a/code/calibration/compression_day.pro b/code/calibration/compression_day.pro index 400dd0f..e0627a9 100644 --- a/code/calibration/compression_day.pro +++ b/code/calibration/compression_day.pro @@ -7,12 +7,13 @@ compile_opt idl2 message, camera + '_' + day + ' - start day compression.', /informational +; retrieve setting parameters +par = get_par(config, camera, day, /return0) +if par.file eq '' then return + ; checking for keyword input if ~isa(checksum) then checksum = 0 -; retrieve setting parameters -par = get_par(config, camera, day) - ; date of the night date = strmid(day, 0, 4) + '-' + strmid(day, 4, 2) + '-' + strmid(day, 6, 2) diff --git a/code/calibration/compression_image.pro b/code/calibration/compression_image.pro index 83c764c..341faf3 100644 --- a/code/calibration/compression_image.pro +++ b/code/calibration/compression_image.pro @@ -7,12 +7,13 @@ compile_opt idl2 message, camera + '_' + day + ' - start image compression.', /informational +; retrieve setting parameters +par = get_par(config, camera, day, /return0) +if par.file eq '' then return + ; checking for keyword input if ~isa(checksum) then checksum = 0 -; retrieve setting parameters -par = get_par(config, camera, day) - date = strmid(day, 0, 4) + '-' + strmid(day, 4, 2) + '-' + strmid(day, 6, 2) ; filenames diff --git a/code/calibration/compression_month.pro b/code/calibration/compression_month.pro index 2c0a7de..cd1b5d4 100644 --- a/code/calibration/compression_month.pro +++ b/code/calibration/compression_month.pro @@ -11,7 +11,8 @@ message, camera + '_' + month + ' - start month compression.', /informational if ~isa(checksum) then checksum = 0 ; retrieve setting parameters -par = get_par(config, camera, month) +par = get_par(config, camera, month, /return0) +if par.file eq '' then return date = strmid(month, 0, 4) + '-' + strmid(month, 4, 2) diff --git a/code/calibration/export_month.pro b/code/calibration/export_month.pro index 065a8bb..e7d8dd8 100644 --- a/code/calibration/export_month.pro +++ b/code/calibration/export_month.pro @@ -7,7 +7,8 @@ compile_opt idl2 message, camera + '_' + month + ' - start exporting month solution.', /informational ; retrieve setting parameters -par = get_par(config, camera, month) +par = get_par(config, camera, month, /return0) +if par.file eq '' then return ; retrieving list of names for output files files = get_files(par, month) diff --git a/code/calibration/report_year.pro b/code/calibration/report_year.pro index 02209a7..c539a2e 100644 --- a/code/calibration/report_year.pro +++ b/code/calibration/report_year.pro @@ -9,6 +9,10 @@ compile_opt idl2 message, camera + '_' + target + ' - start exporting calibration report.', /informational +; reading camera parameters structure from last analyzed month +par = get_par(config, camera, ff[-1], /return0) +if par.file eq '' then return + ; going into the calibration results directory ckcd, config.path.dir_calibrations, current = old_dir, check = check if ~check then return @@ -25,9 +29,6 @@ if ff[0] eq '' then begin endif -; reading camera parameters structure from last analyzed month -par = get_par(config, camera, ff[-1]) - ; checking for keyword input if isa(report_calib) then par.config.calibration.report_calib = report_calib if isa(excel_calib) then par.config.calibration.excel_calib = excel_calib diff --git a/code/calibration/update_config.pro b/code/calibration/update_config.pro index adc6852..a843adc 100644 --- a/code/calibration/update_config.pro +++ b/code/calibration/update_config.pro @@ -7,7 +7,8 @@ compile_opt idl2 message, camera + '_' + month + ' - start updating configuration file.', /informational ; retrieve setting parameters -par = get_par(config, camera, month) +par = get_par(config, camera, month, /return0) +if par.file eq '' then return ; going into calibration results directory / camera / month ckcd, par.config.path.dir_calibrations, current = old_dir, check = check -- GitLab