Commit 32e7ef42 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

update setup.py

parent ce2e6755

csst_ifs_sim/csst_ifs_sim.py

+4 −5
Original line number Diff line number Diff line
@@ -4781,9 +4781,9 @@ class IFSsimulator(): 
            if simnumber <= 200 and simnumber > 150:

                self.information['exptime'] = 1200



            self.skyfilepath = self.information['skyfilepath']

            self.skyfilepath = self.information['dir_path']+self.information['sky_fitsin'] 



            print(self.skyfilepath)

            print('self.skyfilepath = ',self.skyfilepath)



            # self.earthshine_theta=30.0       # in degree
@@ -5024,7 +5024,7 @@ class IFSsimulator(): 
##############################################################################################





def runIFSsim(sourcein, skyfitsin, configfile, iLoop, applyhole='no'):

def runIFSsim(sourcein, configfile, iLoop, applyhole='no'):



    # opts, args = processArgs()
@@ -5043,8 +5043,7 @@ def runIFSsim(sourcein, skyfitsin, configfile, iLoop, applyhole='no'): 


    ###############



    if sourcein == 'SCI':

        simulate[iLoop].information['skyfilepath'] = skyfitsin





    ##############

    simulate[iLoop].simulate(sourcein, iLoop)

tests/test_ifs_sim.py

+2 −2
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ class TestDemoFunction(unittest.TestCase): 
        ###configfile = dir_path+'IFS_inputdata/configData/IFS_sim_C90.config'

        

        configfile = './ifs_data/IFS_sim_C90.config'

        skyfitsin = dir_path+'IFS_inputdata/FengshuaiData/NGC6397_S6102.fits'

      

        sourcein = 'SCI'

        print(configfile)

        

        print(skyfitsin)

        

        csst_ifs_sim.runIFSsim(sourcein, skyfitsin, configfile, 1, 'no')

        csst_ifs_sim.runIFSsim(sourcein,  configfile, 1, 'no')

        self.assertEqual(

            1 , 1,

            "case 1: SCI sim passes.",