diff --git a/ADMM.py b/ADMM.py index f38d524..1ac9ca7 100755 --- a/ADMM.py +++ b/ADMM.py @@ -5,9 +5,9 @@ import yaml def loadData(show_im=True): - psf = Image.open(psfname) + psf = Image.open(psfname).convert('L') psf = np.array(psf, dtype='float32') - data = Image.open(imgname) + data = Image.open(imgname).convert('L') data = np.array(data, dtype='float32') """In the picamera, there is a non-trivial background diff --git a/GD.py b/GD.py index d23628c..f0d4da8 100755 --- a/GD.py +++ b/GD.py @@ -7,9 +7,9 @@ def loaddata(show_im=True): - psf = Image.open(psfname) + psf = Image.open(psfname).convert('L') psf = np.array(psf, dtype='float32') - data = Image.open(imgname) + data = Image.open(imgname).convert('L') data = np.array(data, dtype='float32') """In the picamera, there is a non-trivial background diff --git a/tutorial/ADMM.ipynb b/tutorial/ADMM.ipynb index fb63887..cc8f8a4 100644 --- a/tutorial/ADMM.ipynb +++ b/tutorial/ADMM.ipynb @@ -95,9 +95,9 @@ "outputs": [], "source": [ "def loadData(show_im=True):\n", - " psf = Image.open(psfname)\n", + " psf = Image.open(psfname).convert('L')\n", " psf = np.array(psf, dtype='float32')\n", - " data = Image.open(imgname)\n", + " data = Image.open(imgname).convert('L')\n", " data = np.array(data, dtype='float32')\n", " \n", " \"\"\"In the picamera, there is a non-trivial background \n", diff --git a/tutorial/GD.ipynb b/tutorial/GD.ipynb index 9b0bdf6..28da63d 100644 --- a/tutorial/GD.ipynb +++ b/tutorial/GD.ipynb @@ -92,9 +92,9 @@ "outputs": [], "source": [ "def loaddata(show_im=True):\n", - " psf = Image.open(psfname)\n", + " psf = Image.open(psfname).convert('L')\n", " psf = np.array(psf, dtype='float32')\n", - " data = Image.open(imgname)\n", + " data = Image.open(imgname).convert('L')\n", " data = np.array(data, dtype='float32')\n", " \n", " \"\"\"In the picamera, there is a non-trivial background \n",