diaSourceId observations test

lsst-uk · Aug 6, 2024 · aab88fe · aab88fe
1 parent a170c60
commit aab88fe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/adler/adler.py b/src/adler/adler.py
@@ -142,10 +142,8 @@ def runAdler(cli_args):
             outlier_flag = sci_utils.outlier_diff(res.value, diff_cut=diff_cut)
             df_obs.loc[~mask, "outlier"] = outlier_flag
 
-            print(df_obs.columns)
-
             # save the df_obs subset with outlier classification
-            df_save = df_obs[["midPointMjdTai", "outlier"]]
+            df_save = df_obs[["diaSourceId", "midPointMjdTai", "outlier"]]
             print("save classifications: {}".format(save_file))
             logger.info("save classifications: {}".format(save_file))
             df_save.to_csv(save_file)

diff --git a/src/adler/dataclasses/AdlerPlanetoid.py b/src/adler/dataclasses/AdlerPlanetoid.py
@@ -239,7 +239,7 @@ def populate_observations(
         for filter_name in filter_list:
             observations_sql_query = f"""
                 SELECT
-                    ssObject.ssObjectId, mag, magErr, band, midPointMjdTai, ra, dec, phaseAngle,
+                    ssObject.ssObjectId, ssSource.diaSourceId, mag, magErr, band, midPointMjdTai, ra, dec, phaseAngle,
                     topocentricDist, heliocentricDist, heliocentricX, heliocentricY, heliocentricZ,
                     topocentricX, topocentricY, topocentricZ,
                     eclipticLambda, eclipticBeta

diff --git a/src/adler/dataclasses/Observations.py b/src/adler/dataclasses/Observations.py
@@ -4,6 +4,7 @@
 from adler.dataclasses.dataclass_utilities import get_from_table, get_from_dictionary
 
 OBSERVATIONS_KEYS = {
+    "diaSourceId": np.ndarray,
     "mag": np.ndarray,
     "magErr": np.ndarray,
     "midPointMjdTai": np.ndarray,
@@ -37,6 +38,9 @@ class Observations:
     filter_name : str
         Filter of the observations.
 
+    diaSourceId: array_like of ints
+        Unique identifier of the observation
+
     mag: array_like of floats
         Magnitude. This is a placeholder and will be replaced by flux.
 
@@ -95,6 +99,7 @@ class Observations:
 
     ssObjectId: str = ""
     filter_name: str = ""
+    diaSourceId: np.ndarray = field(default_factory=lambda: np.zeros(0))
     mag: np.ndarray = field(default_factory=lambda: np.zeros(0))
     magErr: np.ndarray = field(default_factory=lambda: np.zeros(0))
     midPointMjdTai: np.ndarray = field(default_factory=lambda: np.zeros(0))

diff --git a/tests/adler/dataclasses/test_Observations.py b/tests/adler/dataclasses/test_Observations.py
@@ -14,7 +14,7 @@ def test_construct_observations_from_data_table():
 
     test_query = f"""
                     SELECT
-                        ssObject.ssObjectId, mag, magErr, band, midPointMjdTai, ra, dec, phaseAngle,
+                        ssObject.ssObjectId, ssSource.diaSourceId, mag, magErr, band, midPointMjdTai, ra, dec, phaseAngle,
                         topocentricDist, heliocentricDist, heliocentricX, heliocentricY, heliocentricZ,
                         topocentricX, topocentricY, topocentricZ,
                         eclipticLambda, eclipticBeta

diff --git a/tests/data/testing_database.db copy b/tests/data/testing_database.db copy