move CTE effect before adding bias (94c62f0a) · Commits · Liu Dezi / csst_msc_sim

ObservationSim/Instrument/Chip/Chip.py

+15 −15

Original line number	Diff line number	Diff line
		@@ -515,21 +515,6 @@ class Chip(FocalPlane):
		if config["ins_effects"]["add_badcolumns"] == True:
		img = effects.BadColumns(img, seed=SeedBadColumns, chipid=self.chipID, logger=self.logger)

		# Add Bias level
		if config["ins_effects"]["add_bias"] == True:
		if self.logger is not None:
		self.logger.info(" Adding Bias level and 16-channel non-uniformity")
		else:
		print(" Adding Bias level and 16-channel non-uniformity")
		if config["ins_effects"]["bias_16channel"] == True:
		img = effects.AddBiasNonUniform16(img,
		bias_level=float(self.bias_level),
		nsecy = 2, nsecx=8,
		seed=SeedBiasNonuni+self.chipID,
		logger=self.logger)
		elif config["ins_effects"]["bias_16channel"] == False:
		img += self.bias_level

		# Apply Nonlinearity on the chip image
		if config["ins_effects"]["non_linear"] == True:
		if self.logger is not None:
		@@ -554,6 +539,21 @@ class Chip(FocalPlane):
		print(" Apply CTE Effect")
		img = effects.CTE_Effect(GSImage=img, threshold=27)

		# Add Bias level
		if config["ins_effects"]["add_bias"] == True:
		if self.logger is not None:
		self.logger.info(" Adding Bias level and 16-channel non-uniformity")
		else:
		print(" Adding Bias level and 16-channel non-uniformity")
		if config["ins_effects"]["bias_16channel"] == True:
		img = effects.AddBiasNonUniform16(img,
		bias_level=float(self.bias_level),
		nsecy = 2, nsecx=8,
		seed=SeedBiasNonuni+self.chipID,
		logger=self.logger)
		elif config["ins_effects"]["bias_16channel"] == False:
		img += self.bias_level

		# Add Read-out Noise
		if config["ins_effects"]["add_readout"] == True:
		seed = int(config["random_seeds"]["seed_readout"]) + pointing_ID*30 + self.chipID