Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DREAMS from MICADO #180

Draft
wants to merge 34 commits into
base: dev_master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8e9562c
Merge pull request #85 from AstarVienna/dev_master
astronomyk Sep 29, 2022
143264e
Merge pull request #92 from AstarVienna/dev_master
hugobuddel Mar 8, 2023
089480f
Merge pull request #114 from AstarVienna/dev_master
hugobuddel Jul 11, 2023
57c4cc1
Merge pull request #135 from AstarVienna/dev_master
teutoburg Sep 9, 2023
d6079e5
Merge pull request #139 from AstarVienna/dev_master
teutoburg Oct 19, 2023
51cc2f8
Merge pull request #160 from AstarVienna/dev_master
teutoburg Feb 28, 2024
f71cba8
Replace FPA_array_layout.dat with DREAMS version
hugobuddel Jul 3, 2024
4e21e15
Add DREAMS version of 7_dithered_cluster.ipynb
hugobuddel Jul 3, 2024
d1757c6
Reorder the detectors
hugobuddel Jul 3, 2024
e2eb662
Remove extra things
hugobuddel Jul 3, 2024
523e5ce
Add DREAMS J filter
hugobuddel Jul 3, 2024
379275d
Switch to single filter, not two filterwheels
hugobuddel Jul 3, 2024
34c9cb9
Remove header keyword stuff
hugobuddel Jul 3, 2024
5a43be3
Add detector_binning
hugobuddel Jul 3, 2024
55ef1e8
Make readout_noise DREAMS compatible, remove ReferencePixelBorder
hugobuddel Jul 3, 2024
04847ec
Switch to DREAMS dark current and quantum efficiency
hugobuddel Jul 3, 2024
f572a17
Remove detector window effect
hugobuddel Jul 3, 2024
921de37
Add DREAMS header
hugobuddel Jul 3, 2024
ed3be82
Rename MICADO_H4RG to DREAMS_InGaAs
hugobuddel Jul 3, 2024
5cf86e1
Remove modes
hugobuddel Jul 3, 2024
cc77751
Replace PSF
hugobuddel Jul 3, 2024
bf8a728
Switch out some static surfaces
hugobuddel Jul 3, 2024
ec453da
Remove ELT and MORFEO. Makes sources hard to see
hugobuddel Jul 3, 2024
a14537b
Actually use the DREAMS PSF, but slightly smaller
hugobuddel Jul 3, 2024
5d6329b
Add notebook
hugobuddel Jul 3, 2024
15a1a38
Use pixel_scale and plate_scale 1/100 of DREAMS
hugobuddel Jul 3, 2024
5789173
Go for pixel_scale and plate scale 1/10th of DREAMS, cluster is small
hugobuddel Jul 3, 2024
7baf9b9
Make cluster larger
hugobuddel Jul 3, 2024
10ae10f
Try DREAMS / 5
hugobuddel Jul 3, 2024
29e146e
Oops, forgot LIST_DREAMS_mirrors_static.dat
hugobuddel Jul 3, 2024
ab55017
Use a single detector
hugobuddel Jul 3, 2024
ffec6de
Almost at 1 arcsec / pixel
hugobuddel Jul 3, 2024
9754f0f
The problem seems to be that the PSF size is smaller than the pixel size
hugobuddel Jul 3, 2024
7c4003c
Switch back to full resolution, all 6 detectors
hugobuddel Jul 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions MICADO/DREAMS_InGaAs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
---
### Princeton DREAMS InGaAs DETECTOR
object : detector
alias : DET
name : DREAMS_InGaAs_detector
description : base configuration for LFOA SBIG camera

properties:
image_plane_id : 0
temperature : -60
dit : "!OBS.dit"
ndit : "!OBS.ndit"
width: 1280
height: 1024
x: 0
y: 0
effects :
- name: full_detector_array
description : THe full 3x3 MICADO detector array list
class: DetectorList
include: True
kwargs:
filename : FPA_array_layout.dat
# filename : FPA_array_layout_single.dat # To test with a single detector
active_detectors : "all"

- name : qe_curve
description : Quantum efficiency curves for each detector
class : QuantumEfficiencyCurve
kwargs :
filename : QE_InGaAs.dat

