Merge branch 'develop' into 'master'

merge develop into master (for release v2.0)

See merge request csst_sim/csst-simulation!13

ObservationSim/MockObject/Quasar.py

@@ -13,6 +13,11 @@ class Quasar(MockObject):
         super().__init__(param, logger=logger)
 
     def load_SED(self, survey_type, sed_path=None, cosids=None, objtypes=None, sed_templates=None, normFilter=None, target_filt=None):
+        '''
+        --------------------------------------------------------------------
+        (Deprecated) Left over codes from cycle-1 to cycle-3 implementations
+        --------------------------------------------------------------------
+        '''
         if survey_type == "photometric":
             norm_thr_rang_ids = normFilter['SENSITIVITY'] > 0.001
             if sed_templates is None:

ObservationSim/MockObject/SpecDisperser/SpecDisperser.py

@@ -185,8 +185,8 @@ class SpecDisperser(object):
             origin_in[1] = self.origin[1]
             dx0_in = dx[0]
             dy0_in = dyc[0]
-        originOut_x = origin_in[1] + dx0_in - 1
-        originOut_y = origin_in[0] + dy0_in - 1
+        originOut_x = origin_in[1] + dx0_in
+        originOut_y = origin_in[0] + dy0_in
 
         if self.flat_cube is None:
             beam_flat = None
@@ -248,7 +248,7 @@ class SpecDisperser(object):
         if self.isAlongY == 1:
             model, _, _ = rotate90(array_orig=model, isClockwise=0)
 
-        return model, originOut_x, originOut_y
+        return model, originOut_x, originOut_y, dxpix, dypix, lam_beam,ysens
 
     def writerSensitivityFile(self, conffile='', beam='', w=None, sens=None):
         orders = {'A': '1st', 'B': '0st', 'C': '2st', 'D': '-1st', 'E': '-2st'}