Fixups

lsst · Apr 26, 2023 · 30a4d18 · 30a4d18
1 parent 507170a
commit 30a4d18
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/python/lsst/analysis/tools/atools/__init__.py b/python/lsst/analysis/tools/atools/__init__.py
@@ -15,5 +15,6 @@
 from .simpleDiaPlot import *
 from .skyFluxStatisticMetrics import *
 from .skyObject import *
+from .skySource import *
 from .sources import *
 from .stellarLocus import *
diff --git a/python/lsst/analysis/tools/interfaces/_analysisTools.py b/python/lsst/analysis/tools/interfaces/_analysisTools.py
@@ -293,7 +293,9 @@ def _baseFinalize(self) -> None:
         self.populatePrepFromProcess()
 
     def freeze(self):
-        self.finalize()
+        if not self.__dict__.get("_finalizeRun"):
+            self.finalize()
+            self.__dict__["_finalizeRun"] = True
         super().freeze()
 
 

diff --git a/python/lsst/analysis/tools/interfaces/_task.py b/python/lsst/analysis/tools/interfaces/_task.py
@@ -204,15 +204,16 @@ class AnalysisBaseConfig(PipelineTaskConfig, pipelineConnections=AnalysisBaseCon
     def freeze(self):
         # Copy the meta configuration values to each of the configured tools
         # only do this if the tool has not been further specialized
-        for tool in self.atools:
-            for tag in self.metric_tags:
-                tool.metric_tags.insert(-1, tag)
-            if tool.dataset_identifier is None:
-                tool.dataset_identifier = self.dataset_identifier
-            if tool.reference_package == "lsst_distrib":
-                tool.reference_package = self.reference_package
-            if tool.timestamp_version == "run_timestamp":
-                tool.timestamp_version = self.timestamp_version
+        if not self._frozen:
+            for tool in self.atools:
+                for tag in self.metric_tags:
+                    tool.metric_tags.insert(-1, tag)
+                if tool.dataset_identifier is None:
+                    tool.dataset_identifier = self.dataset_identifier
+                if tool.reference_package == "lsst_distrib":
+                    tool.reference_package = self.reference_package
+                if tool.timestamp_version == "run_timestamp":
+                    tool.timestamp_version = self.timestamp_version
         super().freeze()
 
     def validate(self):