Commit 28a7168f authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

debug

parent 4ed00146
Requirement already satisfied: PyQt5 in /home/yan/anaconda3/lib/python3.8/site-packages (5.15.10)
Requirement already satisfied: PyQt5-sip<13,>=12.13 in /home/yan/anaconda3/lib/python3.8/site-packages (from PyQt5) (12.13.0)
Requirement already satisfied: PyQt5-Qt5>=5.15.2 in /home/yan/anaconda3/lib/python3.8/site-packages (from PyQt5) (5.15.2)
......@@ -44,9 +44,13 @@ class CDM03bidir():
self.log = log
self._setupLogger()
#default CDM03 settings
self.params = dict(beta_p=0.6, beta_s=0.6, fwc=200000., vth=1.168e7, vg=6.e-11, t=20.48e-3,
sfwc=730000., svg=1.0e-10, st=5.0e-6, parallel=1., serial=1.)
# #default CDM03 settings
# self.params = dict(beta_p=0.6, beta_s=0.6, fwc=200000., vth=1.168e7, vg=6.e-11, t=20.48e-3,
# sfwc=730000., svg=1.0e-10, st=5.0e-6, parallel=1., serial=1.)
self.params = dict(beta_p=0.6, beta_s=0.6, fwc=100000., vth=1.168e7, vg=6.e-11, t=1.0e-3,
sfwc=700000., svg=1.0e-10, st=1.0e-6, parallel=1., serial=0.)
#update with inputs
self.params.update(self.values)
......
......@@ -1241,28 +1241,23 @@ class IFSsimulator():
self.information.update(dict(quadrant=int(0),
ccdx=int(0),
ccdy=int(0),
psfoversampling=1.0,
ccdxgap=1.643,
ccdygap=8.116,
bluesize=4000,
redsize=6000,
prescanx=50,
ovrscanx=20,
# prescanx=50,
# ovrscanx=20,
fullwellcapacity=90000,
dark=0.001,
readout=4,
bias=500.0,
cosmic_bkgd=0.182758225257,
scattered_light=2.96e-2,
e_adu=1.5,
exposures=1,
exptime=300.0,
readouttime=0.13824,
rdose=8.0e9,
ra=0.0,
dec=0.0,
injection=80000.0,
coveringfraction=0.5,
coveringfraction=0.1,
# CR: 3.0% is for 565s exposure
#########################################
......@@ -2402,10 +2397,13 @@ class IFSsimulator():
self.log.debug('Starting to apply radiation damage model...')
# at this point we can give fake data...
cti = CTI.CDM03bidir(self.information, [], log=self.log)
# here we need the right input data
### here we need the right input data
self.image_b = cti.applyRadiationDamage(self.image_b.copy(
).transpose(), iquadrant=self.information['quadrant']).transpose()
self.log.info('Radiation damage added.')
self.log.debug('Starting to apply radiation damage model...')
# at this point we can give fake data...
......
......@@ -358,8 +358,8 @@ class cosmicrays():
area_cr = np.count_nonzero(self.cosmicrayMap)
covering = 100.*area_cr / (self.xsize*self.ysize)
text = 'The cosmic ray covering factor is %i pixels i.e. %.3f per cent' % (area_cr, covering)
self.log.info(text)
# text = 'The cosmic ray covering factor is %i pixels i.e. %.3f per cent' % (area_cr, covering)
# self.log.info(text)
# if verbose:
# print( text)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment