From 6de1d3f24d9c2b0bfb5831fd913e6caf0fcc92b4 Mon Sep 17 00:00:00 2001 From: "zhaojunyan@shao.ac.cn" Date: Wed, 15 May 2024 20:43:18 +0800 Subject: [PATCH] test --- csst_ifs_sim/csst_ifs_sim.py | 38 +++++++++++++++++------- csst_ifs_sim/ifs_data/IFS_sim_C90.config | 1 - tests/test_ifs_sim.py | 28 ++++++++++++----- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/csst_ifs_sim/csst_ifs_sim.py b/csst_ifs_sim/csst_ifs_sim.py index df71496..ec54672 100644 --- a/csst_ifs_sim/csst_ifs_sim.py +++ b/csst_ifs_sim/csst_ifs_sim.py @@ -1976,18 +1976,20 @@ class IFSsimulator(): else: ss = '_' - if self.information['dir_path'] == '/nfsdata/share/simulation-unittest/ifs_sim/': - self.result_path = self.information['dir_path'] + \ - self.information['result_path']+'/'+self.source+ss+result_day - else: + # if self.information['dir_path'] == '/nfsdata/share/simulation-unittest/ifs_sim/': + # self.result_path = self.information['dir_path'] + \ + # self.information['result_path']+'/'+self.source+ss+result_day + # else: - home_path = os.environ['HOME'] + # home_path = os.environ['HOME'] - if home_path == '/home/yan': + # if home_path == '/home/yan': - self.result_path = '../IFS_simData/'+self.source+ss+result_day - else: - self.result_path = '/data/ifspip/CCD_ima/'+self.source+ss+result_day + # self.result_path = '../IFS_simData/'+self.source+ss+result_day + # else: + # self.result_path = '/data/ifspip/CCD_ima/'+self.source+ss+result_day + + self.result_path= self.information['result_path']+self.source+ss+result_day if os.path.isdir(self.result_path) == False: os.mkdir(self.result_path) @@ -5722,7 +5724,7 @@ class IFSsimulator(): ############################################################################ -def runIFSsim(sourcein, configfile, dir_path, iLoop, debug, applyhole='no'): +def runIFSsim(sourcein, configfile, dir_path, result_path,iLoop, debug, applyhole='no'): """ @@ -5756,9 +5758,25 @@ def runIFSsim(sourcein, configfile, dir_path, iLoop, debug, applyhole='no'): simulate[iLoop].information['dir_path'] = dir_path simulate[iLoop].information['debug'] = debug + + simulate[iLoop].information['result_path'] = result_path + + simulate[iLoop].simulate(sourcein, iLoop) return 1 ############################## end ########################################## + if self.information['dir_path'] == '/nfsdata/share/simulation-unittest/ifs_sim/': + self.result_path = self.information['dir_path'] + \ + self.information['result_path']+'/'+self.source+ss+result_day + else: + + home_path = os.environ['HOME'] + + if home_path == '/home/yan': + + self.result_path = '../IFS_simData/'+self.source+ss+result_day + else: + self.result_path = '/data/ifspip/CCD_ima/'+self.source+ss+result_day \ No newline at end of file diff --git a/csst_ifs_sim/ifs_data/IFS_sim_C90.config b/csst_ifs_sim/ifs_data/IFS_sim_C90.config index 943ff03..36f626a 100644 --- a/csst_ifs_sim/ifs_data/IFS_sim_C90.config +++ b/csst_ifs_sim/ifs_data/IFS_sim_C90.config @@ -8,7 +8,6 @@ CCDygap = 8.116 sky_fitsin =IFS_inputdata/FengshuaiData/NGC6397_S6102.fits -result_path =ifs_sim_result debug =yes diff --git a/tests/test_ifs_sim.py b/tests/test_ifs_sim.py index fa7b8ee..d7bedfe 100644 --- a/tests/test_ifs_sim.py +++ b/tests/test_ifs_sim.py @@ -42,8 +42,12 @@ class TestDemoFunction(unittest.TestCase): sourcein = 'SCI' print(configfile) - debug=True - csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, 1, debug,'no') + debug=True + + result_path=dir_path+'ifs_sim_result' + + csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no') + self.assertEqual( 1 , 1, "case 1: SCI sim passes.", @@ -77,7 +81,9 @@ class TestDemoFunction(unittest.TestCase): print(configfile) debug=True - csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, 1, debug,'no') + result_path=dir_path+'ifs_sim_result' + + csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no') self.assertEqual( 1 , 1, @@ -112,7 +118,9 @@ class TestDemoFunction(unittest.TestCase): print(configfile) debug=True - csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, 1, debug,'no') + result_path=dir_path+'ifs_sim_result' + + csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no') self.assertEqual( 1 , 1, @@ -147,7 +155,9 @@ class TestDemoFunction(unittest.TestCase): print(configfile) debug=True - csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, 1, debug,'no') + result_path=dir_path+'ifs_sim_result' + + csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no') self.assertEqual( 1 , 1, "case 4: sim passes.", @@ -181,7 +191,9 @@ class TestDemoFunction(unittest.TestCase): print(configfile) debug=True - csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, 1, debug,'yes') + result_path=dir_path+'ifs_sim_result' + + csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'yes') self.assertEqual( 1 , 1, "case 5: sim passes.", @@ -215,7 +227,9 @@ class TestDemoFunction(unittest.TestCase): print(configfile) debug=True - csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, 1, debug,'no') + result_path=dir_path+'ifs_sim_result' + + csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no') self.assertEqual( 1 , 1, "case 6: sim passes.", -- GitLab