Merge pull request #58 from matthewtownson/gradientWFS

Gradient wfs

Author: Andrew Reeves

soapy/confParse.py

@@ -629,9 +629,6 @@ class WfsConfig(ConfigObj):
         ``GSPosition``          tuple: position of GS on-sky in arc-secs
         ``wavelength``          float: wavelength of GS light in metres
         ``nxSubaps``            int: number of SH sub-apertures
-        ``pxlsPerSubap``        int: number of pixels per sub-apertures
-        ``subapFOV``            float: Field of View of sub-aperture in
-                                arc-secs
         ==================      ===================
 
     Optional:
@@ -701,6 +698,10 @@ class WfsConfig(ConfigObj):
                             system processor number.           ``1``
         ``fftwFlag``        str: Flag to pass to FFTW
                             when preparing plan.               ``FFTW_PATIENT``
+        ``pxlsPerSubap``    int: number of pixels per
+                            sub-apertures                      ``10``
+        ``subapFOV``        float: Field of View of
+                            sub-aperture in arc-secs           ``5``
         =================== ================================== ===========
 
 
@@ -709,8 +710,6 @@ class WfsConfig(ConfigObj):
     requiredParams = [ "GSPosition",
                         "wavelength",
                         "nxSubaps",
-                        "pxlsPerSubap",
-                        "subapFOV",
                         ]
     optionalParams = [  ("propagationMode", "Geometric"),
                         ("fftwThreads", 1),
@@ -734,6 +733,8 @@ class WfsConfig(ConfigObj):
                         ("GSMag", 0.0),
                         ("wvlBandWidth", 100.),
                         ("extendedObject", None),
+                        ("pxlsPerSubap", 10),
+                        ("subapFOV", 5),
                         ]
 
         # Parameters which may be Set at some point and are allowed

soapy/wfs/gradient.py

@@ -105,15 +105,15 @@ def calcFocalPlane(self, intensity=1):
         coord = self.simConfig.simPad
         self.pupilPhase = self.los.phase[coord:-coord, coord:-coord]
 
-        #create an array of individual subap phase
-        for i, (x,y) in enumerate(self.subapCoords):
+        # Create an array of individual subap phase
+        for i, (x, y) in enumerate(self.subapCoords):
             self.subapArrays[i] = self.pupilPhase[
                     x: x+self.subapSpacing, y: y+self.subapSpacing]
 
 
     def makeDetectorPlane(self):
         '''
-        Creates a 'detector' image suitable
+        Creates a 'detector' image suitable for plotting
         '''
         self.wfsDetectorPlane = numpy.zeros((self.wfsConfig.nxSubaps,)*2)