From f3abcf1572f29f6040a2db0916fe9cc74d34cb0a Mon Sep 17 00:00:00 2001 From: yan Date: Wed, 10 Apr 2024 18:10:15 +0800 Subject: [PATCH] update setup.py --- csst_ifs_sim/csst_ifs_sim.py | 7 ++++--- ifs_data/IFS_sim_C90.config | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/csst_ifs_sim/csst_ifs_sim.py b/csst_ifs_sim/csst_ifs_sim.py index 71a203e..fe2a8da 100644 --- a/csst_ifs_sim/csst_ifs_sim.py +++ b/csst_ifs_sim/csst_ifs_sim.py @@ -1264,8 +1264,9 @@ class IFSsimulator(): Stores the information to a dictionary called cr. """ - self.log.info('Reading in cosmic ray information from %s and %s' % (self.information['cosmicraylengths'], - self.information['cosmicraydistance'])) + # self.log.info('Reading in cosmic ray information from %s and %s' % (self.information['cosmicraylengths'], + # self.information['cosmicraydistance'])) + crLengths = np.loadtxt( self.information['dir_path']+self.information['cosmicraylengths']) crDists = np.loadtxt( @@ -1396,7 +1397,7 @@ class IFSsimulator(): dir_path = os.path.join(os.environ['UNIT_TEST_DATA_ROOT'],'ifs_sim/') print(dir_path) - self.result_path = dir_path+'/ifs_sim_result/'+result_day + self.result_path = dir_path+'/ifs_sim_result/'+self.source+ss+result_day if os.path.isdir(self.result_path) == False: os.mkdir(self.result_path) diff --git a/ifs_data/IFS_sim_C90.config b/ifs_data/IFS_sim_C90.config index 29cecc3..0c3ff13 100644 --- a/ifs_data/IFS_sim_C90.config +++ b/ifs_data/IFS_sim_C90.config @@ -93,17 +93,17 @@ exposuretimes=3 rdose = 8.0e9 #charge trap information file -parallelTrapfile =/IFS_inputdata/cdm_euclid_parallel.dat -serialTrapfile =/IFS_inputdata/cdm_euclid_serial.dat +parallelTrapfile =IFS_inputdata/cdm_euclid_parallel.dat +serialTrapfile =IFS_inputdata/cdm_euclid_serial.dat #cosmetic defects input file -cosmeticsFile_b =/IFS_inputdata/Cosmetics_b.txt +cosmeticsFile_b =IFS_inputdata/Cosmetics_b.txt -cosmeticsFile_r =/IFS_inputdata/Cosmetics_r.txt +cosmeticsFile_r =IFS_inputdata/Cosmetics_r.txt ###comicray information file -cosmicraylengths=IFS_inputdata/cdf_cr_length.dat +cosmicraylengths =IFS_inputdata/cdf_cr_length.dat cosmicraydistance=IFS_inputdata/cdf_cr_total.dat #apply multiplicative flatfield (to emulate pixel-to-pixel non-uniformity)? -- GitLab