- name: exposure_action
description: Summing up sky signal for all DITs and NDITs
class: SummedExposure

- name: dark_current
description : SBIG dark current
class: DarkCurrent
kwargs:
value: 67.00

- name: shot_noise
description : apply poisson shot noise to images
class: ShotNoise

- name: detector_linearity
description : Linearity characteristics of H4RG chips
class: LinearityCurve
kwargs:
# From MICADO
filename : FPA_linearity.dat
# From DREAMS, makes a huge difference
# incident: [0, 57143, 999999999999]
# measured: [0, 57143, 57143]

- name : readout_noise
description : Readout noise frames
class : BasicReadoutNoise
kwargs :
noise_std : 75

- name : detector_binning
description : Binning the detector frames
class : BinnedImage
kwargs :
bin_size : "!DET.bin_size"
37 changes: 11 additions & 26 deletions MICADO/FPA_array_layout.dat
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# name : MICADO H4RG-15 FPA
# author : Oliver Czoske
# sources: E-MCD-FPA-572089EB.uda, ELT-TRE-MCD-56300-0011
# date_created : 2017-06-28
# date_modified : 2023-07-28
# name : DREAMS 1280SCICAM
# author : Anjali Shivani Reddy
# sources : https://github.com/Astrogirlanajli/DREAMS/blob/main/5240-0001%20Scicam%20FPA%20Drawing%20mm%20v1.pdf
# date_created : 2024-05-04
# type : detector:chip_list
# x_cen_unit : mm
# y_cen_unit : mm
Expand All @@ -12,24 +11,10 @@
# angle_unit : deg
# gain_unit : electron/adu
#
# changes:
# - 2017-08-12 (OC) id changed to conform with spectroscopy report
# - 2018-07-26 (OC) large gap (chips 5 and 6) reduced to 8 mm
# - 2018-11-19 (KL) updated meta data to new format
# - 2019-01-28 (KL) moved units into header
# - 2022-02-09 (KL) small/large gap (chips 5 and 4) changed to 2.5/6.5 mm (see email from ric)
# - 2022-03-03 (KL) added detector angles based on (left, top) = (1,1) pixel from ELT-TRE-MCD-56300-0132
# - 2022-03-22 (KL) changed column names from x_len to x_size, removed columns xhw, yhw
# - 2022-03-22 (KL) flipped column 4 and 6 to make plotting in grid format easier
# - 2023-07-28 (OC) swap rows for detectors 4 and 6 to make id sequential
#
id x_cen y_cen x_size y_size pixel_size angle gain
1 -63.94 63.94 4096 4096 0.015 0.0 1.0
2 0.00 63.94 4096 4096 0.015 270.0 1.0
3 63.94 63.94 4096 4096 0.015 180.0 1.0
4 67.94 0.00 4096 4096 0.015 180.0 1.0
5 0.00 0.00 4096 4096 0.015 180.0 1.0
6 -63.94 0.00 4096 4096 0.015 0.0 1.0
7 -63.94 -63.94 4096 4096 0.015 0.0 1.0
8 0.00 -63.94 4096 4096 0.015 90.0 1.0
9 63.94 -63.94 4096 4096 0.015 180.0 1.0
id x_cen y_cen x_size y_size pixel_size angle gain
1 8.015 12.95 1280 1024 0.012 0.0 4.3
2 -8.015 12.95 1280 1024 0.012 0.0 4.3
3 8.015 0.000 1280 1024 0.012 0.0 4.3
4 -8.015 0.000 1280 1024 0.012 0.0 4.3
5 8.015 -12.95 1280 1024 0.012 0.0 4.3
6 -8.015 -12.95 1280 1024 0.012 0.0 4.3
10 changes: 10 additions & 0 deletions MICADO/LIST_DREAMS_mirrors_static.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# name : mirror_list
# outer_unit : m
# inner_unit : m
# angle_unit : degree
# temperature_unit : deg_C
# description : A list of optical surfaces in the telescope and camera. M[1-2] are the telescope mirrors.
#
name outer inner angle temperature action filename
M1 0.5 0.0 0 -40 reflection TER_mirror.dat
M2 0.5 0.0 0 -40 reflection TER_mirror.dat
75 changes: 8 additions & 67 deletions MICADO/MICADO.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ properties :
filter_file_format : "filters/TC_filter_{}.dat"

