change import path for places that imported the baseevaluator

LSSTDESC · Apr 5, 2024 · c48d3a1 · c48d3a1
1 parent 28bbda8
commit c48d3a1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/rail/evaluation/dist_to_dist_evaluator.py b/src/rail/evaluation/dist_to_dist_evaluator.py
@@ -3,14 +3,14 @@
 from qp.metrics.concrete_metric_classes import DistToDistMetric
 
 from rail.core.data import QPHandle
-from rail.evaluation.evaluator import BaseEvaluator
+from rail.evaluation.evaluator import Evaluator
 
 
-class DistToDistEvaluator(BaseEvaluator):
+class DistToDistEvaluator(Evaluator):
     """Evaluate the performance of a photo-z estimator against reference PDFs"""
 
     name = "DistToDistEvaluator"
-    config_options = BaseEvaluator.config_options.copy()
+    config_options = Evaluator.config_options.copy()
     config_options.update(
         limits=Param(
             tuple,

diff --git a/src/rail/evaluation/dist_to_point_evaluator.py b/src/rail/evaluation/dist_to_point_evaluator.py
@@ -3,14 +3,14 @@
 from qp.metrics.concrete_metric_classes import DistToPointMetric
 
 from rail.core.data import QPHandle, TableHandle
-from rail.evaluation.evaluator import BaseEvaluator
+from rail.evaluation.evaluator import Evaluator
 
 
-class DistToPointEvaluator(BaseEvaluator):
+class DistToPointEvaluator(Evaluator):
     """Evaluate the performance of a photo-z estimator against reference point estimate"""
 
     name = "DistToPointEvaluator"
-    config_options = BaseEvaluator.config_options.copy()
+    config_options = Evaluator.config_options.copy()
     config_options.update(
         limits=Param(
             tuple,

diff --git a/src/rail/evaluation/point_to_point_evaluator.py b/src/rail/evaluation/point_to_point_evaluator.py
@@ -3,14 +3,14 @@
 from qp.metrics.point_estimate_metric_classes import PointToPointMetric
 
 from rail.core.data import TableHandle, QPHandle
-from rail.evaluation.evaluator import BaseEvaluator
+from rail.evaluation.evaluator import Evaluator
 
 
-class PointToPointEvaluator(BaseEvaluator):
+class PointToPointEvaluator(Evaluator):
     """Evaluate the performance of a photo-z estimator against reference point estimate"""
 
     name = "PointToPointEvaluator"
-    config_options = BaseEvaluator.config_options.copy()
+    config_options = Evaluator.config_options.copy()
     config_options.update(
         hdf5_groupname=Param(
             str, "photometry", required=False, msg="HDF5 Groupname for truth table."

diff --git a/src/rail/evaluation/single_evaluator.py b/src/rail/evaluation/single_evaluator.py
@@ -11,14 +11,14 @@
 from qp.metrics.base_metric_classes import BaseMetric
 
 from rail.core.data import QPOrTableHandle
-from rail.evaluation.evaluator import BaseEvaluator
+from rail.evaluation.evaluator import Evaluator
 
 
-class SingleEvaluator(BaseEvaluator):
+class SingleEvaluator(Evaluator):
     """Evaluate the performance of a photo-Z estimator"""
 
     name = "SingleEvaluator"
-    config_options = BaseEvaluator.config_options.copy()
+    config_options = Evaluator.config_options.copy()
     config_options.update(
         point_estimates=Param(list, msg="List of point estimates to use", default=[]),
         truth_point_estimates=Param(
@@ -34,7 +34,7 @@ class SingleEvaluator(BaseEvaluator):
 
     def __init__(self, args, comm=None):
         """Initialize Evaluator"""
-        BaseEvaluator.__init__(self, args, comm=comm)
+        Evaluator.__init__(self, args, comm=comm)
         self._input_data_type = QPOrTableHandle.PdfOrValue.unknown
         self._truth_data_type = QPOrTableHandle.PdfOrValue.unknown
         self._out_table = {}
@@ -57,7 +57,7 @@ def run(self):  # pylint: disable=too-many-branches
         self._input_data_type = input_data_handle.check_pdf_or_point()
         self._truth_data_type = truth_data_handle.check_pdf_or_point()
 
-        BaseEvaluator.run(self)
+        Evaluator.run(self)
 
     def _process_chunk(self, data_tuple, first):
         start = data_tuple[0]
@@ -457,4 +457,4 @@ def _setup_iterator(self, itrs=None):
                 self.input_iterator(tag, groupname=self.config.hdf5_groupname)
                 for tag in tags
             ]
-        return BaseEvaluator._setup_iterator(self, itrs)
+        return Evaluator._setup_iterator(self, itrs)
diff --git a/src/rail/stages/__init__.py b/src/rail/stages/__init__.py
@@ -25,7 +25,7 @@
 # from rail.creation.engines.dsps_photometry_creator import *
 # from rail.creation.engines.dsps_sed_modeler import *
 
-from rail.evaluation.evaluator import Evaluator
+# from rail.evaluation.evaluator import Evaluator
 
 
 def import_and_attach_all():