pixel noise updates

turn off flat field errors by default fix bug to specify ngroup as an image array
JarronL · Sep 27, 2019 · 9d961ab · 9d961ab
1 parent 223dae5
commit 9d961ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pynrc/nrc_utils.py b/pynrc/nrc_utils.py
@@ -2801,7 +2801,7 @@ def sat_limit_webbpsf(filter_or_bp, pupil=None, mask=None, module='A', pix_scale
 
 def pix_noise(ngroup=2, nf=1, nd2=0, tf=10.737, rn=15.0, ktc=29.0, p_excess=(0,0),
     fsrc=0.0, idark=0.003, fzodi=0, fbg=0, ideal_Poisson=False,
-    ff_noise = True, **kwargs):
+    ff_noise=False, **kwargs):
     """Noise per pixel
 
     Theoretical noise calculation of a generalized MULTIACCUM ramp in terms of e-/sec.
@@ -2839,6 +2839,7 @@ def pix_noise(ngroup=2, nf=1, nd2=0, tf=10.737, rn=15.0, ktc=29.0, p_excess=(0,0
         otherwise MULTIACCUM equation is used?
     ff_noise : bool
         Include flat field errors in calculation? From JWST-CALC-003894.
+        Default=False.
 
     Notes
     -----

diff --git a/pynrc/pynrc_core.py b/pynrc/pynrc_core.py
@@ -225,8 +225,11 @@ def pixel_noise(self, fsrc=0.0, fzodi=0.0, fbg=0.0, ng=None, verbose=False, **kw
         """
 
         ma = self.multiaccum
+        if ng is none:
+            ng = ma.ngroup
+
         # Pixel noise per ramp (e-/sec/pix)
-        pn = pix_noise(ma.ngroup, ma.nf, ma.nd2, tf=self.time_frame, \
+        pn = pix_noise(ng, ma.nf, ma.nd2, tf=self.time_frame, \
                        rn=self.read_noise, ktc=self.ktc, p_excess=self.p_excess, \
                        idark=self.dark_current, fsrc=fsrc, fzodi=fzodi, fbg=fbg, **kwargs)