effects :
- name: micado_static_surfaces
description : surfaces list for wide field optics
- name: dreams_static_surfaces
description : telescope and camera optical surfaces
class: SurfaceList
kwargs:
filename: LIST_MICADO_mirrors_static.dat
filename: LIST_DREAMS_mirrors_static.dat

- name : micado_ncpas_psf
description : Effective NCPA induced PSF kernel
Expand All @@ -31,71 +31,12 @@ effects :
pixel_scale : "!INST.pixel_scale"
filename : "INST_MICADO_wavefront_error_budget.dat"

- name: filter_wheel_1
description: upper filter wheel
class: FilterWheel
- name: filter_curve
description : transmission curve for filter
class: FilterCurve
kwargs:
filter_names:
# Filter wheel 1
- open
- xI1
- xI2
- Spec_IJ
- Spec_HK
- I-long
- Y
- J
- J-short
- J-long
filename_format: "!INST.filter_file_format"
current_filter: "!OBS.filter_name_fw1"
minimum_throughput: !!float 1.01E-4
outer: 0.2
outer_unit: "m"

- name: filter_wheel_2
class: FilterWheel
kwargs:
filter_names:
- open
- xY2
- xK1
- xK2
- block
- K-mid
- K-short
- Ks
- H
- H-long
- H-short
- xH1
- xH2
- xJ1
- xJ2
- xY1
filename_format: "!INST.filter_file_format"
current_filter: "!OBS.filter_name_fw2"
minimum_throughput: !!float 1.01E-4
outer: 0.2
outer_unit: "m"

- name: pupil_wheel
class: FilterWheel
kwargs:
filter_names:
- H-cont
- FeII
- H2_1-0S1
- Br-gamma
- K-cont
- K-long
- He-I
- Pa-beta
- ND1
- ND3
- open
filename_format: "!INST.filter_file_format"
current_filter: "!OBS.filter_name_pupil"
filter_name: "!OBS.filter_name"
filename_format: "filters/TC_filter_{}.dat"
minimum_throughput: !!float 1.01E-4
outer: 0.2
outer_unit: "m"
112 changes: 0 additions & 112 deletions MICADO/MICADO_H4RG.yaml

This file was deleted.

39 changes: 37 additions & 2 deletions MICADO/MICADO_IMG_wide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,43 @@ name : MICADO_IMG_LR
description : additional effects for the wide-field imaging mode

properties :
pixel_scale : 0.004 # arcsec / pixel
plate_scale : 0.26666666666 # arcsec / mm
# DREAMS, does not work
pixel_scale : 2.48 # arcsec / pixel
plate_scale : 206.265 # arcsec / mm

# MICADO, works:
# pixel_scale : 0.004 # arcsec / pixel
# plate_scale : 0.26666666666 # arcsec / mm

# Something in between, DREAMS/10, also works
# pixel_scale : 0.248 # arcsec / pixel
# plate_scale : 20.6265 # arcsec / mm

# Something in between, DREAMS/5, does work
#pixel_scale : 0.496 # arcsec / pixel
#plate_scale : 41.253 # arcsec / mm

# Something in between, DREAMS/2.5, almost at 1 arcsec / pixel, works
#pixel_scale : 0.992 # arcsec / pixel
#plate_scale : 82.506 # arcsec / mm

# Something in between, DREAMS/2.6, just above 1 arcsec / pixel, works
#pixel_scale : 1.03333333 # arcsec / pixel
#plate_scale : 85.94375 # arcsec / mm

# Something in between, DREAMS/2, works
# pixel_scale : 1.24 # arcsec / pixel
# plate_scale : 103.1325 # arcsec / mm

# Something in between, DREAMS * 0.8, broken
# pixel_scale : 1.984 # arcsec / pixel
# plate_scale : 165.012 # arcsec / mm

# Something in between, DREAMS * 0.6, not sure, cluster is very faint maybe?, ah, this is almost the PSF size of 1.5
# Yes, setting the fwhm of the PSF to 15 instead of 1.5 makes it work
# pixel_scale : 1.488 # arcsec / pixel
# plate_scale : 123.759 # arcsec / mm


effects :
- name: micado_wide_field_mirror_list
Expand Down
Loading
Loading