From f46d2dcdd1743723986d33065b72b4cceecf419b Mon Sep 17 00:00:00 2001 From: Antony Lewis Date: Fri, 15 Jan 2021 13:38:44 +0000 Subject: [PATCH] fix; bump version --- camb/__init__.py | 2 +- camb/cambdll.dll | Bin 2788609 -> 2788609 bytes camb/tests/camb_test.py | 2 +- docs/CAMBdemo.html | 11 ++++++----- docs/CAMBdemo.ipynb | 12 +++++++----- fortran/config.f90 | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/camb/__init__.py b/camb/__init__.py index 470a686f..65f69780 100644 --- 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 index bb84df27d169aa505a21332c1e655228dc38288a..44687f884e428ee467c5cc84b2a1fc2c233235c8 100644 GIT binary patch delta 251 zcmWN~KQ9Ae90%}Rug+;ve~uoG-b3+_;F1oQOpJXCoedJNK-}=nl?j8N^bJT1O$>4| zb@U>>%X9GxBz1|+GkoSxI(TzZ>!Dv6ygc4_-KWp}l%NAvKo_in6QBo9f<8C}*1$SA z4bFhGU;~^3=fMSV5e&d3a2afZA-Dprf@@#|u7evNY`r$Cox|i>h9)@8Mqw)-h4J~9 z?K98Bma;ajEvs#9TRYZn?iqa%xW`E%??xR-Z>;NbH`WKviToJVmCHi4rB|q$oE0jT dVWA?qEphD!|6 z@kTG=yR`8NB&UhZGkoSx`ueU?>*>CBaryk%bK>*el%N7@paa&yG0+9aK@Xe&8(!4)tBSHZPUcHY|c?*8G83<^KVhCwGE2GQx4 z?K8KCEN!h@8&+&>T3gn3?iS|EcaD-oJ_>yx{gG+P!^rHZWBDm`Pp(QGOTW|&IVp7{ cgHnfbSDBXF{+esm74@yd%&Sc9RXcw#|7Le=lK=n! diff --git a/camb/tests/camb_test.py b/camb/tests/camb_test.py index 8046e625..34f3aafd 100644 --- 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 index 803805ad..9f5625f9 100644 --- a/docs/CAMBdemo.html +++ b/docs/CAMBdemo.html @@ -13157,7 +13157,7 @@
-
Using CAMB 1.2.1 installed at c:\work\dist\git\camb\camb
+
Using CAMB 1.3.0 installed at c:\work\dist\git\camb\camb
@@ -16064,12 +16064,13 @@
In [56]:
-
# For partially-delensed spectra, power spectra can be computed using a custom
-# or scaled lensing potential power spectrum. There's a pure-python interface
-# in the correlation module, or can use the result object functions (faster).
+
# For partially-delensed or Alens-scaled spectra, power spectra can be computed using 
+# a custom or scaled lensing potential power spectrum. There's a pure-python 
+# interface in the correlation module, or can use the result object functions 
+# (faster).
 # Here just plot results for scaled lensing spectrum, can use 
 # get_lensed_cls_with_spectrum to calculate lensed spectrum with specific 
-# lensing power if needed
+# lensing power if needed.
 
 pars = camb.set_params(H0=67.5, ombh2=0.022, omch2=0.122, As=2e-9, ns=0.96)
 pars.set_for_lmax(3500, lens_potential_accuracy=1)
diff --git a/docs/CAMBdemo.ipynb b/docs/CAMBdemo.ipynb
index 36f468b6..442ab049 100644
--- 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
index 062b83f7..9e1fc5a1 100644
--- 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