Cast scalar returns to Scalar

lsst · Aug 3, 2022 · 23be579 · 23be579
1 parent e31afb0
commit 23be579
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/python/lsst/analysis/tools/actions/scalar/scalarActions.py b/python/lsst/analysis/tools/actions/scalar/scalarActions.py
@@ -17,7 +17,7 @@ def getInputSchema(self) -> KeyedDataSchema:
 
     def __call__(self, data: KeyedData, **kwargs) -> Scalar:
         mask = self.getMask(**kwargs)
-        return float(np.nanmedian(cast(Vector, data[self.vectorKey.format(**kwargs)])[mask]))
+        return cast(Scalar, float(np.nanmedian(cast(Vector, data[self.vectorKey.format(**kwargs)])[mask])))
 
 
 class MeanAction(ScalarAction):
@@ -28,7 +28,7 @@ def getInputSchema(self) -> KeyedDataSchema:
 
     def __call__(self, data: KeyedData, **kwargs) -> Scalar:
         mask = self.getMask(**kwargs)
-        return float(np.nanmean(cast(Vector, data[self.vectorKey.format(**kwargs)])[mask]))
+        return cast(Scalar, float(np.nanmean(cast(Vector, data[self.vectorKey.format(**kwargs)])[mask])))
 
 
 class StdevAction(ScalarAction):
@@ -39,7 +39,7 @@ def getInputSchema(self) -> KeyedDataSchema:
 
     def __call__(self, data: KeyedData, **kwargs) -> Scalar:
         mask = self.getMask(**kwargs)
-        return float(np.nanstd(cast(Vector, data[self.vectorKey.format(**kwargs)])[mask]))
+        return cast(Scalar, float(np.nanstd(cast(Vector, data[self.vectorKey.format(**kwargs)])[mask])))
 
 
 class SigmaMadAction(ScalarAction):
@@ -50,12 +50,15 @@ def getInputSchema(self) -> KeyedDataSchema:
 
     def __call__(self, data: KeyedData, **kwargs) -> Scalar:
         mask = self.getMask(**kwargs)
-        return float(
-            sps.median_abs_deviation(
-                cast(Vector, data[self.vectorKey.format(**kwargs)])[mask],
-                scale="normal",  # type: ignore
-                nan_policy="omit",
-            )
+        return cast(
+            Scalar,
+            float(
+                sps.median_abs_deviation(
+                    cast(Vector, data[self.vectorKey.format(**kwargs)])[mask],
+                    scale="normal",  # type: ignore
+                    nan_policy="omit",
+                )
+            ),
         )
 
 
@@ -69,7 +72,7 @@ def __call__(self, data: KeyedData, **kwargs) -> Scalar:
         mask = self.getMask(**kwargs)
         arr = cast(Vector, data[self.vectorKey.format(**kwargs)])[mask]
         arr = arr[~np.isnan(arr)]
-        return len(arr)  # type: ignore
+        return cast(Scalar, len(arr))
 
 
 class ApproxFloor(ScalarAction):
@@ -80,6 +83,6 @@ def getInputSchema(self) -> KeyedDataSchema:
 
     def __call__(self, data: KeyedData, **kwargs) -> Scalar:
         mask = self.getMask(**kwargs)
-        value = np.sort(data[self.vectorKey.format(**kwargs)][mask])  # type: ignore
+        value = np.sort(data[self.vectorKey.format(**kwargs)][mask])
         x = len(value) // 10
-        return np.nanmedian(value[-x:])
+        return cast(Scalar,np.nanmedian(value[-x:]))