Changeset 70

Timestamp:

Sep 25, 2014 12:52:29 PM (10 years ago)

Author:

JohnLightfoot

Message:

got window working

File:

• trunk/pythonclean.py (modified) (1 diff)

trunk/pythonclean.py

@@ -68 +68 @@
     comps=numpy.zeros(dirty.shape)
     res=numpy.array(dirty)
+    grid=numpy.indices(dirty.shape)
     if window is True:
-        window=numpy.ones(dirty.shape,
-                          numpy.bool)
+        window = [slice(dirty.shape), slice(dirty.shape)]
+
     for i in range(niter):
-        mx, my=numpy.unravel_index(numpy.fabs(res[window]).argmax(), res.shape)
+        argmax=numpy.unravel_index(numpy.fabs(res[window]).argmax(), res[window].shape)
+        mx=grid[0][window][argmax]
+        my=grid[1][window][argmax]
+
         mval=res[mx, my]*gain
         comps[mx, my]+=mval