PyNOT-redux 2.2__tar.gz → 2.2.1__tar.gz

{pynot_redux-2.2 → pynot_redux-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyNOT-redux
-Version: 2.2
+Version: 2.2.1
 Summary: Data Reduction Pipeline for NOT/ALFOSC
 Home-page: https://github.com/jkrogager/PyNOT
 Author: Jens-Kristian Krogager

{pynot_redux-2.2 → pynot_redux-2.2.1}/PyNOT_redux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyNOT-redux
-Version: 2.2
+Version: 2.2.1
 Summary: Data Reduction Pipeline for NOT/ALFOSC
 Home-page: https://github.com/jkrogager/PyNOT
 Author: Jens-Kristian Krogager

pynot_redux-2.2.1/pynot/VERSION

@@ -0,0 +1 @@
+2.2.1

{pynot_redux-2.2 → pynot_redux-2.2.1}/pynot/viewer/notes.py

@@ -16,8 +16,10 @@ class DataFlag(IntFlag):
     BAD_SKYSUB        = 2**2    # Problem with sky subtraction
     WRONG_Z           = 2**3    # Incorrect redshift
     Z_VI_CONFIRM      = 2**4    # Assigned if the redshift has been updated
-    WRONG_CLASS       = 2**5    # Incorrect classification
-    CLASS_VI_CONFIRM  = 2**6    # Assigned if the classification has been updated
+    BROAD_LINE        = 2**5    # Spectrum has broad lines
+    NARROW_LINE       = 2**6    # Spectrum has narrow lines
+    PASSIVE_GALAXY    = 2**7    # Spectrum is a passive galaxy without emission lines
+    NO_SIGNAL         = 2**8    # No identifiable features in the spectrum
 
 
     def get_flags(self):
@@ -57,7 +59,7 @@ class TargetNote:
 
 
 REDSHIFT_NAMES = ['REDSHIFT', 'Z_SPEC', 'ZBEST', 'Z_PIPE', 'ZSPEC', 'Z', 'ZFIT', 'Z_VI']
-ID_NAMES = ['OBJ_NME', 'OBJ_UID', 'SPECUID', 'NAME', 'OBJECT', 'TARGET', 'TARGETID', 'ID', 'UID']
+ID_NAMES = ['OBJ_NME', 'OBJ_UID', 'SPECUID', 'NAME', 'OBJECT', 'TARGET', 'TARGETID', 'ID', 'UID', 'FILENAME']
 CLASS_NAMES = ['TYPE', 'ZBESTTYPE', 'SPECTYPE', 'CLASS', 'CLASSIFICATION', 'OBJ_CLS']
 
 
@@ -156,15 +158,20 @@ def redshift_table_lookup(redshift_table, spectrum):
     the function returns (np.nan, "").
     """
     name_column = redshift_table.meta['NAME_COLUMN']
-    if not spectrum.meta:
-        logging.error("Could not find a redshift. Spectrum has no metadata")
-        return np.nan, ""
 
-    try:
-        name = spectrum.meta[name_column]
-    except KeyError:
-        logging.error(f"Could not find a redshift. Spectrum has no {name_column} meta data")
-        return np.nan, ""
+    if name_column.upper() == 'FILENAME':
+        name = spectrum.filename
+
+    else:
+        if not spectrum.meta:
+            logging.error("Could not find a redshift. Spectrum has no metadata")
+            return np.nan, ""
+
+        try:
+            name = spectrum.meta[name_column]
+        except KeyError:
+            logging.error(f"Could not find a redshift. Spectrum has no {name_column} meta data")
+            return np.nan, ""
 
     try:
         row = redshift_table.loc[name]

pynot_redux-2.2/pynot/VERSION

@@ -1 +0,0 @@
-2.2