small changes

Author: samueldmcdermott

deepcmbsim/camb_power_spectrum.py

@@ -63,14 +63,14 @@ def get_noise(self):
             provides noise for the TT power spectrum and the polarization power spectra;
             shape is (2, max_l_use)
         """
-        if self.UserParams['noise_type'] == 'detector-white':
-            t_noise = noise.detector_white_noise(self.UserParams['noise_uKarcmin'], self.UserParams['beamfwhm_arcmin'], self.max_l_use,
-                                                 TT=True)
-            eb_noise = noise.detector_white_noise(self.UserParams['noise_uKarcmin'], self.UserParams['beamfwhm_arcmin'], self.max_l_use,
-                                                  TT=False)
+        if ((self.UserParams['noise_type'] == 'detector-white') & (self.UserParams['noise_uKarcmin'] is not None)):
+            t_noise = noise.detector_white_noise(self.UserParams['noise_uKarcmin'], TT=True)
+            eb_noise = noise.detector_white_noise(self.UserParams['noise_uKarcmin'], TT=False)
             return t_noise, eb_noise
         elif self.UserParams['noise_type'] is None:
             return np.zeros((2, self.max_l_use))
+        elif self.UserParams['noise_uKarcmin'] is None:
+            return np.zeros((2, self.max_l_use))
         else:
             print("only detector white noise is currently implemented, via `noise_type = 'detector-white'` in `user_config.yaml`")
             return np.zeros((2, self.max_l_use))
@@ -111,12 +111,12 @@ def get_cls(self, save_to_dict=None, user_params=True):
             # need to run things to get one/some/all of tt, ee, bb, te
             tt, ee, bb, te = results.get_total_cls(raw_cl=self.normalize_cls, CMB_unit=self.TT_units)[:self.max_l_use + 1].T
             # add noise
-            if self.UserParams['noise_type'] is not None:
-                _noise = self.get_noise()
-                tt += _noise[0]
-                ee += _noise[1]
-                bb += _noise[1]
-                te += _noise[1]
+            # if ((self.UserParams['noise_type'] is not None) & (self.UserParams['noise_uKarcmin'] is not None)):
+            #     _noise = self.get_noise()
+            #     tt += _noise[0]
+            #     ee += _noise[1]
+            #     bb += _noise[1]
+            #     te += _noise[1]
             # now add to outdict
             for key in ['clTT', 'clEE', 'clBB', 'clTE']:
                 if key in cls_needed:

deepcmbsim/noise.py

@@ -28,9 +28,9 @@ def max_multipole(beamfwhm_arcmin, additional_factor=3):
 
 def beam_effect(beamfwhm_arcmin, lmax):
     ells = np.arange(lmax + 1)
-    return np.exp(ells * (ells + 1) * (beamfwhm_arcmin * arcmin_to_rad)**2 / (8 * np.log(2)))
+    return np.exp(-ells * (ells + 1) * (beamfwhm_arcmin * arcmin_to_rad)**2 / (8 * np.log(2)))
 
-def detector_white_noise(noise_uKarcmin, beamfwhm_arcmin, lmax, TT=True, units_uK = True):
+def detector_white_noise(noise_uKarcmin, TT=True, units_uK = True):
     """
     describes white (no angular scale) noise from a detector
     implements Eq 8 of astro-ph/0111606 (Hu and Okamoto Astrophys.J. 574 (2002) 566-574)
@@ -57,5 +57,4 @@ def detector_white_noise(noise_uKarcmin, beamfwhm_arcmin, lmax, TT=True, units_u
     """
     noise_uKarcmin = noise_uKarcmin if TT else noise_uKarcmin * np.sqrt(2)
     noise_uKarcmin = noise_uKarcmin if units_uK else noise_uKarcmin / 2.72548e6
-    ells = np.arange(lmax+1)
     return (noise_uKarcmin * arcmin_to_rad) ** 2