@@ -111,18 +111,15 @@ def __init__(self,
111111 of the image. Every image is multiplied by it
112112 """
113113
114- self ._f_number = f_number
115114 self ._pixel_area = pixel_area
116115 self ._bit_depth = bit_depth
117116 self ._img_max = 2 ** int (bit_depth ) - 1
118117 self ._width = width
119118 self ._height = height
120119
121- self ._temperature = temperature
122120 self ._temperature_ref = temperature_ref
123121 self ._temperature_doubling = temperature_doubling
124122
125- self ._wavelength = wavelength
126123 self ._qe = qe
127124 # When no specific qe is provided we simulate one
128125 if qe is None :
@@ -151,6 +148,9 @@ def __init__(self,
151148 self ._dsnu = np .zeros ((self .height , self .width ))
152149 if prnu is None :
153150 self ._prnu = np .ones ((self .height , self .width ))
151+ self .environment = {'temperature' : temperature ,
152+ 'wavelength' : wavelength ,
153+ 'f_number' : f_number }
154154
155155 @property
156156 def bit_depth (self ):
@@ -313,7 +313,7 @@ def _u_i(self):
313313 Dark current (in DN/s).
314314 """
315315 u_i = 1. * self ._dark_current_ref * 2 ** (
316- (self ._temperature - self ._temperature_ref ) /
316+ (self .environment [ 'temperature' ] - self ._temperature_ref ) /
317317 self ._temperature_doubling )
318318 return u_i
319319
@@ -355,10 +355,10 @@ def get_radiance_for(self, mean=None, exposure=None):
355355 ue = (mean / self .K ) - ud
356356 up = ue / self ._qe
357357 radiance = routines .get_radiance (exposure ,
358- self ._wavelength ,
358+ self .environment [ 'wavelength' ] ,
359359 up ,
360360 self .pixel_area ,
361- self ._f_number )
361+ self .environment [ 'f_number' ] )
362362 return radiance
363363
364364 def get_photons (self , radiance , exposure = None ):
@@ -382,7 +382,7 @@ def get_photons(self, radiance, exposure=None):
382382 if exposure is None :
383383 exposure = self .exposure
384384 return routines .get_photons (exposure ,
385- self ._wavelength ,
385+ self .environment [ 'wavelength' ] ,
386386 radiance ,
387387 self .pixel_area ,
388- self ._f_number )
388+ self .environment [ 'f_number' ] )
0 commit comments