fixed a typo and normalised slopes in ANN reconstructor

AOtools · Feb 9, 2016 · 1ad2550 · 1ad2550
1 parent d57a1da
commit 1ad2550
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/soapy/RECON.py b/soapy/RECON.py
@@ -840,7 +840,7 @@ def calcCMat(self, callback=None, progressCallback=None):
             if dmIMat.shape[0]==dmIMat.shape[1]:
                 dmCMat = numpy.inv(dmIMat)
             else:
-                dmCMat = numpy.linalg.pinv(dmIMat, self.dmCond[dm])
+                dmCMat = numpy.linalg.pinv(dmIMat, self.dmConds[dm])
 
             self.controlMatrix[:,acts:acts+self.dms[dm].acts] = dmCMat
             acts += self.dms[dm].acts
@@ -849,14 +849,17 @@ def reconstruct(self, slopes):
         """
         Determine DM commands using previously made
         reconstructor from slopes. Uses Artificial Neural Network.
+
+        Slopes are normalised before being run through the network.
+
         Args:
             slopes (ndarray): array of slopes to reconstruct from
         Returns:
             ndarray: array to comands to be sent to DM
         """
         t=time.time()
-        offSlopes = slopes[self.wfss[0].activeSubaps*2:]
-        onSlopes = self.net.run(offSlopes)
+        offSlopes = slopes[self.wfss[0].activeSubaps*2:]/7 # normalise
+        onSlopes = self.net.run(offSlopes)*7 # un-normalise
         dmCommands = self.controlMatrix.T.dot(onSlopes)
 
         self.Trecon += time.time()-t