From 304ba254315d7744d8f83570fbad4f1409dd3a1c Mon Sep 17 00:00:00 2001
From: Pawel Marek Kozlowski <pawel@pmkozlowski.com>
Date: Mon, 30 Apr 2018 15:28:09 -0600
Subject: [PATCH 1/3] Initial commit for ionization query functionality, plus
 requirements.

---
 SpectroscoPy/atomic/nist/__init__.py          |   0
 .../atomic/nist/nistIonizationQuery.py        | 323 ++++++++++++++++++
 SpectroscoPy/atomic/nist/tests/__init__.py    |   0
 .../nist/tests/test_nistIonizationQuery.py    |  43 +++
 requirements/base.txt                         |   3 +
 5 files changed, 369 insertions(+)
 create mode 100644 SpectroscoPy/atomic/nist/__init__.py
 create mode 100644 SpectroscoPy/atomic/nist/nistIonizationQuery.py
 create mode 100644 SpectroscoPy/atomic/nist/tests/__init__.py
 create mode 100644 SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py

diff --git a/SpectroscoPy/atomic/nist/__init__.py b/SpectroscoPy/atomic/nist/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/SpectroscoPy/atomic/nist/nistIonizationQuery.py b/SpectroscoPy/atomic/nist/nistIonizationQuery.py
new file mode 100644
index 0000000..5c6386d
--- /dev/null
+++ b/SpectroscoPy/atomic/nist/nistIonizationQuery.py
@@ -0,0 +1,323 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Fri Jul 14 15:18:45 2017
+
+Queries NIST database on ionization energies.
+Mainly used for generating Saha-Boltzmann plots.
+
+TODO:
+- Add tests for nistIonEnergiesQuery()
+- Move status of connection into a log file
+-improve this query function by making it a class and allowing for the use
+    of methods to get different column values
+- Use code for generalized query of all energies for all charge states
+    as this will be a useful speedup
+- implement an object that can be returned from this query and methods
+  that take slices through the table
+
+@author: Pawel M. Kozlowski
+"""
+
+# importing Python modules
+import requests as req
+import parse as parse
+import re
+import numpy as np
+import astropy.units as u
+import mendeleev as lev
+
+def cleanhtml(raw_html):
+    """
+    Cleaning HTML tags using regular expressions
+    """
+    cleanr = re.compile('<.*?>')
+    cleantext = re.sub(cleanr, '', raw_html)
+    return cleantext
+
+# URL to nist ionization energy database
+nistIonizationURL1 = 'https://physics.nist.gov/PhysRefData/ASD/ionEnergy.html'
+nistIonizationURL2 = 'https://physics.nist.gov/cgi-bin/ASD/ie.pl'
+
+# Checking website status
+reqObj = req.post(nistIonizationURL1)
+print("STATUS:")
+print(reqObj.status_code)
+if reqObj.status_code == req.codes.ok:
+    print("OK!")
+else:
+    print("CONNECTION FAILED!")
+reqObj.raise_for_status()
+    
+# for testing purposes only
+#print("HEADERS:")
+#print(reqObj.headers['content-type'])
+#print("ENCODING:")
+#print(reqObj.encoding)
+#print("TEXT:")
+#print(reqObj.text)
+
+#%% NIST levels
+
+def nistIonEnergiesQuery(element):
+    """
+    Given an element, and a charge state this
+    script queries the NIST ionization energy level database and retrieves 
+    the value of ionization energy and its uncertainty. The uncertainty
+    is given in units of the last decimal place of the value.
+    Elements (string)
+    chargeState [dimless integer]
+    Ionization energy [eV]
+    Uncertainty [eV]
+    """
+    # checking inputs
+    if not isinstance(element, str):
+        raise ValueError("Element must be a string!")
+    elementCharge = element
+    # Starting requests session
+    with req.session() as s:
+        # values to be filled into website form
+        payload = {'spectra': elementCharge, # element and charge state
+                   'submit': 'Retrieve Data',
+                   'units': '1', # selects energy units eV
+                   'format': '1', # ASCII output
+                   'order': '0', # order by Z or sequence
+                   'at_num_out': 'on', # output atomic number
+                   'sp_name_out': 'on', # output spectrum name
+                   'ion_charge_out': 'on', # output ion charge
+                   'el_name_out': 'on', # output element name
+                   'seq_out': 'on', # output isoelectronic sequence
+                   'shells_out': 'on', # output ground-state electronic shells
+                   'conf_out': 'on', # outpuse ground-state configuration
+                   'level_out': 'on', # output ground-state level
+                   'ion_conf_out': 'on', # output ionization configuration
+                   'e_out': '0', # selects ionization energy not binding
+                   'unc_out': 'on', # output uncertainty
+                   'biblio': 'on' # output bibliographic references
+                   }
+        # website's repsonse to query
+        response = s.post(nistIonizationURL2, data=payload)
+#        # for testing purposes only
+#        print("URL:")
+#        print(response.url)
+#        print("STATUS:")
+#        print(response.status_code)
+#        print("TEXT:")
+#        print(response.text)
+
+    # Extract ionization energy value string from HTML/ASCII
+    # Getting entire ASCII table
+#    searchStringTable = "<pre>{}</pre>"
+        searchStringTable = "<pre>{}<p"
+    tableStr = parse.search(searchStringTable, response.text)
+#    print(tableStr)
+    # splitting table into lines (rows)
+    tableLines = tableStr[0].splitlines()
+    # cutting header and footer of table
+    header = 4
+    footer = -1
+    tableLinesShort = tableLines[header:footer]
+    
+    searchStringRow = "{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}</a>"
+    # could get rid of this footer if we had a dictionary or similar of
+    # element info on possible charge states (equivalently number of electrons
+    # in the neutral atom).
+    
+    elementObj = lev.element(element)
+    chargeStatesNum = elementObj.atomic_number
+#    print(f"number of charge states is {chargeStatesNum}")
+    energiesArr = np.zeros((chargeStatesNum))
+    uncertaintiesArr = np.zeros((chargeStatesNum))
+    energyTypeArr = np.empty((chargeStatesNum), dtype=object)
+#    print(energiesArr)
+    for chargeState in np.arange(chargeStatesNum):
+#        print(f"####Charge state is {chargeState}####")
+#        print(tableLinesShort[chargeState])
+        parsedRow = parse.search(searchStringRow, tableLinesShort[chargeState])
+        (atNum,     # atomic number
+         spName,     # species name
+         ionCharge,     # ion charge
+         elName,     # element name
+         isoElSeq,    # isoelectronic sequence
+         gndShells,     # ground shells
+         shellRedun,     # redundant ending for ground shells
+         gndLevel,     # ground level
+         ionLevel,     # ionized level
+         ionEnergyHTML,     # ionization energy (eV)
+         uncertainty, # uncertainty in the ionization energy (eV)
+         refs    # references
+         ) = [entry.strip() for entry in parsedRow]
+    #    boom = [entry.strip() for entry in parsedRow]
+        
+        
+        # further parsing to get at ionization energy and uncertainty
+        ionEnergyStrip = cleanhtml(ionEnergyHTML)
+        
+        # test if value is measured, interpolated/extrapolated, or
+        # if it is purely theoretical (nothing, square brackets, or parens)
+    #    print(ionEnergyStrip)
+        if ionEnergyStrip[0].isdigit():
+            energyType = 'Measured'
+            ionEnergyStr =  ionEnergyStrip
+        elif ionEnergyStrip[0] == '[':
+            energyType = 'Interpolated/extrapolated'
+            ionEnergyStr = ionEnergyStrip[1:-1]
+        elif ionEnergyStrip[0] == '(':
+            energyType = 'Theoretical'
+            ionEnergyStr = ionEnergyStrip[1:-1]
+        else:
+            raise Exception('Something went wrong. String not parsed!')
+    
+    #    print(ionEnergyStr)
+    #    print(uncertainty)
+        # converting extracted strings to floats and adding units
+        ionEnergy = float(ionEnergyStr)
+        ionEnergyUnc = float(uncertainty)
+        
+        # record results into array
+        energiesArr[chargeState] = ionEnergy
+        uncertaintiesArr[chargeState] = ionEnergyUnc
+        energyTypeArr[chargeState] = energyType
+        
+    # adding units
+#    print(energiesArr)
+    energiesArr = energiesArr * u.eV
+    uncertaintiesArr = uncertaintiesArr * u.eV
+
+    return energiesArr, uncertaintiesArr, energyTypeArr
+
+def nistIonEnergyQuery(element, chargeState):
+    """
+    Given an element, and a charge state this
+    script queries the NIST ionization energy level database and retrieves 
+    the value of ionization energy and its uncertainty. The uncertainty
+    is given in units of the last decimal place of the value.
+    Elements (string)
+    chargeState [dimless integer]
+    Ionization energy [eV]
+    Uncertainty [eV]
+    """
+    # checking inputs
+    if not isinstance(element, str):
+        raise ValueError("Element must be a string!")
+    if not isinstance(chargeState, (int, np.int64)):
+        raise ValueError("Charge state must be an integer!")
+    # test when charge state is greater than atomic number
+    elementObj = lev.element(element)
+    atomicNum = elementObj.atomic_number
+    if chargeState > (atomicNum - 1):
+        raise Exception("Charge state cannot be greater than element's "
+                        "atomic number!")
+    # converting integer charge state to Roman numeral
+#    chargeStateStr = intToRoman(chargeState)
+    # formatting input strings
+#    elementCharge = element + ' ' + chargeStateStr
+    elementCharge = element
+    # Starting requests session
+    with req.session() as s:
+        # values to be filled into website form
+        payload = {'spectra': elementCharge, # element and charge state
+                   'submit': 'Retrieve Data',
+                   'units': '1', # selects energy units eV
+                   'format': '1', # ASCII output
+                   'order': '0', # order by Z or sequence
+                   'at_num_out': 'on', # output atomic number
+                   'sp_name_out': 'on', # output spectrum name
+                   'ion_charge_out': 'on', # output ion charge
+                   'el_name_out': 'on', # output element name
+                   'seq_out': 'on', # output isoelectronic sequence
+                   'shells_out': 'on', # output ground-state electronic shells
+                   'conf_out': 'on', # outpuse ground-state configuration
+                   'level_out': 'on', # output ground-state level
+                   'ion_conf_out': 'on', # output ionization configuration
+                   'e_out': '0', # selects ionization energy not binding
+                   'unc_out': 'on', # output uncertainty
+                   'biblio': 'on' # output bibliographic references
+                   }
+        # website's repsonse to query
+        response = s.post(nistIonizationURL2, data=payload)
+#        # for testing purposes only
+#        print("URL:")
+#        print(response.url)
+#        print("STATUS:")
+#        print(response.status_code)
+#        print("TEXT:")
+#        print(response.text)
+
+    # Extract ionization energy value string from HTML/ASCII
+    # Getting entire ASCII table
+#    searchStringTable = "<pre>{}</pre>"
+    searchStringTable = "<pre>{}<p"
+    tableStr = parse.search(searchStringTable, response.text)
+#    print(tableStr)
+    # splitting table into lines (rows)
+    tableLines = tableStr[0].splitlines()
+    # cutting header and footer of table
+    header = 4
+    footer = -1
+    tableLinesShort = tableLines[header:footer]
+    
+    # Here is where we can add a temporary storage for the queried
+    # table so that the query doesn't have to be done multiple times
+    # It may be worth splitting the function here into multiple functions.
+    # One that grabs the table and another that parses it.
+    
+    
+    # Each row has 10 columns of data
+    searchStringRow = "{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}</a>"
+    parsedRow = parse.search(searchStringRow, tableLinesShort[chargeState-0])
+    (atNum,     # atomic number
+     spName,     # species name
+     ionCharge,     # ion charge
+     elName,     # element name
+     isoElSeq,    # isoelectronic sequence
+     gndShells,     # ground shells
+     shellRedun,     # redundant ending for ground shells
+     gndLevel,     # ground level
+     ionLevel,     # ionized level
+     ionEnergyHTML,     # ionization energy (eV)
+     uncertainty, # uncertainty in the ionization energy (eV)
+     refs    # references
+     ) = [entry.strip() for entry in parsedRow]
+#    boom = [entry.strip() for entry in parsedRow]
+    
+    
+    # further parsing to get at ionization energy and uncertainty
+    ionEnergyStrip = cleanhtml(ionEnergyHTML)
+    
+    # test if value is measured, interpolated/extrapolated, or
+    # if it is purely theoretical (nothing, square brackets, or parens)
+#    print(ionEnergyStrip)
+    if ionEnergyStrip[0].isdigit():
+        energyType = 'Measured'
+        ionEnergyStr =  ionEnergyStrip
+    elif ionEnergyStrip[0] == '[':
+        energyType = 'Interpolated/extrapolated'
+        ionEnergyStr = ionEnergyStrip[1:-1]
+    elif ionEnergyStrip[0] == '(':
+        energyType = 'Theoretical'
+        ionEnergyStr = ionEnergyStrip[1:-1]
+    else:
+        raise Exception('Something went wrong. String not parsed!')
+
+#    print(ionEnergyStr)
+#    print(uncertainty)
+    # converting extracted strings to floats and adding units
+    ionEnergy = float(ionEnergyStr) * u.eV
+    ionEnergyUnc = float(uncertainty) * u.eV
+#    # Return ionization energy and uncertainty
+#    return ionEnergy, ionEnergyUnc
+    return ionEnergy, ionEnergyUnc, energyType
+
+
+#%% Calling function
+# Set element, charge state, and temperature
+#element = 'Na'
+##element = 'He'
+#chargeState = 4
+#stuff = nistIonEnergyQuery(element, chargeState)
+#print(f"Ionization energy: {stuff[0]}")
+#
+#energies, uncertainties, energyTypes = nistIonEnergiesQuery(element)
+#print(f"Ionization energy: {energies}")
+#
diff --git a/SpectroscoPy/atomic/nist/tests/__init__.py b/SpectroscoPy/atomic/nist/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py b/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py
new file mode 100644
index 0000000..aaf84ef
--- /dev/null
+++ b/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Thu Oct  5 11:49:30 2017
+
+Unit tests for plasma_functions.py module.
+
+@author: Pawel M. Kozlowski
+"""
+
+# importing Python modules
+import pytest
+import numpy as np
+from astropy import units as u
+
+# importing custom modules
+from .. import nistIonizationQuery as niq
+
+
+class Test_nistIonizationQuery(object):
+    """Testing NIST ionization query functions"""
+    def setup_method(self):
+        """ Setting up for the test """
+        ## Set element, charge state, and temperature
+        self.element = 'Na'
+        self.chargeState = 3
+    def test_queryEnergy(self):
+        """Test ionization energy query"""
+        energy, uncert, dataType = niq.nistIonEnergyQuery(self.element,
+                                                          self.chargeState)
+        queryVal = np.array([energy.value,
+                             uncert.value])
+        queryExpect = np.array([9.8936e1,
+                                1.2e-2])
+        testTrue = np.allclose(queryVal, 
+                               queryExpect,
+                               rtol=1e-3,
+                               atol=0)
+        testType = dataType == "Interpolated/extrapolated"
+        testTrue = testTrue and testType
+        errStr = (f"nistIonEnergyQuery() method is wrong. Got {queryVal}, "
+                  f"should be {queryExpect}.")
+        assert testTrue, errStr
\ No newline at end of file
diff --git a/requirements/base.txt b/requirements/base.txt
index fdbe13c..6fc3c99 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,3 +1,6 @@
 numpy (>= 1.13)
 scipy (>= 0.19)
 astropy (>= 2.0)
