Skip to content

Commit

Permalink
Merge pull request #168 from AstarVienna/kl/update_lss_traces
Browse files Browse the repository at this point in the history
Update METIS LSS traces
  • Loading branch information
teutoburg committed Apr 9, 2024
2 parents 80a0d75 + 8733486 commit 7039017
Show file tree
Hide file tree
Showing 14 changed files with 533 additions and 19 deletions.
1 change: 1 addition & 0 deletions ELT/tests/test_TER_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@


def test_eso_vs_scopesim_throughput():
rc.__currsys__["!TEL.temperature"] = 7
slist = sim.effects.SurfaceList(filename="LIST_mirrors_ELT.tbl")
wave = np.linspace(0.3, 2.5, 100) * u.um
if PLOTS:
Expand Down
Binary file modified METIS/TRACE_LSS_L.fits
Binary file not shown.
1 change: 1 addition & 0 deletions METIS/TRACE_LSS_L_old.fits

Large diffs are not rendered by default.

Binary file modified METIS/TRACE_LSS_M.fits
Binary file not shown.
1 change: 1 addition & 0 deletions METIS/TRACE_LSS_M_old.fits

Large diffs are not rendered by default.

Binary file modified METIS/TRACE_LSS_N.fits
Binary file not shown.
1 change: 1 addition & 0 deletions METIS/TRACE_LSS_N_old.fits

Large diffs are not rendered by default.

