Merge pull request #384 from kdere/master

mostly change of shape to Ip array
chianti-atomic · Aug 14, 2022 · 75d18cd · 75d18cd
2 parents f8f6897 + 86ff461
commit 75d18cd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ChiantiPy/tools/io.py b/ChiantiPy/tools/io.py
@@ -1326,7 +1326,7 @@ def ipRead(verbose=False):
     if verbose:
         print((' maxz = %5i'%(maxz)))
     nip = nip-1
-    ip = np.zeros((maxz, maxz), np.float64)
+    ip = np.zeros((maxz, maxz + 1), np.float64)
     for aline in data[0:nip]:
         s2 = aline.split()
         iz = int(s2[0])

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -17,7 +17,7 @@ ChiantiPy v0.14.0 is released under the OSI approved ISC license. From `Wikipedi
 CHIANTI is developed and maintained by scientists at George Mason University (USA), the University of Michigan (USA), and the University of Cambridge (UK). The first version of CHIANTI was released in 1997 and version 10.0 in 2021.
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2
 
    getting_started
    quick_start

diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst
@@ -167,7 +167,7 @@ Bring up a Python session, or better yet, an IPython session
 ::
 
   import ChiantiPy.core as ch
-  fe14 = ch.ion('fe_14')
+  fe14 = ch.ion('fe_14', setup=False)
 
 The fe14 object is instantiated with a number of methods and data.  Methods start with lowercase letters and attributes start with uppercase letters.  It is best not to simply import ion as there is a method with the same name in matplotlib.  A few examples:
 
@@ -250,9 +250,9 @@ If the fe14 **ion** object had be instantiated (created) with a temperature and
 ::
 
   import numpy as np
-  t = 10.**(5.8+0.1*np.arange(11))
+  temp = 10.**(5.8+0.1*np.arange(11))
   dens = 1.e+9
-  fe14 = ch.ion('fe_14')
+  fe14 = ch.ion('fe_14', temp, dens)
   fe14.populate()
   fe14.Population.keys()
   >>['ci', 'protonDensity', 'popmat', 'eDensity', 'rec', 'population', 'temperature']