From 44cb8621e24417be40c5b567a90edcea18d54bf8 Mon Sep 17 00:00:00 2001 From: fred3m Date: Tue, 2 Jul 2024 14:46:03 -0700 Subject: [PATCH] bug fixes --- python/lsst/rubintv/analysis/service/database.py | 8 -------- ups/rubintv_analysis_service.table | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/python/lsst/rubintv/analysis/service/database.py b/python/lsst/rubintv/analysis/service/database.py index b7ffa1d..a60b97b 100644 --- a/python/lsst/rubintv/analysis/service/database.py +++ b/python/lsst/rubintv/analysis/service/database.py @@ -287,14 +287,6 @@ def get_join(self, table1: str, table2: str) -> sqlalchemy.ColumnElement: raise ValueError(f"Could not find a join between {table1} and {table2}") - def get_primary_match_id(self, column_name: str) -> str: - """Return the column used to match a table with data IDs in the table - """ - table_name, _ = column_name.split(".") - if table_name.startswith("exposure"): - return f"{table_name}.exposure_id" - return f"{table_name}.visit_id" - def build_join(self, table_names: set[str]) -> sqlalchemy.Table | sqlalchemy.Join: tables = list(table_names) last_table = tables[0] diff --git a/ups/rubintv_analysis_service.table b/ups/rubintv_analysis_service.table index 9b4e07b..10589fd 100644 --- a/ups/rubintv_analysis_service.table +++ b/ups/rubintv_analysis_service.table @@ -4,6 +4,7 @@ # the "base" package. setupRequired(lsst_distrib) setupRequired(obs_lsst) +setupRequired(afw) # The following is boilerplate for all packages. # See https://dmtn-001.lsst.io for details on LSST_LIBRARY_PATH.