Merge pull request #115 from GalSim-developers/fix/issue-112-113

Fix/issue 112 113

Author: aguinot

euclidlike/instrument_params.py

@@ -7,17 +7,19 @@
 import galsim
 
 # Set these quantities
-gain = 3.4  # e-/ADU, https://www.euclid-ec.org/public/mission/vis/
+gain = 3.48  # e-/ADU, https://www.euclid-ec.org/public/mission/vis/
 pixel_scale = 0.1  # arcsec / pixel
 diameter = 1.2  # meters
 obscuration = 0.42  # meters, inferred from diameter and collecting area
 focal_length = 24.5  # meters
 fratio = focal_length / diameter  # dimension-less, inferred from diameter and focal_length
 collecting_area = 9926  # cm^2, from https://www.euclid-ec.org/science/overview/
 long_exptime = 566  # s (for the longer exposures used for VIS images)
+long_exptime_eff = 560.53  # s (effective time VIS imaging exposures) (This is the one to use for flux computation)
 nisp_exptime_total = 112  # s (total time NISP imaging exposures)
 nisp_exptime_eff = 87.2  # s (effective time NISP imaging exposures) (This is the one to use for flux computation)
 short_exptime_vis = 95 # s (for the shorter exposures with VIS taken in parallel with NISP imaging)
+short_exptime_vis_eff = 89.52  # s (effective time VIS imaging exposures) (This is the one to use for flux computation)
 read_noise = 4.4  # e-, https://www.euclid-ec.org/public/mission/vis/
 saturation = 200000 # e-, from https://www.euclid-ec.org/public/mission/vis/
 n_dithers = 4
@@ -137,4 +139,4 @@
 # this module.  However, pointing errors / jitter are quantified in the VIS paper.
 #
 # The impact of the dichroic and of charge transfer inefficiency are not included.  Same for
-# saturation (200000 e-).
+# saturation (200000 e-).

euclidlike_imsim/data/euclid_obseq.pkl

@@ -27,7 +27,9 @@
 
 from euclidlike.instrument_params import (
     long_exptime,
+    long_exptime_eff,
     short_exptime_vis,
+    short_exptime_vis_eff,
     nisp_exptime_total,
     nisp_exptime_eff,
 )
@@ -85,8 +87,12 @@ def convert_ecliptic_to_equatorial(elon, elat, epa):
 shift_2_years = 365 * 2 + 1
 shift_6_years = 365 * 6 + 1
 
+VIS_exp_long_eff = long_exptime_eff
 VIS_exp_long = long_exptime
+VIS_exp_long_wait = VIS_exp_long - VIS_exp_long_eff
+VIS_exp_short_eff = short_exptime_vis_eff
 VIS_exp_short = short_exptime_vis
+VIS_exp_short_wait = VIS_exp_short - VIS_exp_short_eff
 NISP_exp_int = nisp_exptime_total
 NISP_exp_eff = nisp_exptime_eff
 NISP_exp_wait = NISP_exp_int - NISP_exp_eff
@@ -96,10 +102,11 @@ def convert_ecliptic_to_equatorial(elon, elat, epa):
 dither_seq = {
     0: {
         "VIS": [
-            {"wait": 8},
-            {"VIS_LONG": VIS_exp_long},
-            {"wait": 40 + NISP_exp_int + 22 + NISP_exp_int + 22},
-            {"VIS_SHORT": VIS_exp_short},
+            {"wait": 8 + VIS_exp_long_wait / 2},
+            {"VIS_LONG": VIS_exp_long_eff},
+            {"wait": VIS_exp_long_wait / 2 + 40 + NISP_exp_int + 22 + NISP_exp_int + 22 + VIS_exp_short_wait / 2},
+            {"VIS_SHORT": VIS_exp_short_eff},
+            {"wait": VIS_exp_short_wait / 2},
         ],
         "NISP": [
             {"wait": 574 + 40},
@@ -112,10 +119,11 @@ def convert_ecliptic_to_equatorial(elon, elat, epa):
     },
     1: {
         "VIS": [
-            {"wait": 8},
-            {"VIS_LONG": VIS_exp_long},
-            {"wait": 40 + NISP_exp_int + 22 + NISP_exp_int + 22},
-            {"VIS_SHORT": VIS_exp_short},
+            {"wait": 8 + VIS_exp_long_wait / 2},
+            {"VIS_LONG": VIS_exp_long_eff},
+            {"wait": VIS_exp_long_wait / 2 + 40 + NISP_exp_int + 22 + NISP_exp_int + 22 + VIS_exp_short_wait / 2},
+            {"VIS_SHORT": VIS_exp_short_eff},
+            {"wait": VIS_exp_short_wait / 2},
         ],
         "NISP": [
             {"wait": 574 + 40},
@@ -128,9 +136,9 @@ def convert_ecliptic_to_equatorial(elon, elat, epa):
     },
     2: {
         "VIS": [
-            {"wait": 8},
-            {"VIS_LONG": VIS_exp_long},
-            {"wait": 40 + NISP_exp_int + 22 + NISP_exp_int + 22},
+            {"wait": 8 + VIS_exp_long_wait / 2},
+            {"VIS_LONG": VIS_exp_long_eff},
+            {"wait": VIS_exp_long_wait / 2 + 40 + NISP_exp_int + 22 + NISP_exp_int + 22},
             {"VIS_SHORT": 0},
         ],
         "NISP": [
@@ -144,9 +152,9 @@ def convert_ecliptic_to_equatorial(elon, elat, epa):
     },
     3: {
         "VIS": [
-            {"wait": 8},
-            {"VIS_LONG": VIS_exp_long},
-            {"wait": 40 + NISP_exp_int + 22 + NISP_exp_int + 22},
+            {"wait": 8 + VIS_exp_long_wait / 2},
+            {"VIS_LONG": VIS_exp_long_eff},
+            {"wait": VIS_exp_long_wait / 2 + 40 + NISP_exp_int + 22 + NISP_exp_int + 22},
             {"VIS_SHORT": 0},
         ],
         "NISP": [