Main re-work is done. On to testing next

LouisDesdoigts · Sep 8, 2023 · 1e47cb8 · 1e47cb8
1 parent 909952e
commit 1e47cb8
Show file tree

Hide file tree

Showing 8 changed files with 519 additions and 2,071 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,6 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
-      args: [--line-length=79]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
     rev: v0.0.278
     hooks:

diff --git a/dLux/__init__.py b/dLux/__init__.py
@@ -78,11 +78,13 @@
     ShiftedMFT as ShiftedMFT,
     FarFieldFresnel as FarFieldFresnel,
     CircularAperture as CircularAperture,
+    SquareAperture as SquareAperture,
     RectangularAperture as RectangularAperture,
     RegPolyAperture as RegPolyAperture,
-    IrregPolyAperture as IrregPolyAperture,
+    Spider as Spider,
+    # IrregPolyAperture as IrregPolyAperture,
     AberratedAperture as AberratedAperture,
-    UniformSpider as UniformSpider,
+    # UniformSpider as UniformSpider,
     CompoundAperture as CompoundAperture,
     MultiAperture as MultiAperture,
     ApertureFactory as ApertureFactory,

diff --git a/dLux/detectors.py b/dLux/detectors.py
@@ -10,11 +10,6 @@
 DetectorLayer = lambda: dLux.detector_layers.DetectorLayer
 PSF = lambda: dLux.psfs.PSF
 
-# class BaseDetector(Base):
-#     @abstractmethod
-#     def model(self, psf):  # pragma: no cover
-#         pass
-
 
 class LayeredDetector(dLux.base.BaseDetector):
     """

diff --git a/dLux/layers/__init__.py b/dLux/layers/__init__.py
@@ -40,11 +40,12 @@
 )
 from .apertures import (
     CircularAperture as CircularAperture,
+    SquareAperture as SquareAperture,
     RectangularAperture as RectangularAperture,
     RegPolyAperture as RegPolyAperture,
-    IrregPolyAperture as IrregPolyAperture,
+    # IrregPolyAperture as IrregPolyAperture,
+    Spider as Spider,
     AberratedAperture as AberratedAperture,
-    UniformSpider as UniformSpider,
     CompoundAperture as CompoundAperture,
     MultiAperture as MultiAperture,
     ApertureFactory as ApertureFactory,