pyredshift 1.11__tar.gz → 1.13__tar.gz

{pyredshift-1.11 → pyredshift-1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyredshift
-Version: 1.11
+Version: 1.13
 Summary: Interactive redshifting of 1D astronomical spectra (Python successor of pdlredshift / redshift.f)
 Home-page: https://github.com/karlglazebrook/pyredshift
 Author: Karl Glazebrook

{pyredshift-1.11 → pyredshift-1.13}/pyredshift

@@ -75,10 +75,15 @@ def read_csv(fname):
                 continue
             parts = line.split(",")
             try:
-                wav.append(float(parts[0]))
-                spec.append(float(parts[1]))
+                x = float(parts[0])
             except (IndexError, ValueError):
-                continue
+                continue  # no wavelength - not a data row
+            try:
+                y = float(parts[1])
+            except (IndexError, ValueError):
+                y = np.nan  # blank/bad flux cell -> bad pixel, plots as a gap
+            wav.append(x)
+            spec.append(y)
     return np.array(wav), np.array(spec), True
 
 
@@ -266,7 +271,8 @@ def main():
         prog="pyredshift",
         usage="pyredshift [-help] [-f FORMAT] [-z REDSHIFT] [--retro] "
               "[--microns] file",
-        description="Interactive redshifting of 1D spectra (port of pdlredshift).",
+        description="Interactive redshifting of 1D spectra "
+                    "(port of pdlredshift), v%s." % redshift_module.__version__,
         formatter_class=argparse.RawDescriptionHelpFormatter,
         # format documentation lives in the module (FORMAT_HELP) so the
         # -h epilog and the '?' help page cannot drift apart

{pyredshift-1.11 → pyredshift-1.13}/setup.py

@@ -13,7 +13,7 @@ from setuptools import setup
 
 setup(
     name="pyredshift",
-    version="1.11",
+    version="1.13",
     description="Interactive redshifting of 1D astronomical spectra "
                 "(Python successor of pdlredshift / redshift.f)",
     long_description=open("README.md").read(),

{pyredshift-1.11 → pyredshift-1.13}/src/pyredshift/pyredshift-help.html

@@ -1,4 +1,4 @@
-<h1>pyredshift help</h1>
+<h1>pyredshift help <span class="ver">v{version}</span></h1>
 
 <input type="radio" name="tabs" id="tab-keys" checked>
 <input type="radio" name="tabs" id="tab-lines">

{pyredshift-1.11 → pyredshift-1.13}/src/pyredshift/redshift.py

@@ -52,6 +52,10 @@ V1.10 - The cursor works over the whole window, as PGPLOT's did: keys and
 V1.11 - Proper file-format documentation: a per-format table in the
        script's -h and a File formats section in the help page, both
        generated from FORMAT_HELP here so they cannot drift apart.
+V1.12 - The version number is shown by -h/-help and on the help page.
+V1.13 - CSV reader: blank flux cells are bad pixels (NaN, plotted as
+       gaps) instead of desynchronising the wavelength and flux arrays;
+       rows with no wavelength are skipped.
 """
 
 import ctypes
@@ -91,7 +95,7 @@ try:
 except AttributeError:
     pass
 
-__version__ = "1.11"
+__version__ = "1.13"
 
 C_LIGHT = 2.99792458e8  # m/s
 
@@ -267,7 +271,7 @@ def help_html():
     if HELP_RAW is None:
         return None
     return HELP_RAW.format(template=TEMPLATE_NAME, linelist=linelist_html(),
-                           formats=formats_html())
+                           formats=formats_html(), version=__version__)
 
 
 # ---------------------------------------------------------------------------
@@ -974,6 +978,7 @@ body { font-family: -apple-system, "Helvetica Neue", sans-serif;
        max-width: 46em; margin: 2em auto; padding: 0 1em;
        color: %(fg)s; background: %(bg)s; line-height: 1.45; }
 h1 { font-size: 1.5em; border-bottom: 2px solid %(rule)s; padding-bottom: 0.2em; }
+h1 .ver { font-size: 0.6em; font-weight: normal; color: %(accent)s; }
 h2 { font-size: 1.15em; color: %(accent)s; margin-top: 1.4em; }
 table { border-collapse: collapse; margin: 0.5em 0; }
 th, td { border: 1px solid %(rule)s; padding: 0.25em 0.7em; text-align: left; }

{pyredshift-1.11 → pyredshift-1.13}/src/pyredshift.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyredshift
-Version: 1.11
+Version: 1.13
 Summary: Interactive redshifting of 1D astronomical spectra (Python successor of pdlredshift / redshift.f)
 Home-page: https://github.com/karlglazebrook/pyredshift
 Author: Karl Glazebrook