+mendeleev (>= 0.4.2)
+requests (>= 2.18.4)
+parse (>= 1.8.2)

From 792160d2dd529f7a2bb70473672b40b5f5c4e031 Mon Sep 17 00:00:00 2001
From: Pawel Marek Kozlowski <pawel@pmkozlowski.com>
Date: Mon, 30 Apr 2018 15:33:09 -0600
Subject: [PATCH 2/3] Autopep8 fixes.

---
 .../atomic/nist/nistIonizationQuery.py        | 121 +++++++++---------
 .../nist/tests/test_nistIonizationQuery.py    |   8 +-
 2 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/SpectroscoPy/atomic/nist/nistIonizationQuery.py b/SpectroscoPy/atomic/nist/nistIonizationQuery.py
index 5c6386d..8444973 100644
--- a/SpectroscoPy/atomic/nist/nistIonizationQuery.py
+++ b/SpectroscoPy/atomic/nist/nistIonizationQuery.py
@@ -27,6 +27,7 @@
 import astropy.units as u
 import mendeleev as lev
 
+
 def cleanhtml(raw_html):
     """
     Cleaning HTML tags using regular expressions
@@ -35,6 +36,7 @@ def cleanhtml(raw_html):
     cleantext = re.sub(cleanr, '', raw_html)
     return cleantext
 
+
 # URL to nist ionization energy database
 nistIonizationURL1 = 'https://physics.nist.gov/PhysRefData/ASD/ionEnergy.html'
 nistIonizationURL2 = 'https://physics.nist.gov/cgi-bin/ASD/ie.pl'
@@ -48,17 +50,18 @@ def cleanhtml(raw_html):
 else:
     print("CONNECTION FAILED!")
 reqObj.raise_for_status()
-    
+
 # for testing purposes only
-#print("HEADERS:")
-#print(reqObj.headers['content-type'])
-#print("ENCODING:")
-#print(reqObj.encoding)
-#print("TEXT:")
-#print(reqObj.text)
+# print("HEADERS:")
+# print(reqObj.headers['content-type'])
+# print("ENCODING:")
+# print(reqObj.encoding)
+# print("TEXT:")
+# print(reqObj.text)
 
 #%% NIST levels
 
+
 def nistIonEnergiesQuery(element):
     """
     Given an element, and a charge state this
