From 4102f0cdcf8e72d9be332a89224f928313327a77 Mon Sep 17 00:00:00 2001 From: lipp Date: Wed, 9 Apr 2025 10:37:41 +0200 Subject: [PATCH 1/4] fix for RGB input images --- tutorial/ADMM.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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", From a5c13333588982ef6249f0d99b35d4735b86b70c Mon Sep 17 00:00:00 2001 From: lipp Date: Wed, 9 Apr 2025 11:41:09 +0200 Subject: [PATCH 2/4] fix for RGB input images also for GD --- tutorial/GD.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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", From e2261868545553824e335b8e64463696114598d7 Mon Sep 17 00:00:00 2001 From: lipp Date: Wed, 9 Apr 2025 12:10:55 +0200 Subject: [PATCH 3/4] fix for RGB input images for ADMM.py --- ADMM.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From c57018dd885a7757d0b6d7a9059767bc509e68d2 Mon Sep 17 00:00:00 2001 From: lipp Date: Wed, 9 Apr 2025 12:11:08 +0200 Subject: [PATCH 4/4] fix for RGB input images for GD.py --- GD.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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