diff --git a/code/calibration/calibration.pro b/code/calibration/calibration.pro index 140074fa69c3bdb0751d1114106c6aef0672f6f3..bd9c3ee282289930d980134a765ec12a04587e07 100644 --- a/code/calibration/calibration.pro +++ b/code/calibration/calibration.pro @@ -17,7 +17,7 @@ useful_vars ; checking for input, if not use these ones if ~isa(camera) then camera = 'ITPI01' -if ~isa(target) then target = '201903' +if ~isa(target) then target = '202001' ; configuration file path, if not present using standard one defined in the code if ~isa(config_file) then config_file = config_path_filename() diff --git a/code/calibration/calibration_image.pro b/code/calibration/calibration_image.pro index 6e53d10d13ca4e3040064aa144a90399605ebf15..1263d58262b62aeb342156a3e09a3ae3f91989ad 100644 --- a/code/calibration/calibration_image.pro +++ b/code/calibration/calibration_image.pro @@ -65,14 +65,20 @@ for i=0, n-1 do begin img = read_fits(captures[i], rotate = par.fits.rotate, header = h) s = size(img) - ; if dimensions match, adding to the stack + ; if dimensions match if s[0] eq 2 and s[1] eq rotdim[0] and s[2] eq rotdim[1] then begin - stack[*,*,i] = img - headers.add, h - ii_dim = [ii_dim, i] - - endif + ; if needed keywords are provided in the fits header + if ispar(h, 'EXPOSURE') and ispar(h, 'DATE-OBS') then begin + + ; adding to the stack + stack[*,*,i] = img + headers.add, h + ii_dim = [ii_dim, i] + + endif + + endif endfor diff --git a/code/event/event.pro b/code/event/event.pro index 72a3549737d6fc91309892e19cc933e87b560d74..3db2f38fbb562cc0847f042b3da3b0c58dc1c5f3 100644 --- a/code/event/event.pro +++ b/code/event/event.pro @@ -14,7 +14,7 @@ compile_opt idl2 useful_vars -if ~isa(event) then event = '20190415T194950_UT' +if ~isa(event) then event = '20200101T182654_UT' ; configuration file path if ~isa(config_file) then config_file = config_path_filename() diff --git a/code/functions/common/check_path.pro b/code/functions/common/check_path.pro index fcae6a74b964bf1fe611e3f2559e24f6dd3bec6f..704258eae134820beef9751ca80aa5f49e3c4c56 100644 --- a/code/functions/common/check_path.pro +++ b/code/functions/common/check_path.pro @@ -6,7 +6,7 @@ compile_opt idl2 ; checking if last character is the path separator sep = strmid(path, strlen(path) - 1, 1) -if sep eq path_sep() then retv = strmid(path, 0, strlen(path) - 2) else retv = path +if sep eq path_sep() then retv = strmid(path, 0, strlen(path) - 1) else retv = path return, retv diff --git a/code/functions/fits/ispar.pro b/code/functions/fits/ispar.pro new file mode 100644 index 0000000000000000000000000000000000000000..78ee63c5be55666b8ec77b7b73e3311e721bb174 --- /dev/null +++ b/code/functions/fits/ispar.pro @@ -0,0 +1,10 @@ +; checking the presence of a keyword in a FITS header + +function ispar, header, keyword + +compile_opt idl2 + +check = isa(sxpar(header, keyword, /null)) +return, check + +end \ No newline at end of file diff --git a/code/functions/fits/read_fits.pro b/code/functions/fits/read_fits.pro index aff8e8c2a17abb7c9fdf6bcdd04576ce0b34dcb1..8eb6565908e657c99c3d312159f959d3e91db9bd 100644 --- a/code/functions/fits/read_fits.pro +++ b/code/functions/fits/read_fits.pro @@ -9,8 +9,12 @@ compile_opt idl2 ; standard rotate value if ~isa(rotate) then rotate = 0 -; reading and rotate fits image -retv = rotate(readfits(nomefile, header, /silent), rotate) +; reading fits image +retv = readfits(nomefile, header, /silent) + +; rotate the image (if twodimensional) +s = size(retv) +if s[0] eq 2 then retv = rotate(retv, rotate) ; making it float precision retv = float(retv) diff --git a/code/functions/orbit/orbital_vector.pro b/code/functions/orbit/orbital_vector.pro index c806a3c0729232978b2f9d7530348bbfd2706519..73176aaba49563c2ee569b2411792d4485f8197c 100644 --- a/code/functions/orbit/orbital_vector.pro +++ b/code/functions/orbit/orbital_vector.pro @@ -59,7 +59,6 @@ if isa(covar_elements) then begin so = sin(omega) cnu = cos(nu) snu = sin(nu) - Jrx = [ $ cl*((2.*h*cnu*co)/(!mu*(e*cnu + 1.)) - (2.*h*snu*so)/(!mu*(e*cnu + 1.))) - sl*ci*((2.*h*cnu*so)/(!mu*(e*cnu + 1.)) + (2.*h*co*snu)/(!mu*(e*cnu + 1.))), $