@@ -77,23 +80,23 @@ def nistIonEnergiesQuery(element):
     # Starting requests session
     with req.session() as s:
         # values to be filled into website form
-        payload = {'spectra': elementCharge, # element and charge state
+        payload = {'spectra': elementCharge,  # element and charge state
                    'submit': 'Retrieve Data',
-                   'units': '1', # selects energy units eV
-                   'format': '1', # ASCII output
-                   'order': '0', # order by Z or sequence
-                   'at_num_out': 'on', # output atomic number
-                   'sp_name_out': 'on', # output spectrum name
-                   'ion_charge_out': 'on', # output ion charge
-                   'el_name_out': 'on', # output element name
-                   'seq_out': 'on', # output isoelectronic sequence
-                   'shells_out': 'on', # output ground-state electronic shells
-                   'conf_out': 'on', # outpuse ground-state configuration
-                   'level_out': 'on', # output ground-state level
-                   'ion_conf_out': 'on', # output ionization configuration
-                   'e_out': '0', # selects ionization energy not binding
-                   'unc_out': 'on', # output uncertainty
-                   'biblio': 'on' # output bibliographic references
+                   'units': '1',  # selects energy units eV
+                   'format': '1',  # ASCII output
+                   'order': '0',  # order by Z or sequence
+                   'at_num_out': 'on',  # output atomic number
+                   'sp_name_out': 'on',  # output spectrum name
+                   'ion_charge_out': 'on',  # output ion charge
+                   'el_name_out': 'on',  # output element name
+                   'seq_out': 'on',  # output isoelectronic sequence
+                   'shells_out': 'on',  # output ground-state electronic shells
+                   'conf_out': 'on',  # outpuse ground-state configuration
+                   'level_out': 'on',  # output ground-state level
+                   'ion_conf_out': 'on',  # output ionization configuration
+                   'e_out': '0',  # selects ionization energy not binding
+                   'unc_out': 'on',  # output uncertainty
+                   'biblio': 'on'  # output bibliographic references
                    }
         # website's repsonse to query
         response = s.post(nistIonizationURL2, data=payload)
@@ -117,12 +120,12 @@ def nistIonEnergiesQuery(element):
     header = 4
     footer = -1
     tableLinesShort = tableLines[header:footer]
-    
+
     searchStringRow = "{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}</a>"
     # could get rid of this footer if we had a dictionary or similar of
     # element info on possible charge states (equivalently number of electrons
     # in the neutral atom).
-    
+
     elementObj = lev.element(element)
     chargeStatesNum = elementObj.atomic_number
 #    print(f"number of charge states is {chargeStatesNum}")
@@ -131,8 +134,8 @@ def nistIonEnergiesQuery(element):
     energyTypeArr = np.empty((chargeStatesNum), dtype=object)
 #    print(energiesArr)
     for chargeState in np.arange(chargeStatesNum):
-#        print(f"####Charge state is {chargeState}####")
-#        print(tableLinesShort[chargeState])
+        #        print(f"####Charge state is {chargeState}####")
+        #        print(tableLinesShort[chargeState])
         parsedRow = parse.search(searchStringRow, tableLinesShort[chargeState])
         (atNum,     # atomic number
          spName,     # species name
@@ -144,21 +147,20 @@ def nistIonEnergiesQuery(element):
          gndLevel,     # ground level
          ionLevel,     # ionized level
          ionEnergyHTML,     # ionization energy (eV)
-         uncertainty, # uncertainty in the ionization energy (eV)
+         uncertainty,  # uncertainty in the ionization energy (eV)
          refs    # references
          ) = [entry.strip() for entry in parsedRow]
     #    boom = [entry.strip() for entry in parsedRow]
-        
-        
+
         # further parsing to get at ionization energy and uncertainty
         ionEnergyStrip = cleanhtml(ionEnergyHTML)
-        
+
         # test if value is measured, interpolated/extrapolated, or
         # if it is purely theoretical (nothing, square brackets, or parens)
     #    print(ionEnergyStrip)
         if ionEnergyStrip[0].isdigit():
             energyType = 'Measured'
-            ionEnergyStr =  ionEnergyStrip
+            ionEnergyStr = ionEnergyStrip
         elif ionEnergyStrip[0] == '[':
             energyType = 'Interpolated/extrapolated'
             ionEnergyStr = ionEnergyStrip[1:-1]
@@ -167,18 +169,18 @@ def nistIonEnergiesQuery(element):
             ionEnergyStr = ionEnergyStrip[1:-1]
         else:
             raise Exception('Something went wrong. String not parsed!')
-    
+
     #    print(ionEnergyStr)
     #    print(uncertainty)
         # converting extracted strings to floats and adding units
         ionEnergy = float(ionEnergyStr)
         ionEnergyUnc = float(uncertainty)
-        
+
         # record results into array
         energiesArr[chargeState] = ionEnergy
         uncertaintiesArr[chargeState] = ionEnergyUnc
         energyTypeArr[chargeState] = energyType
-        
+
     # adding units
 #    print(energiesArr)
     energiesArr = energiesArr * u.eV
@@ -186,6 +188,7 @@ def nistIonEnergiesQuery(element):
 
     return energiesArr, uncertaintiesArr, energyTypeArr
 
+
 def nistIonEnergyQuery(element, chargeState):
     """
     Given an element, and a charge state this
@@ -216,23 +219,23 @@ def nistIonEnergyQuery(element, chargeState):
     # Starting requests session
     with req.session() as s:
         # values to be filled into website form
-        payload = {'spectra': elementCharge, # element and charge state
+        payload = {'spectra': elementCharge,  # element and charge state
                    'submit': 'Retrieve Data',
-                   'units': '1', # selects energy units eV
-                   'format': '1', # ASCII output
-                   'order': '0', # order by Z or sequence
-                   'at_num_out': 'on', # output atomic number
-                   'sp_name_out': 'on', # output spectrum name
-                   'ion_charge_out': 'on', # output ion charge
-                   'el_name_out': 'on', # output element name
-                   'seq_out': 'on', # output isoelectronic sequence
-                   'shells_out': 'on', # output ground-state electronic shells
-                   'conf_out': 'on', # outpuse ground-state configuration
-                   'level_out': 'on', # output ground-state level
-                   'ion_conf_out': 'on', # output ionization configuration
-                   'e_out': '0', # selects ionization energy not binding
-                   'unc_out': 'on', # output uncertainty
-                   'biblio': 'on' # output bibliographic references
+                   'units': '1',  # selects energy units eV
+                   'format': '1',  # ASCII output
+                   'order': '0',  # order by Z or sequence
+                   'at_num_out': 'on',  # output atomic number
+                   'sp_name_out': 'on',  # output spectrum name
+                   'ion_charge_out': 'on',  # output ion charge
+                   'el_name_out': 'on',  # output element name
+                   'seq_out': 'on',  # output isoelectronic sequence
+                   'shells_out': 'on',  # output ground-state electronic shells
+                   'conf_out': 'on',  # outpuse ground-state configuration
+                   'level_out': 'on',  # output ground-state level
+                   'ion_conf_out': 'on',  # output ionization configuration
+                   'e_out': '0',  # selects ionization energy not binding
+                   'unc_out': 'on',  # output uncertainty
+                   'biblio': 'on'  # output bibliographic references
                    }
         # website's repsonse to query
         response = s.post(nistIonizationURL2, data=payload)
@@ -256,16 +259,15 @@ def nistIonEnergyQuery(element, chargeState):
     header = 4
     footer = -1
     tableLinesShort = tableLines[header:footer]
-    
+
     # Here is where we can add a temporary storage for the queried
     # table so that the query doesn't have to be done multiple times
     # It may be worth splitting the function here into multiple functions.
     # One that grabs the table and another that parses it.
-    
-    
+
     # Each row has 10 columns of data
     searchStringRow = "{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}|{}</a>"
-    parsedRow = parse.search(searchStringRow, tableLinesShort[chargeState-0])
+    parsedRow = parse.search(searchStringRow, tableLinesShort[chargeState - 0])
     (atNum,     # atomic number
      spName,     # species name
      ionCharge,     # ion charge
@@ -276,21 +278,20 @@ def nistIonEnergyQuery(element, chargeState):
      gndLevel,     # ground level
      ionLevel,     # ionized level
      ionEnergyHTML,     # ionization energy (eV)
-     uncertainty, # uncertainty in the ionization energy (eV)
+     uncertainty,  # uncertainty in the ionization energy (eV)
      refs    # references
      ) = [entry.strip() for entry in parsedRow]
 #    boom = [entry.strip() for entry in parsedRow]
-    
-    
+
     # further parsing to get at ionization energy and uncertainty
     ionEnergyStrip = cleanhtml(ionEnergyHTML)
-    
+
     # test if value is measured, interpolated/extrapolated, or
     # if it is purely theoretical (nothing, square brackets, or parens)
 #    print(ionEnergyStrip)
     if ionEnergyStrip[0].isdigit():
         energyType = 'Measured'
-        ionEnergyStr =  ionEnergyStrip
+        ionEnergyStr = ionEnergyStrip
     elif ionEnergyStrip[0] == '[':
         energyType = 'Interpolated/extrapolated'
         ionEnergyStr = ionEnergyStrip[1:-1]
diff --git a/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py b/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py
index aaf84ef..2c7954f 100644
--- a/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py
+++ b/SpectroscoPy/atomic/nist/tests/test_nistIonizationQuery.py
@@ -19,11 +19,13 @@
 
 class Test_nistIonizationQuery(object):
     """Testing NIST ionization query functions"""
+
     def setup_method(self):
         """ Setting up for the test """
-        ## Set element, charge state, and temperature
+        # Set element, charge state, and temperature
         self.element = 'Na'
         self.chargeState = 3
+
     def test_queryEnergy(self):
         """Test ionization energy query"""
         energy, uncert, dataType = niq.nistIonEnergyQuery(self.element,
@@ -32,7 +34,7 @@ def test_queryEnergy(self):
                              uncert.value])
         queryExpect = np.array([9.8936e1,
                                 1.2e-2])
-        testTrue = np.allclose(queryVal, 
+        testTrue = np.allclose(queryVal,
                                queryExpect,
                                rtol=1e-3,
                                atol=0)
@@ -40,4 +42,4 @@ def test_queryEnergy(self):
         testTrue = testTrue and testType
         errStr = (f"nistIonEnergyQuery() method is wrong. Got {queryVal}, "
                   f"should be {queryExpect}.")
-        assert testTrue, errStr
\ No newline at end of file
+        assert testTrue, errStr

From 8deb52204701d596fe6d54a34be36d1bbef44a11 Mon Sep 17 00:00:00 2001
From: Pawel Marek Kozlowski <pawel@pmkozlowski.com>
Date: Tue, 3 Jul 2018 23:26:34 -0600
Subject: [PATCH 3/3] Re-templating merge from master caused changes to
 astropy_helpers.

---
 astropy_helpers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/astropy_helpers b/astropy_helpers
index 09bbe95..6f31c21 160000
--- a/astropy_helpers
+++ b/astropy_helpers
@@ -1 +1 @@
-Subproject commit 09bbe9583e70ed1804f1051a3aaca1640d08c6f8
+Subproject commit 6f31c21c8a49ae4ea92bd9b0a7a5e105639c449c