From cea1f219d0c842c719cc10bf85f52d149ba99327 Mon Sep 17 00:00:00 2001 From: Christoph Toennis Date: Tue, 1 Oct 2024 09:15:30 +0200 Subject: [PATCH] removing merge marks --- src/ctapipe/calib/camera/calibrator.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ctapipe/calib/camera/calibrator.py b/src/ctapipe/calib/camera/calibrator.py index 6ad47b525fe..baf3d2f1057 100644 --- a/src/ctapipe/calib/camera/calibrator.py +++ b/src/ctapipe/calib/camera/calibrator.py @@ -2,10 +2,6 @@ Definition of the `CameraCalibrator` class, providing all steps needed to apply calibration and image extraction, as well as supporting algorithms. """ -<<<<<<< HEAD - -======= ->>>>>>> c5f385f0 (I added a basic star fitter) from functools import cache import astropy.units as u @@ -23,9 +19,9 @@ from ctapipe.image.invalid_pixels import InvalidPixelHandler from ctapipe.image.reducer import DataVolumeReducer - __all__ = ["CameraCalibrator"] + @cache def _get_pixel_index(n_pixels): """Cached version of ``np.arange(n_pixels)``""" @@ -50,6 +46,7 @@ def _get_invalid_pixels(n_channels, n_pixels, pixel_status, selected_gain_channe return broken_pixels + class CameraCalibrator(TelescopeComponent): """ Calibrator to handle the full camera calibration chain, in order to fill