diff --git a/csst_mci_sim/CTI/CTI.py b/csst_mci_sim/CTI/CTI.py index 7523bc67d983be8766d0017af9ec83e44165bb0e..e94cbc453c98f212121350987c1f819c57671cb5 100644 --- a/csst_mci_sim/CTI/CTI.py +++ b/csst_mci_sim/CTI/CTI.py @@ -171,10 +171,5 @@ class CDM03bidir(): return np.asanyarray(CTIed) ################################################################################################################# - - - - - ################################################################################################################# diff --git a/csst_mci_sim/support/MCIinstrumentModel.py b/csst_mci_sim/support/MCIinstrumentModel.py index 33993b653d4e3d5e280093f20bbc4f2eaa3c719a..95771dbe9f767a0af534daf5e3681dfe4f0b7355 100644 --- a/csst_mci_sim/support/MCIinstrumentModel.py +++ b/csst_mci_sim/support/MCIinstrumentModel.py @@ -49,19 +49,19 @@ def MCIinformation(): return out -def CCDnonLinearityModel(data, beta=6e-7): - """ +# def CCDnonLinearityModel(data, beta=6e-7): +# """ - The non-linearity is modelled based on the results presented. - :param data: data to which the non-linearity model is being applied to - :type data: ndarray +# The non-linearity is modelled based on the results presented. +# :param data: data to which the non-linearity model is being applied to +# :type data: ndarray - :return: input data after conversion with the non-linearity model - :rtype: float or ndarray - """ - out = data-beta*data**2 +# :return: input data after conversion with the non-linearity model +# :rtype: float or ndarray +# """ +# out = data-beta*data**2 - return out +# return out ################################################################### # if __name__ == '__main__': diff --git a/csst_mci_sim/support/logger.py b/csst_mci_sim/support/logger.py index 68253e7338eeb33aaf334dafa862d96c71fa6a33..bb3daac7c248c0b448daa0a94656ebcd4f8d90d3 100644 --- a/csst_mci_sim/support/logger.py +++ b/csst_mci_sim/support/logger.py @@ -38,18 +38,18 @@ def setUpLogger(log_filename, loggername='logger'): return logger -class SimpleLogger(object): - """ - A simple class to create a log file or print the information on screen. - """ - - def __init__(self, filename, verbose=False): - self.file = open(filename, 'w') - self.verbose = verbose - - def write(self, text): - """ - Writes text either to file or screen. - """ - print >> self.file, text - if self.verbose: print( text) +# class SimpleLogger(object): +# """ +# A simple class to create a log file or print the information on screen. +# """ + +# def __init__(self, filename, verbose=False): +# self.file = open(filename, 'w') +# self.verbose = verbose + +# def write(self, text): +# """ +# Writes text either to file or screen. +# """ +# print >> self.file, text +# if self.verbose: print( text) diff --git a/csst_mci_sim/support/sed.py b/csst_mci_sim/support/sed.py index 8dc56a609e83fec4ec49d581bfb37181d27172bf..8b855d41881a38cea2b22d1a082f551548451f5f 100755 --- a/csst_mci_sim/support/sed.py +++ b/csst_mci_sim/support/sed.py @@ -155,8 +155,7 @@ class Star_Temp(): ##import os self.path=path ####parent = os.path.dirname(os.path.realpath(__file__)) - ###print("获取其父目录——" + parent) # 从当前文件路径中获取目录 - + ###print("获取其父目录——" + parent) # 从当前文件路径中获取目录 hdulist = fits.open(path+'MCI_inputData/SED_Code/seddata/stellar_temp.fits') self.wave = hdulist[1].data['wave'] self.flux = hdulist[2].data diff --git a/tests/test_mci_sim.py b/tests/test_mci_sim.py index 4ccfc16cc4ff9fd3eaa99dbb32c7436385efeaee..316515182df2eb317d78280e3a82dac49ebb6a9d 100644 --- a/tests/test_mci_sim.py +++ b/tests/test_mci_sim.py @@ -11,12 +11,9 @@ Modified-History: import unittest import os -from csst_mci_sim import csst_mci_sim - import sys - - import faulthandler +from csst_mci_sim import csst_mci_sim class TestDemoFunction(unittest.TestCase): def test_mci_sim_1(self): @@ -41,10 +38,9 @@ class TestDemoFunction(unittest.TestCase): dir_path = os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'mci_sim/') print(dir_path) -# 获取当前工作目录 - current_path = os.getcwd() - - print("当前路径:", current_path) + # 获取当前工作目录 + # current_path = os.getcwd() + # print("当前路径:", current_path) configfile = dir_path+'MCI_inputData/configData/mci_all_9K.config' @@ -55,138 +51,163 @@ class TestDemoFunction(unittest.TestCase): self.assertEqual( 1 , 1, - "case 1: SCI sim passes.", + "case 1: EXDF sim passes.", ) + ############################################# + def test_mci_sim_2(self): + + """ + Aim + --- + Test mci sim function: STAR case. + + Criteria + -------- + Pass if the demo function returns `1`. + + Details + ------- + The demo function returns the length of the input argument list. + This case aims to test whether the demo function returns `1` if input is `None`. + """ + faulthandler.enable() + # demo function test + dir_path = os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'mci_sim/') + print(dir_path) + + # 获取当前工作目录 + # current_path = os.getcwd() + # print("当前路径:", current_path) - # def test_ifs_sim_2(self): - # """ - # Aim - # --- - # Test ifs sim function: BIAS case. + configfile = dir_path+'MCI_inputData/configData/mci_all_9K.config' + + sourcein = 'STAR' + print(configfile) + + csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, 1) + + self.assertEqual( + 1 , 1, + "case 2: STAR sim passes.", + ) + + ######################################################### + def test_mci_sim_3(self): + + """ + Aim + --- + Test mci sim function: BIAS case. - # Criteria - # -------- - # Pass if the demo function returns `1`. + Criteria + -------- + Pass if the demo function returns `1`. - # Details - # ------- - # The demo function returns the length of the input argument list. - # This case aims to test whether the demo function returns `1` if input is `None`. - # """ - # # demo function test - # dir_path=os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'ifs_sim') - - # csst_ifs_sim(dir_path,BIAS) - - # self.assertTrue( - # 1 == 1, - # "case 2 :BIAS sim passes.", - # ) - - # def test_ifs_sim_3(self): - # """ - # Aim - # --- - # Test ifs sim function: DARK case. + Details + ------- + The demo function returns the length of the input argument list. + This case aims to test whether the demo function returns `1` if input is `None`. + """ + faulthandler.enable() + + # demo function test + dir_path = os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'mci_sim/') + print(dir_path) + + # 获取当前工作目录 + # current_path = os.getcwd() + # print("当前路径:", current_path) + + configfile = dir_path+'MCI_inputData/configData/mci_all_9K.config' + + sourcein = 'BIAS' + print(configfile) + + csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, 1) + + self.assertEqual( + 1 , 1, + "case 3: BIAS sim passes.", + ) + ######################################################### + def test_mci_sim_4(self): + + """ + Aim + --- + Test mci sim function: DARK case. - # Criteria - # -------- - # Pass if the demo function returns `1`. + Criteria + -------- + Pass if the demo function returns `1`. - # Details - # ------- - # The demo function returns the length of the input argument list. - # This case aims to test whether the demo function returns `1` if input is `None`. - # """ - # # demo function test - # dir_path=os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'ifs_sim') + Details + ------- + The demo function returns the length of the input argument list. + This case aims to test whether the demo function returns `1` if input is `None`. + """ + faulthandler.enable() - # csst_ifs_sim(dir_path,'DARK') + # demo function test + dir_path = os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'mci_sim/') + print(dir_path) + + # 获取当前工作目录 + # current_path = os.getcwd() + # print("当前路径:", current_path) - # self.assertTrue( - # 1 == 1, - # "case 3 :DARK sim passes.", - # ) + configfile = dir_path+'MCI_inputData/configData/mci_all_9K.config' + + sourcein = 'DARK' + print(configfile) + + csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, 1) + self.assertEqual( + 1 , 1, + "case 4: DARK sim passes.", + ) + ######################################################### + def test_mci_sim_5(self): - # def test_ifs_sim_4(self): - # """ - # Aim - # --- - # Test ifs sim function: LAMP case. + """ + Aim + --- + Test mci sim function: FLAT case. - # Criteria - # -------- - # Pass if the demo function returns `1`. + Criteria + -------- + Pass if the demo function returns `1`. - # Details - # ------- - # The demo function returns the length of the input argument list. - # This case aims to test whether the demo function returns `1` if input is `None`. - # """ - # # demo function test - # dir_path=os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'ifs_sim') + Details + ------- + The demo function returns the length of the input argument list. + This case aims to test whether the demo function returns `1` if input is `None`. + """ + faulthandler.enable() - # csst_ifs_sim(dir_path,'LAMP') + # demo function test + dir_path = os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'mci_sim/') + print(dir_path) + + # 获取当前工作目录 + # current_path = os.getcwd() + # print("当前路径:", current_path) - # self.assertTrue( - # 1 == 1, - # "case 4 :LAMP sim passes.", - # ) + configfile = dir_path+'MCI_inputData/configData/mci_all_9K.config' + sourcein = 'FLAT' + print(configfile) + + csst_mci_sim.runMCIsim(sourcein, configfile, dir_path, 1) + self.assertEqual( + 1 , 1, + "case 5: FLAT sim passes.", + ) - # def test_ifs_sim_5(self): - # """ - # Aim - # --- - # Test ifs sim function: FLAT case. +############################################################################ - # Criteria - # -------- - # Pass if the demo function returns `1`. - - # Details - # ------- - # The demo function returns the length of the input argument list. - # This case aims to test whether the demo function returns `1` if input is `None`. - # """ - # # demo function test - # dir_path=os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'ifs_sim') - - # csst_ifs_sim(dir_path,'FLAT') - - # self.assertTrue( - # 1 == 1, - # "case 5 :FLAT sim passes.", - # ) - - - # def test_ifs_sim_6(self): - # """ - # Aim - # --- - # Test ifs sim function: hole case. - - # Criteria - # -------- - # Pass if the demo function returns `1`. - - # Details - # ------- - # The demo function returns the length of the input argument list. - # This case aims to test whether the demo function returns `1` if input is `None`. - # """ - # # demo function test - # dir_path=os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'ifs_sim') - - # csst_ifs_sim(dir_path,'LAMP', 'yes') - - # self.assertTrue( - # 1 == 1, - # "case 6 :Hole sim passes.", - # ) - - \ No newline at end of file + \ No newline at end of file