Replace expected energy with impact energy

Author: XePeleato

astroquery/esa/neocc/tabs.py

@@ -197,7 +197,7 @@ def parse_impacts(resp_str):
     # Build the main data table
     impact_tble = Table.read(resp_lst[1], format='ascii', data_start=3,
                              names=["date", "MJD", "sigma", "sigimp", "dist", "+/-", "width",
-                                    "stretch", "p_RE", "Exp. Energy in MT", "PS", "TS"])
+                                    "stretch", "p_RE", "Imp. Energy in MT", "PS", "TS"])
     impact_tble.remove_column("+/-")
     impact_tble['date'] = convert_time(impact_tble['date'])
 
@@ -216,8 +216,7 @@ def parse_impacts(resp_str):
                                                    'This is a close cousin of the Lyapounov exponent. Units are in '
                                                    'Earth radii divided by sigma (RE/sig)'),
                                        'p_RE': 'probability of Earth Impact (IP)',
-                                       'Exp. Energy in MT': ('Expected energy. It is the product of the impact energy '
-                                                             'and the impact probability'),
+                                       'Exp. Energy in MT': 'Impact energy.',
                                        'PS': 'Palermo Scale',
                                        'TS': 'Torino Scale'}
 

astroquery/esa/neocc/test/test_neocc.py

@@ -392,7 +392,7 @@ def test_tabs_impacts(patch_get):
     meta_keys = ['Column Info', 'observation_accepted', 'observation_rejected', 'arc_start',
                  'arc_end', 'info', 'computation', 'additional_note']
     impact_columns = ['date', 'MJD', 'sigma', 'sigimp', 'dist', 'width', 'stretch', 'p_RE',
-                      'Exp. Energy in MT', 'PS', 'TS']
+                      'Imp. Energy in MT', 'PS', 'TS']
 
     # Asteroid 1979XB
     impact_tab_list = neocc.neocc.query_object(name='1979XB', tab='impacts')

docs/esa/neocc/neocc.rst

@@ -178,7 +178,7 @@ This query returns a list containing a single table:
 .. doctest-remote-data::
 
     >>> print(ast_impacts[0])  # doctest: +IGNORE_OUTPUT
-              date             MJD    sigma  sigimp ... Exp. Energy in MT   PS   TS
+              date             MJD    sigma  sigimp ... Imp. Energy in MT   PS   TS
     ----------------------- --------- ------ ------ ... ----------------- ----- ---
     2056-12-12 21:38:52.800 72344.902  0.255    0.0 ...             0.013 -2.86   0
     2065-12-16 11:06:43.200 75635.463  -1.11    0.0 ...           3.3e-05 -5.42   0