fix; bump version

cmbant · Jan 15, 2021 · f46d2dc · f46d2dc
1 parent e44cbf8
commit f46d2dc
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/camb/__init__.py b/camb/__init__.py
@@ -7,7 +7,7 @@
 __author__ = "Antony Lewis"
 __contact__ = "antony at cosmologist dot info"
 __url__ = "https://camb.readthedocs.io"
-__version__ = "1.2.1"
+__version__ = "1.3.0"
 
 from . import baseconfig
 

diff --git a/camb/cambdll.dll b/camb/cambdll.dll
diff --git a/camb/tests/camb_test.py b/camb/tests/camb_test.py
@@ -357,7 +357,7 @@ def testPowers(self):
         cls_lensed = data.get_lensed_scalar_cls(3000)
         cphi = data.get_lens_potential_cls(2000)
 
-        cls_lensed2 = data.get_lensed_cls_with_spectrum(cls['lens_potential'][:, 0], lmax=3000)
+        cls_lensed2 = data.get_lensed_cls_with_spectrum(data.get_lens_potential_cls()[:, 0], lmax=3000)
         np.testing.assert_allclose(cls_lensed2[2:, :], cls_lensed[2:, :], rtol=1e-4)
         cls_lensed2 = data.get_partially_lensed_cls(1, lmax=3000)
         np.testing.assert_allclose(cls_lensed2[2:, :], cls_lensed[2:, :], rtol=1e-4)

diff --git a/docs/CAMBdemo.html b/docs/CAMBdemo.html
@@ -13157,7 +13157,7 @@
 
 
 <div class="output_subarea output_stream output_stdout output_text">
-<pre>Using CAMB 1.2.1 installed at c:\work\dist\git\camb\camb
+<pre>Using CAMB 1.3.0 installed at c:\work\dist\git\camb\camb
 </pre>
 </div>
 </div>
@@ -16064,12 +16064,13 @@
 <div class="prompt input_prompt">In&nbsp;[56]:</div>
 <div class="inner_cell">
     <div class="input_area">
-<div class=" highlight hl-ipython3"><pre><span></span><span class="c1"># For partially-delensed spectra, power spectra can be computed using a custom</span>
-<span class="c1"># or scaled lensing potential power spectrum. There&#39;s a pure-python interface</span>
-<span class="c1"># in the correlation module, or can use the result object functions (faster).</span>
+<div class=" highlight hl-ipython3"><pre><span></span><span class="c1"># For partially-delensed or Alens-scaled spectra, power spectra can be computed using </span>
+<span class="c1"># a custom or scaled lensing potential power spectrum. There&#39;s a pure-python </span>
+<span class="c1"># interface in the correlation module, or can use the result object functions </span>
+<span class="c1"># (faster).</span>
 <span class="c1"># Here just plot results for scaled lensing spectrum, can use </span>
 <span class="c1"># get_lensed_cls_with_spectrum to calculate lensed spectrum with specific </span>
-<span class="c1"># lensing power if needed</span>
+<span class="c1"># lensing power if needed.</span>
 
 <span class="n">pars</span> <span class="o">=</span> <span class="n">camb</span><span class="o">.</span><span class="n">set_params</span><span class="p">(</span><span class="n">H0</span><span class="o">=</span><span class="mf">67.5</span><span class="p">,</span> <span class="n">ombh2</span><span class="o">=</span><span class="mf">0.022</span><span class="p">,</span> <span class="n">omch2</span><span class="o">=</span><span class="mf">0.122</span><span class="p">,</span> <span class="n">As</span><span class="o">=</span><span class="mf">2e-9</span><span class="p">,</span> <span class="n">ns</span><span class="o">=</span><span class="mf">0.96</span><span class="p">)</span>
 <span class="n">pars</span><span class="o">.</span><span class="n">set_for_lmax</span><span class="p">(</span><span class="mi">3500</span><span class="p">,</span> <span class="n">lens_potential_accuracy</span><span class="o">=</span><span class="mi">1</span><span class="p">)</span>

diff --git a/docs/CAMBdemo.ipynb b/docs/CAMBdemo.ipynb
@@ -18,7 +18,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Using CAMB 1.2.1 installed at c:\\work\\dist\\git\\camb\\camb\n"
+      "Using CAMB 1.3.0 installed at c:\\work\\dist\\git\\camb\\camb\n"
      ]
     }
    ],
@@ -2338,12 +2338,14 @@
     }
    ],
    "source": [
-    "# For partially-delensed spectra, power spectra can be computed using a custom\n",
-    "# or scaled lensing potential power spectrum. There's a pure-python interface\n",
-    "# in the correlation module, or can use the result object functions (faster).\n",
+    "# For partially-delensed or Alens-scaled spectra, power spectra can be computed using \n",
+    "# a custom or scaled lensing potential power spectrum. There's a pure-python \n",
+    "# interface in the correlation module, or can use the result object functions \n",
+    "# (faster).\n",
     "# Here just plot results for scaled lensing spectrum, can use \n",
     "# get_lensed_cls_with_spectrum to calculate lensed spectrum with specific \n",
-    "# lensing power if needed\n",
+    "# lensing power if needed. For BB the scaling is fairly linear, but less so for\n",
+    "# other spectra.\n",
     "\n",
     "pars = camb.set_params(H0=67.5, ombh2=0.022, omch2=0.122, As=2e-9, ns=0.96)\n",
     "pars.set_for_lmax(3500, lens_potential_accuracy=1)\n",

diff --git a/fortran/config.f90 b/fortran/config.f90
@@ -3,7 +3,7 @@ module config
     use constants, only: const_twopi
     implicit none
 
-    character(LEN=*), parameter :: version = '1.2.1'
+    character(LEN=*), parameter :: version = '1.3.0'
 
     integer :: FeedbackLevel = 0 !if >0 print out useful information about the model