Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions python/lsst/analysis/tools/actions/vector/calcRhoStatistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,16 @@

from __future__ import annotations

__all__ = (
"CalcRhoStatistics",
"TreecorrConfig",
)
__all__ = ("CalcRhoStatistics",)

import logging
from collections.abc import Mapping
from typing import TYPE_CHECKING, Any, cast

import numpy as np
import treecorr # type: ignore[import]
from deprecated.sphinx import deprecated

from lsst.meas.algorithms.treecorrUtils import TreecorrConfig as TreecorrConfigNew
from lsst.meas.algorithms.treecorrUtils import TreecorrConfig
from lsst.pex.config import ChoiceField, ConfigField, Field

from ...interfaces import KeyedData, KeyedDataAction, Vector
Expand All @@ -50,19 +46,6 @@
_LOG = logging.getLogger(__name__)


# TO DO: Remove TreecorrConfig in here for next major release (DM-47072)
@deprecated(
reason=(
"TreecorrConfig is no longer a part of analysis_tools (DM-45899). "
"Please use lsst.meas.algorithms.treecorrUtils.TreecorrConfig instead."
),
version="v28.0",
category=FutureWarning,
)
class TreecorrConfig(TreecorrConfigNew):
pass


class CalcRhoStatistics(KeyedDataAction):
r"""Calculate rho statistics.

Expand Down Expand Up @@ -177,13 +160,13 @@ class CalcRhoStatistics(KeyedDataAction):
},
)

treecorr = ConfigField[TreecorrConfigNew](
treecorr = ConfigField[TreecorrConfig](
doc="TreeCorr configuration",
)

def setDefaults(self):
super().setDefaults()
self.treecorr = TreecorrConfigNew()
self.treecorr = TreecorrConfig()
self.treecorr.sep_units = "arcmin"
self.treecorr.max_sep = 100.0

Expand Down
Loading