Commit 437f372d authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'develop' into sim_scheduler

parents 6d5e6f7a 9d3aaffd

ObservationSim/Instrument/Chip/Chip.py

+375 −283

File changed.

Preview size limit exceeded, changes collapsed.

ObservationSim/Instrument/data/flatCube/flat_cube.fits

deleted100644 → 0
−2.54 GiB

File deleted.

View file

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ setup(name='csst_msc_sim', 
          'ObservationSim.Instrument.data.filters': ['*.txt', '*.list', '*.dat'],

          'ObservationSim.Instrument.data.throughputs': ['*.txt', '*.dat'],

          'ObservationSim.Instrument.data.sls_conf': ['*.conf', '*.fits'],

          'ObservationSim.Instrument.data.flatCube': ['*.fits'],

          #   'ObservationSim.Instrument.data.flatCube': ['*.fits'],

          'Catalog.data': ['*.fits', '*.so'],

          'ObservationSim.Config.Header': ['*.fits', '*.lst'],

          'ObservationSim.Straylight.data': ['*.dat'],

tests/test_BF_CTE.py

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class detModule_coverage(unittest.TestCase): 
    def __init__(self, methodName='runTest'):

        super(detModule_coverage, self).__init__(methodName)

        ##self.dataPath = "/public/home/chengliang/CSSOSDataProductsSims/csst-simulation/tests/UNIT_TEST_DATA" ##os.path.join(os.getenv('UNIT_TEST_DATA_ROOT'), 'csst_fz_gc1')

        self.dataPath = os.path.join(os.getenv('UNIT_TEST_DATA_ROOT'), 'csst_fz_msc')

        self.dataPath = os.path.join(os.getenv('UNIT_TEST_DATA_ROOT'), 'csst_msc_sim/csst_fz_msc')

        self.iccd = 1

tests/test_PSFmodule.py

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ def defineFilt(chip): 
class PSFInterpModule_coverage(unittest.TestCase):

    def __init__(self, methodName='runTest'):

        super(PSFInterpModule_coverage, self).__init__(methodName)

        self.dataPath = os.path.join(os.getenv('UNIT_TEST_DATA_ROOT'), 'csst_fz_msc')

        self.dataPath = os.path.join(os.getenv('UNIT_TEST_DATA_ROOT'), 'csst_msc_sim/csst_fz_msc')

        self.iccd = 8



    def test_loadPSFSet(self):