allow WFS to accept None as phase

This corresponds to a flat wavefront

Author: andrewpaulreeves

soapy/DM.py

@@ -173,7 +173,7 @@ def makeIMat(self, callback=None):
                 # Send the DM shape off to the relavent WFS. put result in iMat
                 iMat[i, subap: subap + (2*self.wfss[nWfs].activeSubaps)] = (
                        -1*self.wfss[nWfs].frame(
-                                phs, correction=self.dmShape, iMatFrame=True))/self.dmConfig.iMatValue
+                                None, correction=self.dmShape, iMatFrame=True))/self.dmConfig.iMatValue
 
                 if callback != None:
                     callback()

soapy/lineofsight.py

@@ -485,7 +485,7 @@ def performCorrection(self, correction):
 
             self.phase = self.residual * self.phs2Rad
 
-    def frame(self, scrns, correction=None):
+    def frame(self, scrns=None, correction=None):
         '''
         Runs one frame through a line of sight
 
@@ -502,14 +502,17 @@ def frame(self, scrns, correction=None):
             ndarray: WFS Measurements
         '''
 
-        #If scrns is not dict or list, assume array and put in list
-        t = type(scrns)
-        if t != dict and t != list:
-            scrns = [scrns]
-        self.scrns = scrns
-
         self.zeroData()
-        self.makePhase(self.radii)
+
+        if scrns is not None:
+        
+            #If scrns is not dict or list, assume array and put in list
+            t = type(scrns)
+            if t != dict and t != list:
+                scrns = [scrns]
+            self.scrns = scrns
+
+            self.makePhase(self.radii)
 
         if correction is not None:
             self.performCorrection(correction)

soapy/wfs/base.py

@@ -420,14 +420,14 @@ def frame(self, scrns, correction=None, read=True, iMatFrame=False):
         # If no elongation
         else:
             # If imat frame, dont want to make it off-axis
-            if iMatFrame:
-                try:
-                    iMatPhase = aoSimLib.zoom(scrns, self.los.nOutPxls, order=1)
-                    self.los.EField[:] = numpy.exp(1j*iMatPhase*self.los.phs2Rad)
-                except ValueError:
-                    raise ValueError("If iMat Frame, scrn must be ``simSize``")
-            else:
-                self.los.makePhase(self.radii)
+            # if iMatFrame:
+            #     try:
+            #         iMatPhase = aoSimLib.zoom(scrns, self.los.nOutPxls, order=1)
+            #         self.los.EField[:] = numpy.exp(1j*iMatPhase*self.los.phs2Rad)
+            #     except ValueError:
+            #         raise ValueError("If iMat Frame, scrn must be ``simSize``")
+            # else:
+            self.los.makePhase(self.radii)
 
             self.uncorrectedPhase = self.los.phase.copy()/self.los.phs2Rad
             if correction is not None: