ZSHTR-71 Latest model

.gitignore

@@ -85,3 +85,5 @@ TEST*.fits
 
 # Pylint
 .pylint.d/
+
+.DS_Store

Keck/LIST_keck_mirrors.dat

@@ -11,4 +11,4 @@
 # changes :
 #
 name  outer  inner  angle  temperature  action         filename
-M1    10.0    1.0    0.     0           reflection     TC_mirror_aluminium.dat
+M1    10.0    1.0    0.     -273           reflection     TC_mirror_aluminium.dat

MaunaKea/MaunaKea.yaml

@@ -9,7 +9,7 @@ properties :
     altitude :      4123        # m
     longitude :     -155.4744    # deg
     latitude :      19.8263    # deg
-    temperature :   2.5           # deg C
+    temperature :   -273           # deg C
     humidity :      0.1         # [0..1]
     pressure :      0.620       # [bar]
     pwv :           1.0         # [mm]

ZShooter/ZShooter_DET.yaml → ZShooter_v1/ZShooter_DET.yaml

@@ -14,7 +14,7 @@ properties :
 
 effects :
   - name: detector_nir
-    description: Single 4k x 4k detector for ZShooter NIR arm
+    description: Two detectors for ZShooter NIR arm
     include: True
     class: DetectorList
     kwargs:
@@ -35,6 +35,7 @@ effects :
         pixel_size_unit: mm
         angle_unit: deg
         gain_unit: electron/adu
+        detector: "NIR"
 
   - name: detector_vis
     description: Single 4k x 4k detector for ZShooter VIS arm
@@ -58,6 +59,7 @@ effects :
         pixel_size_unit: mm
         angle_unit: deg
         gain_unit: electron/adu
+        detector: "VIS"
 
   - name: detector_uvb
     description: Single 4k x 4k detector for ZShooter UVB arm
@@ -81,6 +83,7 @@ effects :
         pixel_size_unit: mm
         angle_unit: deg
         gain_unit: electron/adu
+        detector: "UVB"
 
   - name: exposure_integration
     description: Summing up sky signal for all DITs and NDITs

ZShooter/ZShooter_SPEC.yaml → ZShooter_v1/ZShooter_SPEC.yaml

@@ -1,9 +1,9 @@
-### Common effects list for ZShooter
+### Common effects list for ZShooter_v1
 
 object: instrument
 alias: INST
-name: ZShooter
-description: Effects from the ZShooter optics
+name: ZShooter_v1
+description: Effects from the ZShooter_v1 optics
 
 properties:
   decouple_detector_from_sky_headers: True  # needed for slit spectroscopy
@@ -14,12 +14,12 @@ properties:
 effects:
  - name: dichroic_tree
    description: ZShooter dichroic tree
-   class: DichroicTreeEffect
+   class: DichroicTree
    include: True
    kwargs:
      tree_filename: "dichroics/dichroic_tree.dat"
      dichroic_names: "!INST.dichroic_names"
-     filename_format: "dichroics/TER_{}.dat"
+     filename_format: "dichroics/TER_tree_{}.dat"
 
  - name: slit_nir
    description: ZShooter NIR slit
@@ -50,20 +50,20 @@ effects:
    class: SpectralEfficiency
    include: True
    kwargs:
-     filename: "traces/TRACE_eff.fits"
+     filename: "traces/TRACE_eff_old.fits"
 
  - name: trace_list
    description: list of spectral order trace geometry on the focal plane
    class: SpectralTraceList
    include: True
    kwargs:
-     filename: "traces/TRACE_ZSHOOTER.fits"
+     filename: "traces/TRACE_ZSHOOTER_old.fits"
      wave_colname: "wavelength"
      s_colname: "s"
      col_number_start: 1
 
  - name: detector_qe
-   description: QE curve for new OSIRIS detector, placeholder for ZShooter
+   description: QE curve for new OSIRIS detector, placeholder for ZShooter_v1
    class: QuantumEfficiencyCurve
    include: True
    kwargs:

ZShooter/default.yaml → ZShooter_v1/default.yaml

@@ -11,16 +11,15 @@ version: 0.1
 packages:
 - MaunaKea
 - keck
-- ZShooter
+- ZShooter_v1
 
 yamls:
 - MaunaKea.yaml
 - Keck.yaml
 - ZShooter.yaml
-- ZShooter_DET.yaml
 
 properties:
-  instrument : ZShooter
+  instrument : ZShooter_v1
   modes : ["SPEC"]
   airmass : 1.2
   declination : 0
@@ -40,6 +39,7 @@ mode_yamls:
   description : "spectroscopic mode"
   yamls :
     - ZShooter_SPEC.yaml
+    - ZShooter_DET.yaml
 
 ---
 ### default simulation parameters needed for a MICADO simulation

ZShooter_v2/LIST_ZShooter_mirrors.dat

@@ -0,0 +1,14 @@
+# author : Y. Sharma
+# date_created  : 2025-09-24
+# status : Placeholder for the ZShooter selector mirror
+# type : mirror:list
+# outer_unit : m
+# inner_unit : m
+# angle_unit : degree
+# temperature_unit  : deg_C
+# changes :
+# - 2025-09-24 : created a placeholder file (copied from HAWKI)
+#
+name        outer   inner   angle   temperature     action         filename
+M0_EntrWin  0.4     0.0     0       -273            transmission   TER_window.dat
+M1_Fold     0.4     0.0     0       -273            reflection     TER_selector.dat

ZShooter_v2/QE.dat

@@ -0,0 +1,13 @@
+# author : Y. Sharma
+# date_created  : 2025-10-30
+# type : detector:quantum_efficiency
+# description : quantum efficiency
+# wavelength_unit: um
+# action : transmission
+# changes :
+wavelength  transmission
+0.29          0.0
+0.30          1.0
+1.00          1.0
+3.00          1.0
+3.01          0.0

ZShooter_v2/TER_selector.dat

@@ -0,0 +1,12 @@
+# author : Y. Sharma
+# date_created : 2025-09-24
+# status : placeholder
+# type : mirror:reflection
+# wavelength_unit : um
+# description :
+# changes :
+# - 2025-09-24 : created a placeholder file (copied from HAWKI)
+#
+wavelength  reflection
+0.3         0.985
+3.0         0.985

ZShooter_v2/TER_window.dat

@@ -0,0 +1,17 @@
+# name : Entrance window spectral response
+# description : Throughput of the entrance window (placeholder)
+# author : Y. Sharma
+# sources:
+# date_created : 2025-09-24
+# status : Idea - guess pulled out of thin air
+# type : window:transmission
+# wavelength_unit : um
+#
+# changes :
+# - 2025-09-24 : created a placeholder file (copied from HAWKI)
+#
+wavelength  transmission    reflection      emissivity
+0.3         0               1               0
+0.31        0.90            0               0.1
+3.0         0.90            0               0.1
+3.01        0               1               0

ZShooter_v2/ZShooter.yaml

@@ -0,0 +1,19 @@
+### Common effects list for ZShooter
+
+object: instrument
+alias: INST
+name: ZShooter
+description: Common effects from the ZShooter_v1 optics
+
+properties:
+  temperature: -80 #TODO: check value
+  pixel_scale : 0.159574468085 #TODO update with real value
+  plate_scale : 10.638297872333334 #TODO update with real value
+
+effects:
+  - name: Selector
+    description: Mirror selector for imaging or spectroscopic mode
+    class: SurfaceList
+    include: True
+    kwargs:
+      filename: LIST_ZShooter_mirrors.dat