From aa2c0a0b23952c65e2405224c7f3f20142a4022e Mon Sep 17 00:00:00 2001 From: Doug Branton Date: Fri, 26 Apr 2024 13:26:55 -0700 Subject: [PATCH 1/3] add from_legacy_dataframe calls --- src/tape/ensemble.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tape/ensemble.py b/src/tape/ensemble.py index 9a6ef7f..140ed52 100644 --- a/src/tape/ensemble.py +++ b/src/tape/ensemble.py @@ -6,6 +6,7 @@ import requests import lsdb import dask +from dask_expr import from_legacy_dataframe import dask.dataframe as dd import numpy as np @@ -1721,7 +1722,7 @@ def from_lsdb( sort = True self.from_dask_dataframe( - source_catalog._ddf, + from_legacy_dataframe(source_catalog._ddf), None, column_mapper=column_mapper, sync_tables=sync_tables, @@ -1744,8 +1745,8 @@ def from_lsdb( sort = True self.from_dask_dataframe( - source_catalog._ddf, - object_catalog._ddf, + from_legacy_dataframe(source_catalog._ddf), + from_legacy_dataframe(object_catalog._ddf), column_mapper=column_mapper, sync_tables=sync_tables, sorted=sorted, From 580bdd94258d486e9223390bce53e79d59663b0c Mon Sep 17 00:00:00 2001 From: Doug Branton Date: Fri, 26 Apr 2024 13:35:02 -0700 Subject: [PATCH 2/3] run black --- src/tape/ensemble.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tape/ensemble.py b/src/tape/ensemble.py index 140ed52..64bd261 100644 --- a/src/tape/ensemble.py +++ b/src/tape/ensemble.py @@ -1746,7 +1746,7 @@ def from_lsdb( self.from_dask_dataframe( from_legacy_dataframe(source_catalog._ddf), - from_legacy_dataframe(object_catalog._ddf), + from_legacy_dataframe(object_catalog._ddf), column_mapper=column_mapper, sync_tables=sync_tables, sorted=sorted, From 3e05011a91f0eeed2ded68cab3c754b4a581a890 Mon Sep 17 00:00:00 2001 From: Doug Branton Date: Fri, 26 Apr 2024 13:37:59 -0700 Subject: [PATCH 3/3] better cone search --- docs/tutorials/working_with_hipscat_and_lsdb.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/working_with_hipscat_and_lsdb.ipynb b/docs/tutorials/working_with_hipscat_and_lsdb.ipynb index 5cf67c0..7ab3083 100644 --- a/docs/tutorials/working_with_hipscat_and_lsdb.ipynb +++ b/docs/tutorials/working_with_hipscat_and_lsdb.ipynb @@ -175,7 +175,7 @@ "object_cat_cone = object_cat.cone_search(\n", " ra=315.0,\n", " dec=-69.5,\n", - " radius_arcsec=10.0,\n", + " radius_arcsec=100000.0,\n", ")\n", "\n", "print(f\"Original Number of Objects: {len(object_cat._ddf)}\")\n",