141 changes: 141 additions & 0 deletions METIS/code/2023-06-20-spectra_Grism-L_band.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# author : Conchi Cardenas Vazquez
# date_created : 2023-06-20
# source : Final LSS design for manufacturing
# wavelength_unit : um
# xi_unit : arcsec
# x_unit : mm
# y_unit : mm
#
# comments :
# - WARNING : Origin of coordinates at the detector: Detector sensitive surface, bottom-left corner.
# - lambda: 11 points
# - Field of View on-sky: 11 points
# - conf#2
# - L-band
# - spectra lenght = 1760 px
# - Field of View on-sky: s [arcsec], with respect to the optical axis.
# - Slit @CFO FP2 on-axis.
# - Coords at the detector: x, y [mm]
#
wavelength xi x y
2.90 5 34.999538 33.745033
2.90 4 31.685914 33.727450
2.90 3 28.371944 33.713754
2.90 2 25.057988 33.703953
2.90 1 21.744409 33.698053
2.90 0 18.431569 33.696056
2.90 -1 15.119834 33.697959
2.90 -2 11.809567 33.703757
2.90 -3 8.501130 33.713441
2.90 -4 5.194883 33.726997
2.90 -5 1.891181 33.744408
3.03 5 34.994055 30.515995
3.03 4 31.681510 30.498397
3.03 3 28.368629 30.484687
3.03 2 25.055769 30.474876
3.03 1 21.743290 30.468969
3.03 0 18.431554 30.466970
3.03 -1 15.120922 30.468875
3.03 -2 11.811755 30.474679
3.03 -3 8.504413 30.484373
3.03 -4 5.199252 30.497942
3.03 -5 1.896626 30.515369
3.16 5 34.988580 27.305202
3.16 4 31.677111 27.287605
3.16 3 28.365316 27.273895
3.16 2 25.053551 27.264083
3.16 1 21.742172 27.258176
3.16 0 18.431539 27.256176
3.16 -1 15.122009 27.258082
3.16 -2 11.813942 27.263886
3.16 -3 8.507693 27.273580
3.16 -4 5.203617 27.287149
3.16 -5 1.902064 27.304575
3.29 5 34.983130 24.110293
3.29 4 31.672729 24.092716
3.29 3 28.362016 24.079020
3.29 2 25.051341 24.069217
3.29 1 21.741059 24.063315
3.29 0 18.431524 24.061317
3.29 -1 15.123093 24.063221
3.29 -2 11.816121 24.069020
3.29 -3 8.510962 24.078705
3.29 -4 5.207965 24.092260
3.29 -5 1.907478 24.109667
3.42 5 34.977720 20.929352
3.42 4 31.668379 20.911812
3.42 3 28.358739 20.898144
3.42 2 25.049146 20.888361
3.42 1 21.739953 20.882471
3.42 0 18.431510 20.880476
3.42 -1 15.124171 20.882376
3.42 -2 11.818287 20.888164
3.42 -3 8.514208 20.897829
3.42 -4 5.212282 20.911357
3.42 -5 1.912853 20.928726
3.55 5 34.972370 17.760795
3.55 4 31.664076 17.743311
3.55 3 28.355496 17.729686
3.55 2 25.046974 17.719932
3.55 1 21.738859 17.714060
3.55 0 18.431497 17.712071
3.55 -1 15.125239 17.713965
3.55 -2 11.820431 17.719736
3.55 -3 8.517422 17.729372
3.55 -4 5.216555 17.742857
3.55 -5 1.918170 17.760170
3.68 5 34.967098 14.603291
3.68 4 31.659833 14.585883
3.68 3 28.352298 14.572316
3.68 2 25.044833 14.562603
3.68 1 21.737780 14.556754
3.68 0 18.431485 14.554774
3.68 -1 15.126292 14.556660
3.68 -2 11.822547 14.562407
3.68 -3 8.520592 14.572002
3.68 -4 5.220768 14.585430
3.68 -5 1.923410 14.602669
3.81 5 34.961925 11.455706
3.81 4 31.655669 11.438394
3.81 3 28.349158 11.424899
3.81 2 25.042729 11.415238
3.81 1 21.736720 11.409421
3.81 0 18.431473 11.407450
3.81 -1 15.127328 11.409327
3.81 -2 11.824626 11.415043
3.81 -3 8.523706 11.424588
3.81 -4 5.224904 11.437943
3.81 -5 1.928552 11.455087
3.94 5 34.956871 8.317054
3.94 4 31.651598 8.299858
3.94 3 28.346088 8.286453
3.94 2 25.040672 8.276855
3.94 1 21.735684 8.271075
3.94 0 18.431462 8.269118
3.94 -1 15.128342 8.270982
3.94 -2 11.826660 8.276661
3.94 -3 8.526752 8.286143
3.94 -4 5.228948 8.299410
3.94 -5 1.933577 8.316439
4.07 5 34.951959 5.186466
4.07 4 31.647640 5.169408
4.07 3 28.343101 5.156108
4.07 2 25.038670 5.146585
4.07 1 21.734676 5.140850
4.07 0 18.431452 5.138908
4.07 -1 15.129330 5.140758
4.07 -2 11.828641 5.146393
4.07 -3 8.529716 5.155801
4.07 -4 5.232882 5.168964
4.07 -5 1.938462 5.185856
4.20 5 34.947210 2.063164
4.20 4 31.643811 2.046264
4.20 3 28.340211 2.033088
4.20 2 25.036733 2.023652
4.20 1 21.733701 2.017969
4.20 0 18.431443 2.016044
4.20 -1 15.130287 2.017877
4.20 -2 11.830559 2.023461
4.20 -3 8.532585 2.032783
4.20 -4 5.236688 2.045824
4.20 -5 1.943185 2.062559
141 changes: 141 additions & 0 deletions METIS/code/2023-06-20-spectra_Grism-M_band.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
# author : Conchi Cardenas Vazquez
# date_created : 2023-06-20
# source : Final LSS design for manufacturing
# wavelength_unit : um
# xi_unit : arcsec
# x_unit : mm
# y_unit : mm
#
# comments :
# - WARNING : Origin of coordinates at the detector: Detector sensitive surface, bottom-left corner.
# - lambda: 11 points
# - Field of View on-sky: 11 points
# - conf#3
# - M-band
# - spectra lenght = 1680 px
# - Field of View on-sky: s [arcsec], with respect to the optical axis.
# - Slit @CFO FP2: on-axis.
# - Coords at the detector: x, y [mm]
#
wavelength xi x y
4.50 5 34.998332 33.031880
4.50 4 31.684942 33.011828
4.50 3 28.371211 32.996210
4.50 2 25.057496 32.985035
4.50 1 21.744160 32.978308
4.50 0 18.431566 32.976031
4.50 -1 15.120076 32.978201
4.50 -2 11.810052 32.984811
4.50 -3 8.501857 32.995852
4.50 -4 5.195847 33.011310
4.50 -5 1.892379 33.031167
4.57 5 34.993143 29.979960
4.57 4 31.680774 29.959901
4.57 3 28.368072 29.944276
4.57 2 25.055395 29.933096
4.57 1 21.743101 29.926366
4.57 0 18.431551 29.924087
4.57 -1 15.121105 29.926258
4.57 -2 11.812123 29.932872
4.57 -3 8.504964 29.943918
4.57 -4 5.199983 29.959382
4.57 -5 1.897532 29.979246
4.64 5 34.987948 26.934743
4.64 4 31.676599 26.914692
4.64 3 28.364928 26.899072
4.64 2 25.053290 26.887895
4.64 1 21.742041 26.881167
4.64 0 18.431537 26.878889
4.64 -1 15.122137 26.881059
4.64 -2 11.814199 26.887671
4.64 -3 8.508077 26.898714
4.64 -4 5.204125 26.914173
4.64 -5 1.902692 26.934028
4.71 5 34.982763 23.896042
4.71 4 31.672431 23.876015
4.71 3 28.361789 23.860414
4.71 2 25.051188 23.849249
4.71 1 21.740981 23.842527
4.71 0 18.431523 23.840251
4.71 -1 15.123169 23.842419
4.71 -2 11.816272 23.849024
4.71 -3 8.511186 23.860055
4.71 -4 5.208261 23.875496
4.71 -5 1.907842 23.895328
4.78 5 34.977607 20.863664
4.78 4 31.668285 20.843678
4.78 3 28.358666 20.828107
4.78 2 25.049096 20.816963
4.78 1 21.739928 20.810254
4.78 0 18.431510 20.807982
4.78 -1 15.124196 20.810146
4.78 -2 11.818336 20.816738
4.78 -3 8.514281 20.827748
4.78 -4 5.212376 20.843159
4.78 -5 1.912966 20.862951
4.85 5 34.972496 17.837403
4.85 4 31.664174 17.817475
4.85 3 28.355568 17.801948
4.85 2 25.047022 17.790835
4.85 1 21.738882 17.784144
4.85 0 18.431497 17.781878
4.85 -1 15.125216 17.784036
4.85 -2 11.820385 17.790611
4.85 -3 8.517351 17.801590
4.85 -4 5.216457 17.816957
4.85 -5 1.918044 17.836691
4.92 5 34.967450 14.817045
4.92 4 31.660113 14.797193
4.92 3 28.352507 14.781723
4.92 2 25.044972 14.770651
4.92 1 21.737850 14.763984
4.92 0 18.431485 14.761727
4.92 -1 15.126224 14.763877
4.92 -2 11.822410 14.770427
4.92 -3 8.520385 14.781366
4.92 -4 5.220489 14.796677
4.92 -5 1.923060 14.816336
4.99 5 34.962487 11.802366
4.99 4 31.656118 11.782607
4.99 3 28.349495 11.767210
4.99 2 25.042954 11.756188
4.99 1 21.736833 11.749552
4.99 0 18.431474 11.747304
4.99 -1 15.127217 11.749445
4.99 -2 11.824404 11.755965
4.99 -3 8.523372 11.766854
4.99 -4 5.224457 11.782094
4.99 -5 1.927993 11.801660
5.06 5 34.957628 8.793131
5.06 4 31.652205 8.773484
5.06 3 28.346543 8.758173
5.06 2 25.040976 8.747212
5.06 1 21.735837 8.740612
5.06 0 18.431464 8.738377
5.06 -1 15.128192 8.740506
5.06 -2 11.826359 8.746991
5.06 -3 8.526300 8.757819
5.06 -4 5.228345 8.772973
5.06 -5 1.932824 8.792428
5.13 5 34.952891 5.789092
5.13 4 31.648388 5.769577
5.13 3 28.343664 5.754367
5.13 2 25.039046 5.743478
5.13 1 21.734866 5.736922
5.13 0 18.431454 5.734701
5.13 -1 15.129144 5.736816
5.13 -2 11.828268 5.743258
5.13 -3 8.529157 5.754016
5.13 -4 5.232138 5.769069
5.13 -5 1.937534 5.788394
5.20 5 34.948299 2.789993
5.20 4 31.644686 2.770630
5.20 3 28.340870 2.755537
5.20 2 25.037173 2.744731
5.20 1 21.733922 2.738224
5.20 0 18.431445 2.736020
5.20 -1 15.130069 2.738119
5.20 -2 11.830123 2.744513
5.20 -3 8.531931 2.755188
5.20 -4 5.235818 2.770126
5.20 -5 1.942102 2.789301
Loading

0 comments on commit 7039017

Please sign in to comment.