Progress

mirar/processors/flat.py

@@ -9,15 +9,7 @@
 from copy import copy
 
 import numpy as np
-<<<<<<< HEAD
-<<<<<<< HEAD
 from astropy.convolution import Tophat2DKernel, convolve_fft
-=======
-from astropy.convolution import Tophat2DKernel, convolve, convolve_fft
->>>>>>> 60685c68 (working)
-=======
-from astropy.convolution import Tophat2DKernel, convolve_fft
->>>>>>> 822f21d8 (Nanfill)
 
 from mirar.data import Image, ImageBatch
 from mirar.errors import ImageNotFoundError
@@ -104,7 +96,7 @@ def __init__(
         self.select_cache_images = select_flat_images
         self.flat_mask_key = flat_mask_key
         self.flat_mode = flat_mode
-        if not self.flat_mode in ["median", "pixel", "structure"]:
+        if self.flat_mode not in ["median", "pixel", "structure"]:
             raise ValueError(f"Flat mode {self.flat_mode} not supported")
 
     def __str__(self) -> str:
@@ -248,12 +240,12 @@ class SkyFlatCalibrator(FlatCalibrator):
     Processor to do flat calibration using sky flats
     """
 
-    def __init__(self, flat_mask_key=None, *args, **kwargs):
+    def __init__(self, *args, flat_mask_key=None, **kwargs):
         super().__init__(
             *args,
-            **kwargs,
             select_flat_images=self.select_sky_flat,
             flat_mask_key=flat_mask_key,
+            **kwargs,
         )
 
     @staticmethod