astro-otter 0.2.0__tar.gz → 0.3.0__tar.gz

{astro_otter-0.2.0/src/astro_otter.egg-info → astro_otter-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astro-otter
-Version: 0.2.0
+Version: 0.3.0
 Author-email: Noah Franz <nfranz@arizona.edu>
 License: MIT License
         
@@ -36,7 +36,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 2 - Pre-Alpha
-Requires-Python: <3.12,>=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<2,>=1.20

{astro_otter-0.2.0 → astro_otter-0.3.0}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 license = {file = "LICENSE"}
 dynamic = ["version"]
 
-requires-python = ">=3.10,<3.12"
+requires-python = ">=3.9" #,<3.12"
 
 classifiers = [
   "License :: OSI Approved :: BSD License",

{astro_otter-0.2.0 → astro_otter-0.3.0/src/astro_otter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astro-otter
-Version: 0.2.0
+Version: 0.3.0
 Author-email: Noah Franz <nfranz@arizona.edu>
 License: MIT License
         
@@ -36,7 +36,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 2 - Pre-Alpha
-Requires-Python: <3.12,>=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy<2,>=1.20

{astro_otter-0.2.0 → astro_otter-0.3.0}/src/otter/_version.py

@@ -2,4 +2,4 @@
 Just define the package version in one place
 """
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"

{astro_otter-0.2.0 → astro_otter-0.3.0}/src/otter/io/otter.py

@@ -280,7 +280,7 @@ class Otter(Database):
 
         WARNING! This does not do any conversions for you!
         This is how it differs from the `get_meta` method. Users should prefer to use
-        `get_meta`, `getPhot`, and `getSpec` independently because it is a better
+        `get_meta`, and `get_phot` independently because it is a better
         workflow and can return the data in an astropy table with everything in the
         same units.
 
@@ -816,8 +816,32 @@ class Otter(Database):
         # read in the metadata and photometry file
         meta = pd.read_csv(metafile)
         phot = None
+
+        required_phot_cols = [
+            "name",
+            "date",
+            "date_format",
+            "filter",
+            "filter_eff",
+            "filter_eff_units",
+            "flux",
+            "flux_err",
+            "flux_unit",
+        ]
+
         if photfile is not None:
-            phot = pd.read_csv(photfile)
+            phot_unclean = pd.read_csv(photfile)
+
+            phot = phot_unclean.dropna(subset=required_phot_cols)
+            if len(phot) != len(phot_unclean):
+                warn("""
+                Filtered out rows with nan in the photometry file! Make sure you
+                expect this behaviour!
+                """)
+
+            if "bibcode" not in phot:
+                phot["bibcode"] = "private"
+                warn("Setting the bibcode column to the special keyword 'private'!")
 
             # we need to generate columns of wave_eff and freq_eff
             wave_eff = []

{astro_otter-0.2.0 → astro_otter-0.3.0}/src/otter/io/transient.py

@@ -662,6 +662,12 @@ class Transient(MutableMapping):
             try:
                 if isvegamag:
                     astropy_units = VEGAMAG
+                elif unit == "AB":
+                    # In astropy "AB" is a magnitude SYSTEM not unit and while
+                    # u.Unit("AB") will succeed without error, it will not produce
+                    # the expected result!
+                    # We can assume here that this unit really means astropy's "mag(AB)"
+                    astropy_units = u.Unit("mag(AB)")
                 else:
                     astropy_units = u.Unit(unit)
 
@@ -806,20 +812,19 @@ class Transient(MutableMapping):
             # magnitude upperlimits are independent of the actual measurement!)
             # sigma_m > (1/3) * (ln(10)/2.5)
             def is_upperlimit(row):
-                if pd.isna(row.upperlimit):
+                if "upperlimit" in row and pd.isna(row.upperlimit):
                     return row.converted_flux_err > np.log(10) / (3 * 2.5)
                 else:
                     return row.upperlimit
         else:
 
             def is_upperlimit(row):
-                if pd.isna(row.upperlimit):
+                if "upperlimit" in row and pd.isna(row.upperlimit):
                     return row.converted_flux < 3 * row.converted_flux_err
                 else:
                     return row.upperlimit
 
         outdata["upperlimit"] = outdata.apply(is_upperlimit, axis=1)
-
         return outdata
 
     def _merge_names(t1, t2, out):  # noqa: N805