Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
L2 pipelines
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Metis scientific pipeline
L2 pipelines
Commits
ae959234
Commit
ae959234
authored
3 years ago
by
Roberto Susino
Browse files
Options
Downloads
Patches
Plain Diff
Fix bugs in dark file selection
parent
4e3758f8
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
metis_dark_uvda.pro
+18
-9
18 additions, 9 deletions
metis_dark_uvda.pro
metis_dark_vlda.pro
+28
-17
28 additions, 17 deletions
metis_dark_vlda.pro
with
46 additions
and
26 deletions
metis_dark_uvda.pro
+
18
−
9
View file @
ae959234
...
@@ -10,12 +10,16 @@ function metis_dark_uvda, data, header, cal_pack, history = history
...
@@ -10,12 +10,16 @@ function metis_dark_uvda, data, header, cal_pack, history = history
obj_cnt
=
header
.
obj_cnt
obj_cnt
=
header
.
obj_cnt
obt_beg
=
header
.
obt_beg
obt_beg
=
header
.
obt_beg
;
WARN
-
temporary
patch
to
handle
local
l1
fits
files
;
if
tsensor
eq
0
.
then
tsensor
=
-
25
.
for
i
=
0
,
n_elements
(
dark
)
-
1
do
begin
for
i
=
0
,
n_elements
(
dark
)
-
1
do
begin
if
(
dark
[
i
].
dit
eq
dit
)
and
(
dark
[
i
].
nbin
eq
nbin
)
and
(
dark
[
i
].
ndit1
eq
ndit1
)
and
(
dark
[
i
].
ndit2
eq
ndit2
)
and
(
abs
(
dark
[
i
].
tsensor
-
tsensor
)
lt
5
)
and
(
abs
(
obt_beg
-
dark
[
i
].
obt_beg
)
lt
(
3600
*
24
*
10
))
then
begin
if
(
dark
[
i
].
dit
eq
dit
)
and
(
dark
[
i
].
ndit1
eq
ndit1
)
and
(
dark
[
i
].
ndit2
eq
ndit2
)
and
(
abs
(
dark
[
i
].
tsensor
-
tsensor
)
lt
5
.
)
and
(
abs
(
obt_beg
-
dark
[
i
].
obt_beg
)
lt
(
3600
.
*
24
.
*
10
.
))
then
begin
if
obj_cnt
eq
1
then
begin
if
obj_cnt
eq
1
then
begin
dark_file
=
dark
[
i
].
file_name
.
cnt_1
dark_file
=
dark
[
i
].
file_name
.
cnt_1
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_1
,
/
silent
))
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
_file
,
/
silent
))
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
mask
=
where
(
data
eq
0
.,
count
)
mask
=
where
(
data
eq
0
.,
count
)
data
=
data
-
dark_image
*
ndit1
*
ndit2
data
=
data
-
dark_image
*
ndit1
*
ndit2
data
[
mask
]
=
0
.
data
[
mask
]
=
0
.
...
@@ -23,8 +27,9 @@ function metis_dark_uvda, data, header, cal_pack, history = history
...
@@ -23,8 +27,9 @@ function metis_dark_uvda, data, header, cal_pack, history = history
goto
,
jump
goto
,
jump
endif
else
begin
endif
else
begin
dark_file
=
dark
[
i
].
file_name
.
cnt_2
dark_file
=
dark
[
i
].
file_name
.
cnt_2
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_2
,
/
silent
))
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
_file
,
/
silent
))
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
mask
=
where
(
data
eq
0
.,
count
)
mask
=
where
(
data
eq
0
.,
count
)
data
=
data
-
dark_image
*
ndit1
*
ndit2
data
=
data
-
dark_image
*
ndit1
*
ndit2
data
[
mask
]
=
0
.
data
[
mask
]
=
0
.
...
@@ -36,28 +41,32 @@ function metis_dark_uvda, data, header, cal_pack, history = history
...
@@ -36,28 +41,32 @@ function metis_dark_uvda, data, header, cal_pack, history = history
obt_available
=
!
null
obt_available
=
!
null
for
i
=
0
,
n_elements
(
dark
)
-
1
do
begin
for
i
=
0
,
n_elements
(
dark
)
-
1
do
begin
if
(
dark
[
i
].
dit
eq
dit
)
and
(
abs
(
dark
[
i
].
tsensor
-
tsensor
)
lt
5
)
then
begin
if
(
dark
[
i
].
dit
eq
dit
)
and
(
abs
(
dark
[
i
].
tsensor
-
tsensor
)
lt
5
.)
then
obt_available
=
[
obt_available
,
dark
[
i
].
obt_beg
]
obt_available
=
[
obt_available
,
dark
[
i
].
obt_beg
]
endif
endfor
endfor
if
not
isa
(
obt_available
)
then
begin
dark_file
=
'applicable file not found - correction not applied'
goto
,
jump
endif
delta_obt
=
min
(
abs
(
obt_beg
-
obt_available
),
j
)
delta_obt
=
min
(
abs
(
obt_beg
-
obt_available
),
j
)
i
=
where
(
dark
.
obt_beg
eq
obt_available
[
j
])
i
=
where
(
dark
.
obt_beg
eq
obt_available
[
j
])
if
obj_cnt
eq
1
then
begin
if
obj_cnt
eq
1
then
begin
if
(
ndit1
eq
dark
[
i
].
ndit1
)
and
(
ndit2
eq
dark
[
i
].
ndit2
)
then
begin
if
(
ndit1
eq
dark
[
i
].
ndit1
)
and
(
ndit2
eq
dark
[
i
].
ndit2
)
then
begin
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_1
,
/
silent
))
dark_file
=
dark
[
i
].
file_name
.
cnt_1
dark_file
=
dark
[
i
].
file_name
.
cnt_1
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark_file
,
/
silent
))
endif
else
begin
endif
else
begin
q
=
ndit2
/
dark
[
i
].
ndit2
q
=
ndit2
/
dark
[
i
].
ndit2
dark_file
=
dark
[
i
].
file_name
.
cnt_1
+
' - '
+
dark
[
i
].
file_name
.
cnt_2
dark_1
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_1
,
/
silent
))
dark_1
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_1
,
/
silent
))
dark_2
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_2
,
/
silent
))
dark_2
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_2
,
/
silent
))
dark_image
=
(
dark_1
+
(
q
-
1
)
*
dark_2
)
/
q
dark_image
=
(
dark_1
+
(
q
-
1
)
*
dark_2
)
/
q
dark_file
=
dark
[
i
].
file_name
.
cnt_1
+
' - '
+
dark
[
i
].
file_name
.
cnt_2
endelse
endelse
endif
else
begin
endif
else
begin
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
.
cnt_2
,
/
silent
))
dark_file
=
dark
[
i
].
file_name
.
cnt_2
dark_file
=
dark
[
i
].
file_name
.
cnt_2
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark_file
,
/
silent
))
endelse
endelse
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
...
...
This diff is collapsed.
Click to expand it.
metis_dark_vlda.pro
+
28
−
17
View file @
ae959234
...
@@ -8,15 +8,18 @@ function metis_dark_vlda, data, header, cal_pack, history = history
...
@@ -8,15 +8,18 @@ function metis_dark_vlda, data, header, cal_pack, history = history
ndit
=
header
.
ndit
ndit
=
header
.
ndit
nbin
=
sqrt
(
header
.
nbin
)
nbin
=
sqrt
(
header
.
nbin
)
tsensor
=
header
.
tsensor
tsensor
=
header
.
tsensor
obt_beg
=
header
.
obt_beg
/
1000
.
D0
obt_beg
=
header
.
obt_beg
/
1000
.
D0
;
check
why
obt_beg
must
be
divided
by
1000
.
;
WARN
-
temporary
patch
to
handle
local
l1
fits
files
;
if
tsensor
eq
0
.
then
tsensor
=
-
30
.
for
i
=
0
,
n_elements
(
bias_dark
)
-
1
do
begin
for
i
=
0
,
n_elements
(
bias_dark
)
-
1
do
begin
if
bias_dark
[
i
].
dit
eq
dit
and
bias_dark
[
i
].
nbin
eq
nbin
and
abs
(
bias_dark
[
i
].
tsensor
-
tsensor
)
lt
5
then
begin
if
bias_dark
[
i
].
dit
eq
dit
and
bias_dark
[
i
].
nbin
eq
nbin
and
abs
(
bias_dark
[
i
].
tsensor
-
tsensor
)
lt
5
.
then
begin
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
bias_dark
[
i
].
file_name
,
/
silent
))
dark_file
=
bias_dark
[
i
].
file_name
dark_file
=
bias_dark
[
i
].
file_name
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark_file
,
/
silent
))
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
*
ndit
mask
=
where
(
data
eq
0
.)
mask
=
where
(
data
eq
0
.)
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
*
ndit
data
=
data
-
dark_image
data
=
data
-
dark_image
data
[
mask
]
=
0
.
data
[
mask
]
=
0
.
...
@@ -26,25 +29,33 @@ function metis_dark_vlda, data, header, cal_pack, history = history
...
@@ -26,25 +29,33 @@ function metis_dark_vlda, data, header, cal_pack, history = history
bias_obt_available
=
!
null
bias_obt_available
=
!
null
for
i
=
0
,
n_elements
(
bias
)
-
1
do
begin
for
i
=
0
,
n_elements
(
bias
)
-
1
do
begin
if
abs
(
bias
[
i
].
tsensor
-
tsensor
)
lt
5
then
$
if
abs
(
bias
[
i
].
tsensor
-
tsensor
)
lt
5
.
then
bias_obt_available
=
[
bias_obt_available
,
bias
[
i
].
obt_beg
]
bias_obt_available
=
[
bias_obt_available
,
bias
[
i
].
obt_beg
]
endfor
endfor
if
isa
(
bias_obt_available
)
then
begin
delta_obt
=
min
(
abs
(
obt_beg
-
bias_obt_available
),
j
)
delta_obt
=
min
(
abs
(
obt_beg
-
bias_obt_available
),
j
)
i
=
where
(
bias
.
obt_beg
eq
bias_obt_available
[
j
])
i
=
where
(
bias
.
obt_beg
eq
bias_obt_available
[
j
])
bias_image
=
float
(
readfits
(
cal_pack
.
path
+
bias
[
i
].
file_name
,
/
silent
))
bias_image
=
float
(
readfits
(
cal_pack
.
path
+
bias
[
i
].
file_name
,
/
silent
))
dark_file
=
bias
[
i
].
file_name
dark_file
=
bias
[
i
].
file_name
endif
else
begin
bias_image
=
fltarr
(
header
.
naxis1
,
header
.
naxis2
)
dark_file
=
'applicable bias file not found - correction not applied'
endelse
dark_obt_available
=
!
null
dark_obt_available
=
!
null
for
i
=
0
,
n_elements
(
dark
)
-
1
do
begin
for
i
=
0
,
n_elements
(
dark
)
-
1
do
begin
if
abs
(
dark
[
i
].
tsensor
-
tsensor
)
lt
5
then
$
if
abs
(
dark
[
i
].
tsensor
-
tsensor
)
lt
5
.
then
dark_obt_available
=
[
dark_obt_available
,
dark
[
i
].
obt_beg
]
dark_obt_available
=
[
dark_obt_available
,
dark
[
i
].
obt_beg
]
endfor
endfor
if
isa
(
dark_obt_available
)
then
begin
delta_obt
=
min
(
abs
(
obt_beg
-
dark_obt_available
),
j
)
delta_obt
=
min
(
abs
(
obt_beg
-
dark_obt_available
),
j
)
i
=
where
(
dark
.
obt_beg
eq
dark_obt_available
[
j
])
i
=
where
(
dark
.
obt_beg
eq
dark_obt_available
[
j
])
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
,
/
silent
))
dark_image
=
float
(
readfits
(
cal_pack
.
path
+
dark
[
i
].
file_name
,
/
silent
))
dark_file
=
[
dark_file
,
dark
[
i
].
file_name
]
dark_file
=
[
dark_file
,
dark
[
i
].
file_name
]
endif
else
begin
dark_image
=
fltarr
(
header
.
naxis1
,
header
.
naxis2
)
dark_file
=
[
dark_file
,
'applicable dark file not found - correction not applied'
]
endelse
bias_image
=
rebin
(
bias_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
bias_image
=
rebin
(
bias_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
dark_image
=
rebin
(
dark_image
,
header
.
naxis1
,
header
.
naxis2
)
*
nbin
^
2
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment