Remove make_from_counts

astronomy-commons · Jan 6, 2025 · 7a26c0f · 7a26c0f
1 parent 6622a51
commit 7a26c0f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/hats_import/catalog/map_reduce.py b/src/hats_import/catalog/map_reduce.py
@@ -123,10 +123,7 @@ def map_to_pixels(
         ):
             mapped_pixel, count_at_pixel = np.unique(mapped_pixels, return_counts=True)
 
-            partial = SparseHistogram.make_from_counts(
-                mapped_pixel, count_at_pixel, healpix_order=highest_order
-            )
-            histo.add(partial)
+            histo.add(SparseHistogram(mapped_pixel, count_at_pixel, highest_order))
 
         histo.to_sparse().to_file(
             ResumePlan.partial_histogram_file(tmp_path=resume_path, mapping_key=mapping_key)

diff --git a/tests/hats_import/catalog/test_resume_plan.py b/tests/hats_import/catalog/test_resume_plan.py
@@ -79,7 +79,7 @@ def test_read_write_histogram(tmp_path):
     remaining_keys = plan.get_remaining_map_keys()
     assert remaining_keys == [("map_0", "foo1")]
 
-    histogram = SparseHistogram.make_from_counts([11], [131], 0)
+    histogram = SparseHistogram([11], [131], 0)
     histogram.to_file(ResumePlan.partial_histogram_file(tmp_path=tmp_path, mapping_key="map_0"))
 
     remaining_keys = plan.get_remaining_map_keys()
@@ -118,7 +118,7 @@ def test_some_map_task_failures(tmp_path, dask_client):
     with pytest.raises(RuntimeError, match="map stages"):
         plan.wait_for_mapping(futures)
 
-    histogram = SparseHistogram.make_from_counts([11], [131], 0)
+    histogram = SparseHistogram([11], [131], 0)
     histogram.to_file(ResumePlan.partial_histogram_file(tmp_path=tmp_path, mapping_key="map_0"))
 
     ## Method succeeds, *and* partial histogram is present.

diff --git a/tests/hats_import/catalog/test_run_import.py b/tests/hats_import/catalog/test_run_import.py
@@ -47,8 +47,8 @@ def test_resume_dask_runner(
     ## Now set up our resume files to match previous work.
     resume_tmp = tmp_path / "tmp" / "resume_catalog"
     ResumePlan(tmp_path=resume_tmp, progress_bar=False)
-    histogram = SparseHistogram.make_from_counts([11], [131], 0)
-    empty = SparseHistogram.make_empty(0)
+    histogram = SparseHistogram([11], [131], 0)
+    empty = SparseHistogram([], [], 0)
     for file_index in range(0, 5):
         ResumePlan.touch_key_done_file(resume_tmp, ResumePlan.SPLITTING_STAGE, f"split_{file_index}")
         histogram_file = ResumePlan.partial_histogram_file(
@@ -139,7 +139,7 @@ def test_resume_dask_runner_diff_pixel_order(
     ## Now set up our resume files to match previous work.
     resume_tmp = tmp_path / "tmp" / "resume_catalog"
     ResumePlan(tmp_path=resume_tmp, progress_bar=False)
-    SparseHistogram.make_from_counts([11], [131], 0).to_dense_file(resume_tmp / "mapping_histogram.npz")
+    SparseHistogram([11], [131], 0).to_dense_file(resume_tmp / "mapping_histogram.npz")
     for file_index in range(0, 5):
         ResumePlan.touch_key_done_file(resume_tmp, ResumePlan.SPLITTING_STAGE, f"split_{file_index}")
 
@@ -203,8 +203,8 @@ def test_resume_dask_runner_histograms_diff_size(
     ResumePlan(tmp_path=resume_tmp, progress_bar=False)
 
     # We'll create mock partial histograms of size 0 and 2
-    histogram = SparseHistogram.make_empty(0)
-    wrong_histogram = SparseHistogram.make_empty(2)
+    histogram = SparseHistogram([], [], 0)
+    wrong_histogram = SparseHistogram([], [], 2)
 
     for file_index in range(0, 5):
         ResumePlan.touch_key_done_file(resume_tmp, ResumePlan.SPLITTING_STAGE, f"split_{file_index}")