update (5070c190) · Commits · csst-sims / csst_ifs_sim

csst_ifs_sim/CTI/CTI.py

+31 −34

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ class CDM03bidir():
		:param log: instance to Python logging
		:type log: logging instance
		"""

		def __init__(self, settings, data, log=None):
		"""
		Class constructor.
		@@ -39,7 +40,8 @@ class CDM03bidir():
		:type log: logging instance
		"""
		self.data = data
		self.values = dict(quads=(0,1,2,3), xsize=2048, ysize=2066, dob=0.0, rdose=8.0e9)
		self.values = dict(quads=(0, 1, 2, 3), xsize=2048,
		ysize=2066, dob=0.0, rdose=8.0e9)
		self.values.update(settings)
		self.log = log
		self._setupLogger()
		@@ -55,7 +57,8 @@ class CDM03bidir():
		self.params.update(self.values)

		# read in trap information
		trapdata = np.loadtxt(self.values['dir_path']+self.values['paralleltrapfile'])
		trapdata = np.loadtxt(
		self.values['dir_path']+self.values['paralleltrapfile'])
		if trapdata.ndim > 1:
		self.nt_p = trapdata[:, 0]
		self.sigma_p = trapdata[:, 1]
		@@ -66,7 +69,8 @@ class CDM03bidir():
		self.sigma_p = [trapdata[1],]
		self.taur_p = [trapdata[2],]

		trapdata = np.loadtxt(self.values['dir_path']+self.values['serialtrapfile'])
		trapdata = np.loadtxt(
		self.values['dir_path']+self.values['serialtrapfile'])
		if trapdata.ndim > 1:
		self.nt_s = trapdata[:, 0]
		self.sigma_s = trapdata[:, 1]
		@@ -85,7 +89,6 @@ class CDM03bidir():
		self.nt_s *= 0.576 # thibaut's values traps / pixel #should be division?
		self.sigma_s = 1.e4 # thibaut's values in m*2


		def _setupLogger(self):
		"""
		Set up the logger.
		@@ -94,7 +97,6 @@ class CDM03bidir():
		# if self.log is None:
		# self.logger = False


		def applyRadiationDamage(self, data, iquadrant=0):
		"""
		Apply radian damage based on FORTRAN CDM03 model. The method assumes that
		@@ -158,7 +160,7 @@ class CDM03bidir():
		self.log.info('jflip=%i' % jflip)

		#################################################################################
		###modify
		# modify
		# sys.path.append('../so')
		from ifs_so import cdm03bidir
		# from ifs_so.cdm03.cpython-38-x86_64-linux-gnu import cdm03bidir
		@@ -171,14 +173,9 @@ class CDM03bidir():
		params,
		[data.shape[0], data.shape[1], len(self.nt_p), len(self.nt_s), len(self.params)])


		return np.asanyarray(CTIed)

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





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

csst_ifs_sim/csst_ifs_sim.py

+292 −284

File changed.

Preview size limit exceeded, changes collapsed.

tests/test_ifs_sim.py

+80 −76

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ from csst_ifs_sim import csst_ifs_sim

		import sys

		### sys.path.append('IFS_git/csst_ifs_sim/csst_ifs_sim')
		# sys.path.append('IFS_git/csst_ifs_sim/csst_ifs_sim')


		class TestDemoFunction(unittest.TestCase):
		@@ -49,7 +49,8 @@ class TestDemoFunction(unittest.TestCase):

		result_path = dir_path+'ifs_sim_result'

		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')
		csst_ifs_sim.runIFSsim(sourcein, configfile,
		dir_path, result_path, 1, debug, 'no')

		self.assertEqual(
		1, 1,
		@@ -86,7 +87,8 @@ class TestDemoFunction(unittest.TestCase):
		debug = True
		result_path = dir_path+'ifs_sim_result'

		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')
		csst_ifs_sim.runIFSsim(sourcein, configfile,
		dir_path, result_path, 1, debug, 'no')

		self.assertEqual(
		1, 1,
		@@ -123,7 +125,8 @@ class TestDemoFunction(unittest.TestCase):
		debug = True
		result_path = dir_path+'ifs_sim_result'

		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')
		csst_ifs_sim.runIFSsim(sourcein, configfile,
		dir_path, result_path, 1, debug, 'no')

		self.assertEqual(
		1, 1,
		@@ -161,7 +164,8 @@ class TestDemoFunction(unittest.TestCase):

		result_path = dir_path+'ifs_sim_result'

		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'no')
		csst_ifs_sim.runIFSsim(sourcein, configfile,
		dir_path, result_path, 1, debug, 'no')

		self.assertEqual(
		1, 1,
		@@ -198,7 +202,8 @@ class TestDemoFunction(unittest.TestCase):
		debug = True
		result_path = dir_path+'ifs_sim_result'

		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug,'yes')
		csst_ifs_sim.runIFSsim(sourcein, configfile,
		dir_path, result_path, 1, debug, 'yes')
		self.assertEqual(
		1, 1,
		"case 5: sim passes.",
		@@ -235,10 +240,9 @@ class TestDemoFunction(unittest.TestCase):

		result_path = dir_path+'ifs_sim_result'

		csst_ifs_sim.runIFSsim(sourcein, configfile, dir_path, result_path, 1, debug, 'no')
		csst_ifs_sim.runIFSsim(sourcein, configfile,
		dir_path, result_path, 1, debug, 'no')
		self.assertEqual(
		1, 1,
		"case 6: sim passes.",
		)