calibration: add some convenience

lumicks/pylake/channel.py

@@ -208,7 +208,7 @@ def stop(self):
         return self._src.stop
 
     @property
-    def data(self) -> npt.ArrayLike:
+    def data(self) -> npt.NDArray:
         """The primary values of this channel slice"""
         return self._src.data
 
@@ -801,7 +801,7 @@ def to_dataset(self, parent, name, **kwargs):
         return dset
 
     @property
-    def data(self) -> npt.ArrayLike:
+    def data(self) -> npt.NDArray:
         if self._cached_data is None:
             self._cached_data = np.asarray(self._src_data)
         return self._cached_data
@@ -932,7 +932,7 @@ def to_dataset(self, parent, name, **kwargs):
         return dset
 
     @property
-    def data(self) -> npt.ArrayLike:
+    def data(self) -> npt.NDArray:
         if self._cached_data is None:
             self._cached_data = np.asarray(self._src_data)
         return self._cached_data
@@ -1047,7 +1047,7 @@ def __len__(self):
         return 0
 
     @property
-    def data(self) -> npt.ArrayLike:
+    def data(self) -> npt.NDArray:
         return np.empty(0)
 
     @property

lumicks/pylake/force_calibration/calibration_item.py

@@ -3,6 +3,7 @@
 from collections import UserDict
 
 from lumicks.pylake.channel import Slice, Continuous, empty_slice
+from lumicks.pylake.force_calibration.convenience import calibrate_force
 from lumicks.pylake.force_calibration.calibration_models import DiodeCalibrationModel
 from lumicks.pylake.force_calibration.detail.calibration_properties import (
     CalibrationPropertiesMixin,
@@ -183,6 +184,26 @@ def __repr__(self):
         )
         return f"{self.__class__.__name__}({properties})"
 
+    def plot(self):
+        if not self.voltage:
+            raise ValueError(
+                "This calibration item does not contain the raw data. If you still have the "
+                "timeline force data, you can de-calibrate that and perform the re-calibration"
+                "manually. See the pylake tutorial on force calibration for more information."
+            )
+
+        self.recalibrate_with().plot()
+
+    def recalibrate_with(self, **params):
+        """Returns a calibration structure with some parameters overridden.
+
+        For a full list of parameters to override, please see
+        :func:`~lumicks.pylake.calibrate_force()`"""
+        active_data = {"driving_data": self.driving.data} if self.active_calibration else {}
+        return calibrate_force(
+            self.voltage.data, **(self.calibration_params() | active_data | params)
+        )
+
     @_verify_full
     def _model_params(self):
         """Returns parameters with which to create an active or passive calibration model"""