add spectroscopy catalog

.schemalintrc.js

@@ -22,6 +22,7 @@ module.exports = {
     { name: "private" },
     { name: "public" },
     { name: "rawdata" },
+    { name: "spectroscopy" },
   ],
   rules: {
     "name-casing": ["error", "snake"],

app/adminapi/domain/catalogs.py

@@ -13,6 +13,14 @@
     model.RawCatalog.PHOTOMETRY__TOTAL: ("Photometry (total)", "Total magnitudes per band and method."),
     model.RawCatalog.PHOTOMETRY__ISOPHOTAL: ("Photometry (isophotal)", "Isophotal magnitudes per band and level."),
     model.RawCatalog.GEOMETRY: ("Geometry", "Isophotal ellipse geometry."),
+    model.RawCatalog.SPECTROSCOPY__INTEGRATED_FLUX_DENSITY: (
+        "Spectroscopy (integrated flux density)",
+        "Integrated spectral line flux densities.",
+    ),
+    model.RawCatalog.SPECTROSCOPY__ENERGY_FLUX: (
+        "Spectroscopy (energy flux)",
+        "Spectral line energy fluxes.",
+    ),
     model.RawCatalog.NOTE: ("Note", "Free-text notes attached to records."),
 }
 

app/data/model/__init__.py

@@ -22,6 +22,10 @@
     RedshiftRecord,
 )
 from app.data.model.redshift import RedshiftCatalogObject
+from app.data.model.spectroscopy import (
+    SpectroscopyEnergyFluxCatalogObject,
+    SpectroscopyIntegratedFluxDensityCatalogObject,
+)
 from app.data.model.table import (
     CatalogProgress,
     ColumnDescription,
@@ -61,6 +65,8 @@
     "PhotometryTotalCatalogObject",
     "PhotometryIsophotalCatalogObject",
     "GeometryCatalogObject",
+    "SpectroscopyIntegratedFluxDensityCatalogObject",
+    "SpectroscopyEnergyFluxCatalogObject",
     "NoteCatalogObject",
     "get_catalog_object_type",
     "Bibliography",

app/data/model/helpers.py

@@ -1,4 +1,4 @@
-from app.data.model import designation, geometry, icrs, interface, nature, note, photometry, redshift
+from app.data.model import designation, geometry, icrs, interface, nature, note, photometry, redshift, spectroscopy
 
 _CATALOG_OBJECT_TYPES: dict[interface.RawCatalog, type[interface.CatalogObject]] = {
     interface.RawCatalog.DESIGNATION: designation.DesignationCatalogObject,
@@ -8,6 +8,10 @@
     interface.RawCatalog.PHOTOMETRY__TOTAL: photometry.PhotometryTotalCatalogObject,
     interface.RawCatalog.PHOTOMETRY__ISOPHOTAL: photometry.PhotometryIsophotalCatalogObject,
     interface.RawCatalog.GEOMETRY: geometry.GeometryCatalogObject,
+    interface.RawCatalog.SPECTROSCOPY__INTEGRATED_FLUX_DENSITY: (
+        spectroscopy.SpectroscopyIntegratedFluxDensityCatalogObject
+    ),
+    interface.RawCatalog.SPECTROSCOPY__ENERGY_FLUX: spectroscopy.SpectroscopyEnergyFluxCatalogObject,
     interface.RawCatalog.NOTE: note.NoteCatalogObject,
 }
 

app/data/model/interface.py

@@ -18,6 +18,8 @@ class RawCatalog(enum.Enum):
     PHOTOMETRY__TOTAL = "photometry_total"
     PHOTOMETRY__ISOPHOTAL = "photometry_isophotal"
     GEOMETRY = "geometry"
+    SPECTROSCOPY__INTEGRATED_FLUX_DENSITY = "spectroscopy_integrated_flux_density"
+    SPECTROSCOPY__ENERGY_FLUX = "spectroscopy_energy_flux"
     NOTE = "note"
 
 

app/data/model/spectroscopy.py

@@ -0,0 +1,59 @@
+from typing import Any, final
+
+from app.data.model import interface
+
+
+@final
+class SpectroscopyIntegratedFluxDensityCatalogObject(interface.CatalogObject):
+    def __init__(
+        self,
+        line_id: str,
+        flux: float,
+        e_flux: float | None = None,
+        method: str = "sum",
+        quality: str = "regular",
+        **kwargs: Any,
+    ) -> None:
+        self.line_id = line_id
+        self.flux = flux
+        self.e_flux = e_flux
+        self.method = method
+        self.quality = quality
+
+    def catalog(self) -> interface.RawCatalog:
+        return interface.RawCatalog.SPECTROSCOPY__INTEGRATED_FLUX_DENSITY
+
+    @classmethod
+    def layer1_table(cls) -> str:
+        return "spectroscopy.integrated_flux_density"
+
+    @classmethod
+    def layer1_primary_keys(cls) -> list[str]:
+        return ["record_id", "line_id", "method"]
+
+
+@final
+class SpectroscopyEnergyFluxCatalogObject(interface.CatalogObject):
+    def __init__(
+        self,
+        line_id: str,
+        flux: float,
+        e_flux: float | None = None,
+        quality: str = "regular",
+        **kwargs: Any,
+    ) -> None:
+        self.line_id = line_id
+        self.flux = flux
+        self.e_flux = e_flux
+        self.quality = quality
+
+    def catalog(self) -> interface.RawCatalog:
+        return interface.RawCatalog.SPECTROSCOPY__ENERGY_FLUX
+
+    @classmethod
+    def layer1_table(cls) -> str:
+        return "spectroscopy.energy_flux"
+
+    @classmethod
+    def layer1_primary_keys(cls) -> list[str]:
+        return ["record_id", "line_id"]

postgres/drafts/17_modify_common_types.sql

@@ -1,26 +1,5 @@
 BEGIN;
 
-ALTER TYPE common.quality RENAME VALUE 'ok' TO 'regular' ;
-ALTER TYPE common.quality RENAME VALUE 'lowsnr' TO 'low_snr' ;
-ALTER TYPE common.quality RENAME VALUE 'sus' TO 'suspected' ;
-ALTER TYPE common.quality RENAME VALUE '>' TO 'lower_limit' ;
-ALTER TYPE common.quality RENAME VALUE '<' TO 'upper_limit' ;
-
-ALTER TYPE common.quality RENAME TO qualityType ;
-
-COMMENT ON TYPE common.QualityType	IS '{
-"description": "Quality flag of the measurement", 
-"values": {
-  "regular": "regular measurement", 
-  "low_snr": "low signal-to-noise", 
-  "suspected": "suspected measurement", 
-  "lower_limit": "lower limit", 
-  "upper_limit": "upper limit", 
-  "wrong": "wrong measurement"
-  }
-}' ;
-
-
 CREATE TYPE common.VelocityConventionType AS ENUM ( 'optical', 'radio', 'relativistic' ) ;
 
 COMMENT ON TYPE common.VelocityConventionType IS '{