diff --git a/code/calibration/calibration_day.pro b/code/calibration/calibration_day.pro index 96c6ffe673e492d2abcaf49e6ef697cf6e201f18..8d77a365dfe8df8d1aa91190c1f247cd77405940 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 93d6bdf7b92184d932b217f5274ea9305e9c9b83..a92fe98f5f9dce53578ff2ca229d474af951cde4 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 3306300bc740e86099797f82b329d921e3f276e9..0c8d9c8ad55f2910236cc82434e24d9b461ba950 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 400dd0fb997b047cc8842b51e9def089a1217b8f..e0627a97dd5cd6711a4f98da0103fdce05036380 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 83c764c0d89f2688a982604359d1df9507f8587e..341faf3b44c4e372636cd9c3b04ff98d4cc2aaa5 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 2c0a7de8eece7acb186774613c75cb196fc79c56..cd1b5d4af91c2467b619564fb644c70b83acb1be 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 065a8bba99066a2b114553396c1f6eafbbafe2c3..e7d8dd8730e27f15c6ee31022f51be7aa439050f 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 02209a7992bdd790c6d6f367394661fcdf0472a7..c539a2edf19b7bb79dfb908c9928a7bf83a724de 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 adc6852ce172b7e242d9e12b2bf37fa373c0cb84..a843adc0aeacb075855a9bddc47d7a603f5a3ecf 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