add led flat file; fix a bug for led normalize

ObservationSim/MockObject/FlatLED.py

@@ -15,6 +15,13 @@ from scipy import interpolate
 from ObservationSim.MockObject.MockObject import MockObject
 # from ObservationSim.Straylight import calculateSkyMap_split_g
 
+try:
+    import importlib.resources as pkg_resources
+except ImportError:
+    # Try backported to PY<37 'importlib_resources'
+    import importlib_resources as pkg_resources
+
+
 # flatDir = '/Volumes/EAGET/LED_FLAT/'
 LED_name = ['LED1', 'LED2', 'LED3', 'LED4', 'LED5', 'LED6', 'LED7', 'LED8', 'LED9', 'LED10', 'LED11', 'LED12', 'LED13',
             'LED14']
@@ -36,19 +43,27 @@ fluxLED = {'LED1': 0.16478729, 'LED2': 0.084220931, 'LED3': 2.263360617, 'LED4':
 mirro_eff = {'GU':0.61, 'GV':0.8, 'GI':0.8}
 
 class FlatLED(object):
-    def __init__(self, chip,filt, flatDir = '/Users/zhangxin/Work/SlitlessSim/csst_sls_calibration/flat_field_cube/models/', logger=None):
+    def __init__(self, chip,filt, flatDir = None, logger=None):
         # self.led_type_list = led_type_list
-        self.flatDir = flatDir
         self.filt = filt
         self.chip = chip
         self.logger = logger
+        if flatDir is not None:
+            self.flatDir = flatDir
+        else:
+            try:
+                with pkg_resources.files('ObservationSim.MockObject.data.led').joinpath("") as ledDir:
+                    self.flatDir = ledDir.as_posix()
+            except AttributeError:
+                with pkg_resources.path('ObservationSim.MockObject.data.led', "") as ledDir:
+                    self.flatDir = ledDir.as_posix()
 
     ###
     ### return LED flat, e/s
     ###
     def getLEDImage(self, led_type='LED1'):
         # cwave = cwaves[led_type]
-        flat = fits.open(self.flatDir + 'model_' + cwaves_name[led_type] + 'nm.fits')
+        flat = fits.open(os.path.join(self.flatDir, 'model_' + cwaves_name[led_type] + 'nm.fits'))
         xlen = flat[0].header['NAXIS1']
         ylen = 601
         x = np.linspace(0, self.chip.npix_x * 6, xlen)

ObservationSim/ObservationSim.py

@@ -439,13 +439,13 @@ class Observation(object):
                 pf_map = led_flat
         # whether to output zero, dark, flat calibration images.
         expTime = self.config["obs_setting"]["exp_time"]
-        norm_scaler = skyback_level/expTime * self.filter_param.param[chip.filter_type][5] / self.filter_param.param[sky_level_filt][5]
+        norm_scaler = skyback_level/expTime / self.filter_param.param[sky_level_filt][5]
 
         if skyback_level == 0:
             self.config["ins_effects"]["shutter_effect"] = False
 
         if chip.survey_type == "photometric":
-            sky_map = np.ones_like(chip.img.array) * norm_scaler / self.tel.pupil_area
+            sky_map = np.ones_like(chip.img.array) * norm_scaler * self.filter_param.param[chip.filter_type][5] / self.tel.pupil_area
         elif chip.survey_type == "spectroscopic":
             flat_normal = np.ones_like(chip.img.array)
             if self.config["ins_effects"]["flat_fielding"] == True:

setup.py

@@ -72,6 +72,7 @@ setup(name='CSSTSim',
         'ObservationSim.Instrument.Chip.libBF': ['libmoduleBF.so'],
         'ObservationSim.Instrument.Chip.libCTI': ['libmoduleCTI.so'],
         'ObservationSim.MockObject.data': ['*.dat'], 
+        'ObservationSim.MockObject.data.led': ['*.fits'],
         'ObservationSim.Instrument.data': ['*.txt', '*.dat', '*.json'],
         'ObservationSim.Instrument.data.field_distortion': ['*.pickle'],
         'ObservationSim.Instrument.data.ccd': ['*.txt'],