join apo.Star via catalogid for now

sdss · Feb 5, 2024 · ae5505d · ae5505d
1 parent f7a72ee
commit ae5505d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/python/valis/db/queries.py b/python/valis/db/queries.py
@@ -296,14 +296,14 @@ def get_targets_obs(release: str, obs: str, obsWave: str) -> peewee.ModelSelect:
     # get the relevant software tag apogee
     apred = get_software_tag(release, 'apred_vers')
 
-    # temporary, need to join with sdss_id
-    query_ap = apo.Star.select()\
-                       .where(apo.Star.telescope == obs.lower() + '25m',
-                              apo.Star.apred_vers == apred)
-    # temportary, just return some sdss_id
-    sdss_id_ap = [3350466]
+    # temporary, need to join with sdss_id when added
     query_ap = vizdb.SDSSidStacked.select()\
-                                  .where(vizdb.SDSSidStacked.sdss_id << sdss_id_ap)
+                                  .join(vizdb.SDSSidFlat,
+                                        on=(vizdb.SDSSidFlat.sdss_id == vizdb.SDSSidStacked.sdss_id))\
+                                  .join(apo.Star,
+                                        on=(apo.Star.catalogid == vizdb.SDSSidFlat.catalogid))\
+                                  .where(apo.Star.telescope == obs.lower() + '25m',
+                                         apo.Star.apred_vers == apred).distinct()
 
     # return union of the above
     query_all = vizdb.SDSSidStacked.select()\