diff --git a/python/sdssdb/peewee/sdss5db/vizdb.py b/python/sdssdb/peewee/sdss5db/vizdb.py index 89987e33..9069352c 100644 --- a/python/sdssdb/peewee/sdss5db/vizdb.py +++ b/python/sdssdb/peewee/sdss5db/vizdb.py @@ -61,10 +61,11 @@ class SDSSidToPipes(VizBase): in_boss = BooleanField(null=False) in_apogee = BooleanField(null=False) in_astra = BooleanField(null=False) + has_been_observed = BooleanField(null=False) class Meta: table_name = 'sdssid_to_pipes' - print_fields = ['sdss_id', 'in_boss', 'in_apogee', 'in_astra'] + print_fields = ['sdss_id', 'in_boss', 'in_apogee', 'in_astra', 'has_been_observed'] class DbMetadata(VizBase): diff --git a/python/sdssdb/sqlalchemy/sdss5db/vizdb.py b/python/sdssdb/sqlalchemy/sdss5db/vizdb.py index ed6461bf..195c43d5 100644 --- a/python/sdssdb/sqlalchemy/sdss5db/vizdb.py +++ b/python/sdssdb/sqlalchemy/sdss5db/vizdb.py @@ -69,13 +69,14 @@ class SDSSidStacked(Base): class SDSSidToPipes(Base): __tablename__ = 'sdssid_to_pipes' - print_fields = ['sdss_id', 'in_boss', 'in_apogee', 'in_astra'] + print_fields = ['sdss_id', 'in_boss', 'in_apogee', 'in_astra', 'has_been_observed'] pk = Column('pk', BigInteger, primary_key=True) sdss_id = Column('sdss_id', BigInteger) in_boss = Column('in_boss', Boolean) in_apogee = Column('in_apogee', Boolean) in_astra = Column('in_astra', Boolean) + has_been_observed = Column('has_been_observed', Boolean) class Releases(Base): diff --git a/schema/sdss5db/metadata/vizdb.json b/schema/sdss5db/metadata/vizdb.json index cdd1b7bc..c595e546 100644 --- a/schema/sdss5db/metadata/vizdb.json +++ b/schema/sdss5db/metadata/vizdb.json @@ -253,6 +253,15 @@ "description": "Flag indicating if the sdss_id is in the astra reduction tables", "unit": "None" }, + { + "schema": "vizdb", + "table_name": "sdssid_to_pipes", + "column_name": "has_been_observed", + "display_name": "Has Been Observed", + "sql_type": "boolean", + "description": "Flag indicating if the sdss_id target has been observed or not", + "unit": "None" + }, { "schema": "vizdb", "table_name": "releases", diff --git a/schema/sdss5db/vizdb/vizdb.sql b/schema/sdss5db/vizdb/vizdb.sql index 99ad4325..4dc15807 100644 --- a/schema/sdss5db/vizdb/vizdb.sql +++ b/schema/sdss5db/vizdb/vizdb.sql @@ -39,7 +39,8 @@ CREATE MATERIALIZED VIEW vizdb.sdssid_to_pipes AS SELECT row_number() over(order by s.sdss_id) as pk, s.sdss_id, (b.sdss_id IS NOT NULL) AS in_boss, (v.star_pk IS NOT NULL) AS in_apogee, - (a.sdss_id IS NOT NULL) AS in_astra + (a.sdss_id IS NOT NULL) AS in_astra, + (b.sdss_id IS NOT NULL OR v.star_pk IS NOT NULL OR a.sdss_id IS NOT NULL) AS has_been_observed -- b.id as boss_spectrum_pk, -- v.star_pk as apogee_star_pk, -- v.visit_pk as apogee_visit_pk,